summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/avatar.php6
-rw-r--r--actions/showstream.php10
-rw-r--r--actions/subscribed.php10
-rw-r--r--actions/subscriptions.php10
4 files changed, 25 insertions, 11 deletions
diff --git a/actions/avatar.php b/actions/avatar.php
index 00b7ea6c0..53595af12 100644
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -36,7 +36,8 @@ class AvatarAction extends SettingsAction {
common_element('img', array('src' => $original->url,
'class' => 'avatar original',
'width' => $original->width,
- 'height' => $original->height));
+ 'height' => $original->height,
+ 'alt' => $user->nickname));
}
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
@@ -45,7 +46,8 @@ class AvatarAction extends SettingsAction {
common_element('img', array('src' => $avatar->url,
'class' => 'avatar profile',
'width' => AVATAR_PROFILE_SIZE,
- 'height' => AVATAR_PROFILE_SIZE));
+ 'height' => AVATAR_PROFILE_SIZE,
+ 'alt' => $user->nickname));
}
common_element_start('form', array('enctype' => 'multipart/form-data',
diff --git a/actions/showstream.php b/actions/showstream.php
index 5e8802cd7..6cd4773ee 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -102,7 +102,7 @@ class ShowstreamAction extends StreamAction {
'class' => 'avatar profile',
'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE,
- 'title' => $profile->nickname));
+ 'alt' => $profile->nickname));
}
if ($profile->fullname) {
if ($profile->homepage) {
@@ -161,7 +161,8 @@ class ShowstreamAction extends StreamAction {
common_element_start('div', 'row');
}
- common_element_start('a', array('title' => $subs->fullname ||
+ common_element_start('a', array('title' => ($subs->fullname) ?
+ $subs->fullname :
$subs->nickname,
'href' => $subs->profileurl,
'class' => 'subscription'));
@@ -169,7 +170,10 @@ class ShowstreamAction extends StreamAction {
common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_MINI_AVATAR),
'width' => AVATAR_MINI_SIZE,
'height' => AVATAR_MINI_SIZE,
- 'class' => 'avatar mini'));
+ 'class' => 'avatar mini',
+ 'alt' => ($subs->fullname) ?
+ $subs->fullname :
+ $subs->nickname));
common_element_end('a');
if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) {
diff --git a/actions/subscribed.php b/actions/subscribed.php
index 61cb8dac6..eed2b6c2c 100644
--- a/actions/subscribed.php
+++ b/actions/subscribed.php
@@ -62,15 +62,19 @@ class SubscribedAction extends Action {
common_element_start('div', 'row');
}
- common_element_start('a', array('title' => $subs->fullname ||
- $subs->nickname,
+ common_element_start('a', array('title' => ($subs->fullname) ?
+ $subs->fullname :
+ $subs->nickname,
'href' => $subs->profileurl,
'class' => 'subscription'));
$avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR),
'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE,
- 'class' => 'avatar stream'));
+ 'class' => 'avatar stream',
+ 'alt' => ($subs->fullname) ?
+ $subs->fullname :
+ $subs->nickname));
common_element_end('a');
# XXX: subscribe form here
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 669502939..ee073d126 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -59,15 +59,19 @@ class SubscriptionsAction extends Action {
common_element_start('div', 'row');
}
- common_element_start('a', array('title' => $subs->fullname ||
- $subs->nickname,
+ common_element_start('a', array('title' => ($subs->fullname) ?
+ $subs->fullname :
+ $subs->nickname,
'href' => $subs->profileurl,
'class' => 'subscription'));
$avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR),
'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE,
- 'class' => 'avatar stream'));
+ 'class' => 'avatar stream',
+ 'alt' => ($subs->fullname) ?
+ $subs->fullname :
+ $subs->nickname));
common_element_end('a');
# XXX: subscribe form here