diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action.php | 3 | ||||
| -rw-r--r-- | lib/grouplist.php | 4 | ||||
| -rw-r--r-- | lib/groupsection.php | 3 | ||||
| -rw-r--r-- | lib/noticelist.php | 11 | ||||
| -rw-r--r-- | lib/profilelist.php | 4 | ||||
| -rw-r--r-- | lib/profilesection.php | 2 |
6 files changed, 25 insertions, 2 deletions
diff --git a/lib/action.php b/lib/action.php index cc4f4aad0..b85f353a3 100644 --- a/lib/action.php +++ b/lib/action.php @@ -405,6 +405,7 @@ class Action extends HTMLOutputter // lawsuit 'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'), 'alt' => common_config('site', 'name'))); } + $this->text(' '); $this->element('span', array('class' => 'fn org'), common_config('site', 'name')); $this->elementEnd('a'); Event::handle('EndAddressData', array($this)); @@ -822,12 +823,14 @@ class Action extends HTMLOutputter // lawsuit 'alt' => common_config('license', 'title'), 'width' => '80', 'height' => '15')); + $this->text(' '); //TODO: This is dirty: i18n $this->text(_('All '.common_config('site', 'name').' content and data are available under the ')); $this->element('a', array('class' => 'license', 'rel' => 'external license', 'href' => common_config('license', 'url')), common_config('license', 'title')); + $this->text(' '); $this->text(_('license.')); $this->elementEnd('p'); break; diff --git a/lib/grouplist.php b/lib/grouplist.php index 99bff9cdc..854bc34e2 100644 --- a/lib/grouplist.php +++ b/lib/grouplist.php @@ -105,6 +105,7 @@ class GroupList extends Widget 'alt' => ($this->group->fullname) ? $this->group->fullname : $this->group->nickname)); + $this->out->text(' '); $hasFN = ($this->group->fullname) ? 'nickname' : 'fn org nickname'; $this->out->elementStart('span', $hasFN); $this->out->raw($this->highlight($this->group->nickname)); @@ -112,16 +113,19 @@ class GroupList extends Widget $this->out->elementEnd('a'); if ($this->group->fullname) { + $this->out->text(' '); $this->out->elementStart('span', 'fn org'); $this->out->raw($this->highlight($this->group->fullname)); $this->out->elementEnd('span'); } if ($this->group->location) { + $this->out->text(' '); $this->out->elementStart('span', 'label'); $this->out->raw($this->highlight($this->group->location)); $this->out->elementEnd('span'); } if ($this->group->homepage) { + $this->out->text(' '); $this->out->elementStart('a', array('href' => $this->group->homepage, 'class' => 'url')); $this->out->raw($this->highlight($this->group->homepage)); diff --git a/lib/groupsection.php b/lib/groupsection.php index 7327f9e1a..3b0b3029d 100644 --- a/lib/groupsection.php +++ b/lib/groupsection.php @@ -85,9 +85,9 @@ class GroupSection extends Section 'href' => $group->homeUrl(), 'rel' => 'contact group', 'class' => 'url')); + $this->out->text(' '); $logo = ($group->stream_logo) ? $group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE); - $this->out->element('img', array('src' => $logo, 'width' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE, @@ -95,6 +95,7 @@ class GroupSection extends Section 'alt' => ($group->fullname) ? $group->fullname : $group->nickname)); + $this->out->text(' '); $this->out->element('span', 'fn org nickname', $group->nickname); $this->out->elementEnd('a'); $this->out->elementEnd('span'); diff --git a/lib/noticelist.php b/lib/noticelist.php index a4a0f2651..c05b99024 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -294,6 +294,7 @@ class NoticeListItem extends Widget } $this->out->elementStart('a', $attrs); $this->showAvatar(); + $this->out->text(' '); $this->showNickname(); $this->out->elementEnd('a'); $this->out->elementEnd('span'); @@ -432,8 +433,10 @@ class NoticeListItem extends Widget $url = $location->getUrl(); + $this->out->text(' '); $this->out->elementStart('span', array('class' => 'location')); $this->out->text(_('at')); + $this->out->text(' '); if (empty($url)) { $this->out->element('span', array('class' => 'geo', 'title' => $latlon), @@ -473,9 +476,11 @@ class NoticeListItem extends Widget function showNoticeSource() { if ($this->notice->source) { + $this->out->text(' '); $this->out->elementStart('span', 'source'); $this->out->text(_('from')); $source_name = _($this->notice->source); + $this->out->text(' '); switch ($this->notice->source) { case 'web': case 'xmpp': @@ -540,6 +545,7 @@ class NoticeListItem extends Widget } } if ($hasConversation){ + $this->out->text(' '); $convurl = common_local_url('conversation', array('id' => $this->notice->conversation)); $this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id, @@ -591,12 +597,14 @@ class NoticeListItem extends Widget function showReplyLink() { if (common_logged_in()) { + $this->out->text(' '); $reply_url = common_local_url('newnotice', array('replyto' => $this->profile->nickname, 'inreplyto' => $this->notice->id)); $this->out->elementStart('a', array('href' => $reply_url, 'class' => 'notice_reply', 'title' => _('Reply to this notice'))); $this->out->text(_('Reply')); + $this->out->text(' '); $this->out->element('span', 'notice_id', $this->notice->id); $this->out->elementEnd('a'); } @@ -616,7 +624,7 @@ class NoticeListItem extends Widget if (!empty($user) && ($todel->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) { - + $this->out->text(' '); $deleteurl = common_local_url('deletenotice', array('notice' => $todel->id)); $this->out->element('a', array('href' => $deleteurl, @@ -635,6 +643,7 @@ class NoticeListItem extends Widget { $user = common_current_user(); if ($user && $user->id != $this->notice->profile_id) { + $this->out->text(' '); $profile = $user->getProfile(); if ($profile->hasRepeated($this->notice->id)) { $this->out->element('span', array('class' => 'repeated', diff --git a/lib/profilelist.php b/lib/profilelist.php index 3412d41d1..693cd6449 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -191,6 +191,7 @@ class ProfileListItem extends Widget 'alt' => ($this->profile->fullname) ? $this->profile->fullname : $this->profile->nickname)); + $this->out->text(' '); $hasFN = (!empty($this->profile->fullname)) ? 'nickname' : 'fn nickname'; $this->out->elementStart('span', $hasFN); $this->out->raw($this->highlight($this->profile->nickname)); @@ -201,6 +202,7 @@ class ProfileListItem extends Widget function showFullName() { if (!empty($this->profile->fullname)) { + $this->out->text(' '); $this->out->elementStart('span', 'fn'); $this->out->raw($this->highlight($this->profile->fullname)); $this->out->elementEnd('span'); @@ -210,6 +212,7 @@ class ProfileListItem extends Widget function showLocation() { if (!empty($this->profile->location)) { + $this->out->text(' '); $this->out->elementStart('span', 'location'); $this->out->raw($this->highlight($this->profile->location)); $this->out->elementEnd('span'); @@ -219,6 +222,7 @@ class ProfileListItem extends Widget function showHomepage() { if (!empty($this->profile->homepage)) { + $this->out->text(' '); $this->out->elementStart('a', array('href' => $this->profile->homepage, 'class' => 'url')); $this->out->raw($this->highlight($this->profile->homepage)); diff --git a/lib/profilesection.php b/lib/profilesection.php index 504b1b7f7..a9482cd63 100644 --- a/lib/profilesection.php +++ b/lib/profilesection.php @@ -85,6 +85,7 @@ class ProfileSection extends Section 'href' => $profile->profileurl, 'rel' => 'contact member', 'class' => 'url')); + $this->out->text(' '); $avatar = $profile->getAvatar(AVATAR_MINI_SIZE); $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_MINI_SIZE)), 'width' => AVATAR_MINI_SIZE, @@ -93,6 +94,7 @@ class ProfileSection extends Section 'alt' => ($profile->fullname) ? $profile->fullname : $profile->nickname)); + $this->out->text(' '); $this->out->element('span', 'fn nickname', $profile->nickname); $this->out->elementEnd('a'); $this->out->elementEnd('span'); |