Added single whitespace to separate inline text words.
This commit is contained in:
parent
73e2264c6a
commit
03edbfe24e
|
@ -405,6 +405,7 @@ class Action extends HTMLOutputter // lawsuit
|
||||||
'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'),
|
'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'),
|
||||||
'alt' => common_config('site', 'name')));
|
'alt' => common_config('site', 'name')));
|
||||||
}
|
}
|
||||||
|
$this->text(' ');
|
||||||
$this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
|
$this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
|
||||||
$this->elementEnd('a');
|
$this->elementEnd('a');
|
||||||
Event::handle('EndAddressData', array($this));
|
Event::handle('EndAddressData', array($this));
|
||||||
|
@ -822,12 +823,14 @@ class Action extends HTMLOutputter // lawsuit
|
||||||
'alt' => common_config('license', 'title'),
|
'alt' => common_config('license', 'title'),
|
||||||
'width' => '80',
|
'width' => '80',
|
||||||
'height' => '15'));
|
'height' => '15'));
|
||||||
|
$this->text(' ');
|
||||||
//TODO: This is dirty: i18n
|
//TODO: This is dirty: i18n
|
||||||
$this->text(_('All '.common_config('site', 'name').' content and data are available under the '));
|
$this->text(_('All '.common_config('site', 'name').' content and data are available under the '));
|
||||||
$this->element('a', array('class' => 'license',
|
$this->element('a', array('class' => 'license',
|
||||||
'rel' => 'external license',
|
'rel' => 'external license',
|
||||||
'href' => common_config('license', 'url')),
|
'href' => common_config('license', 'url')),
|
||||||
common_config('license', 'title'));
|
common_config('license', 'title'));
|
||||||
|
$this->text(' ');
|
||||||
$this->text(_('license.'));
|
$this->text(_('license.'));
|
||||||
$this->elementEnd('p');
|
$this->elementEnd('p');
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -105,6 +105,7 @@ class GroupList extends Widget
|
||||||
'alt' =>
|
'alt' =>
|
||||||
($this->group->fullname) ? $this->group->fullname :
|
($this->group->fullname) ? $this->group->fullname :
|
||||||
$this->group->nickname));
|
$this->group->nickname));
|
||||||
|
$this->out->text(' ');
|
||||||
$hasFN = ($this->group->fullname) ? 'nickname' : 'fn org nickname';
|
$hasFN = ($this->group->fullname) ? 'nickname' : 'fn org nickname';
|
||||||
$this->out->elementStart('span', $hasFN);
|
$this->out->elementStart('span', $hasFN);
|
||||||
$this->out->raw($this->highlight($this->group->nickname));
|
$this->out->raw($this->highlight($this->group->nickname));
|
||||||
|
@ -112,16 +113,19 @@ class GroupList extends Widget
|
||||||
$this->out->elementEnd('a');
|
$this->out->elementEnd('a');
|
||||||
|
|
||||||
if ($this->group->fullname) {
|
if ($this->group->fullname) {
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->elementStart('span', 'fn org');
|
$this->out->elementStart('span', 'fn org');
|
||||||
$this->out->raw($this->highlight($this->group->fullname));
|
$this->out->raw($this->highlight($this->group->fullname));
|
||||||
$this->out->elementEnd('span');
|
$this->out->elementEnd('span');
|
||||||
}
|
}
|
||||||
if ($this->group->location) {
|
if ($this->group->location) {
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->elementStart('span', 'label');
|
$this->out->elementStart('span', 'label');
|
||||||
$this->out->raw($this->highlight($this->group->location));
|
$this->out->raw($this->highlight($this->group->location));
|
||||||
$this->out->elementEnd('span');
|
$this->out->elementEnd('span');
|
||||||
}
|
}
|
||||||
if ($this->group->homepage) {
|
if ($this->group->homepage) {
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->elementStart('a', array('href' => $this->group->homepage,
|
$this->out->elementStart('a', array('href' => $this->group->homepage,
|
||||||
'class' => 'url'));
|
'class' => 'url'));
|
||||||
$this->out->raw($this->highlight($this->group->homepage));
|
$this->out->raw($this->highlight($this->group->homepage));
|
||||||
|
|
|
@ -85,9 +85,9 @@ class GroupSection extends Section
|
||||||
'href' => $group->homeUrl(),
|
'href' => $group->homeUrl(),
|
||||||
'rel' => 'contact group',
|
'rel' => 'contact group',
|
||||||
'class' => 'url'));
|
'class' => 'url'));
|
||||||
|
$this->out->text(' ');
|
||||||
$logo = ($group->stream_logo) ?
|
$logo = ($group->stream_logo) ?
|
||||||
$group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
|
$group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
|
||||||
|
|
||||||
$this->out->element('img', array('src' => $logo,
|
$this->out->element('img', array('src' => $logo,
|
||||||
'width' => AVATAR_MINI_SIZE,
|
'width' => AVATAR_MINI_SIZE,
|
||||||
'height' => AVATAR_MINI_SIZE,
|
'height' => AVATAR_MINI_SIZE,
|
||||||
|
@ -95,6 +95,7 @@ class GroupSection extends Section
|
||||||
'alt' => ($group->fullname) ?
|
'alt' => ($group->fullname) ?
|
||||||
$group->fullname :
|
$group->fullname :
|
||||||
$group->nickname));
|
$group->nickname));
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->element('span', 'fn org nickname', $group->nickname);
|
$this->out->element('span', 'fn org nickname', $group->nickname);
|
||||||
$this->out->elementEnd('a');
|
$this->out->elementEnd('a');
|
||||||
$this->out->elementEnd('span');
|
$this->out->elementEnd('span');
|
||||||
|
|
|
@ -294,6 +294,7 @@ class NoticeListItem extends Widget
|
||||||
}
|
}
|
||||||
$this->out->elementStart('a', $attrs);
|
$this->out->elementStart('a', $attrs);
|
||||||
$this->showAvatar();
|
$this->showAvatar();
|
||||||
|
$this->out->text(' ');
|
||||||
$this->showNickname();
|
$this->showNickname();
|
||||||
$this->out->elementEnd('a');
|
$this->out->elementEnd('a');
|
||||||
$this->out->elementEnd('span');
|
$this->out->elementEnd('span');
|
||||||
|
@ -432,8 +433,10 @@ class NoticeListItem extends Widget
|
||||||
|
|
||||||
$url = $location->getUrl();
|
$url = $location->getUrl();
|
||||||
|
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->elementStart('span', array('class' => 'location'));
|
$this->out->elementStart('span', array('class' => 'location'));
|
||||||
$this->out->text(_('at'));
|
$this->out->text(_('at'));
|
||||||
|
$this->out->text(' ');
|
||||||
if (empty($url)) {
|
if (empty($url)) {
|
||||||
$this->out->element('span', array('class' => 'geo',
|
$this->out->element('span', array('class' => 'geo',
|
||||||
'title' => $latlon),
|
'title' => $latlon),
|
||||||
|
@ -473,9 +476,11 @@ class NoticeListItem extends Widget
|
||||||
function showNoticeSource()
|
function showNoticeSource()
|
||||||
{
|
{
|
||||||
if ($this->notice->source) {
|
if ($this->notice->source) {
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->elementStart('span', 'source');
|
$this->out->elementStart('span', 'source');
|
||||||
$this->out->text(_('from'));
|
$this->out->text(_('from'));
|
||||||
$source_name = _($this->notice->source);
|
$source_name = _($this->notice->source);
|
||||||
|
$this->out->text(' ');
|
||||||
switch ($this->notice->source) {
|
switch ($this->notice->source) {
|
||||||
case 'web':
|
case 'web':
|
||||||
case 'xmpp':
|
case 'xmpp':
|
||||||
|
@ -540,6 +545,7 @@ class NoticeListItem extends Widget
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($hasConversation){
|
if ($hasConversation){
|
||||||
|
$this->out->text(' ');
|
||||||
$convurl = common_local_url('conversation',
|
$convurl = common_local_url('conversation',
|
||||||
array('id' => $this->notice->conversation));
|
array('id' => $this->notice->conversation));
|
||||||
$this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id,
|
$this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id,
|
||||||
|
@ -591,12 +597,14 @@ class NoticeListItem extends Widget
|
||||||
function showReplyLink()
|
function showReplyLink()
|
||||||
{
|
{
|
||||||
if (common_logged_in()) {
|
if (common_logged_in()) {
|
||||||
|
$this->out->text(' ');
|
||||||
$reply_url = common_local_url('newnotice',
|
$reply_url = common_local_url('newnotice',
|
||||||
array('replyto' => $this->profile->nickname, 'inreplyto' => $this->notice->id));
|
array('replyto' => $this->profile->nickname, 'inreplyto' => $this->notice->id));
|
||||||
$this->out->elementStart('a', array('href' => $reply_url,
|
$this->out->elementStart('a', array('href' => $reply_url,
|
||||||
'class' => 'notice_reply',
|
'class' => 'notice_reply',
|
||||||
'title' => _('Reply to this notice')));
|
'title' => _('Reply to this notice')));
|
||||||
$this->out->text(_('Reply'));
|
$this->out->text(_('Reply'));
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->element('span', 'notice_id', $this->notice->id);
|
$this->out->element('span', 'notice_id', $this->notice->id);
|
||||||
$this->out->elementEnd('a');
|
$this->out->elementEnd('a');
|
||||||
}
|
}
|
||||||
|
@ -616,7 +624,7 @@ class NoticeListItem extends Widget
|
||||||
|
|
||||||
if (!empty($user) &&
|
if (!empty($user) &&
|
||||||
($todel->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) {
|
($todel->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) {
|
||||||
|
$this->out->text(' ');
|
||||||
$deleteurl = common_local_url('deletenotice',
|
$deleteurl = common_local_url('deletenotice',
|
||||||
array('notice' => $todel->id));
|
array('notice' => $todel->id));
|
||||||
$this->out->element('a', array('href' => $deleteurl,
|
$this->out->element('a', array('href' => $deleteurl,
|
||||||
|
@ -635,6 +643,7 @@ class NoticeListItem extends Widget
|
||||||
{
|
{
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
if ($user && $user->id != $this->notice->profile_id) {
|
if ($user && $user->id != $this->notice->profile_id) {
|
||||||
|
$this->out->text(' ');
|
||||||
$profile = $user->getProfile();
|
$profile = $user->getProfile();
|
||||||
if ($profile->hasRepeated($this->notice->id)) {
|
if ($profile->hasRepeated($this->notice->id)) {
|
||||||
$this->out->element('span', array('class' => 'repeated',
|
$this->out->element('span', array('class' => 'repeated',
|
||||||
|
|
|
@ -191,6 +191,7 @@ class ProfileListItem extends Widget
|
||||||
'alt' =>
|
'alt' =>
|
||||||
($this->profile->fullname) ? $this->profile->fullname :
|
($this->profile->fullname) ? $this->profile->fullname :
|
||||||
$this->profile->nickname));
|
$this->profile->nickname));
|
||||||
|
$this->out->text(' ');
|
||||||
$hasFN = (!empty($this->profile->fullname)) ? 'nickname' : 'fn nickname';
|
$hasFN = (!empty($this->profile->fullname)) ? 'nickname' : 'fn nickname';
|
||||||
$this->out->elementStart('span', $hasFN);
|
$this->out->elementStart('span', $hasFN);
|
||||||
$this->out->raw($this->highlight($this->profile->nickname));
|
$this->out->raw($this->highlight($this->profile->nickname));
|
||||||
|
@ -201,6 +202,7 @@ class ProfileListItem extends Widget
|
||||||
function showFullName()
|
function showFullName()
|
||||||
{
|
{
|
||||||
if (!empty($this->profile->fullname)) {
|
if (!empty($this->profile->fullname)) {
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->elementStart('span', 'fn');
|
$this->out->elementStart('span', 'fn');
|
||||||
$this->out->raw($this->highlight($this->profile->fullname));
|
$this->out->raw($this->highlight($this->profile->fullname));
|
||||||
$this->out->elementEnd('span');
|
$this->out->elementEnd('span');
|
||||||
|
@ -210,6 +212,7 @@ class ProfileListItem extends Widget
|
||||||
function showLocation()
|
function showLocation()
|
||||||
{
|
{
|
||||||
if (!empty($this->profile->location)) {
|
if (!empty($this->profile->location)) {
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->elementStart('span', 'location');
|
$this->out->elementStart('span', 'location');
|
||||||
$this->out->raw($this->highlight($this->profile->location));
|
$this->out->raw($this->highlight($this->profile->location));
|
||||||
$this->out->elementEnd('span');
|
$this->out->elementEnd('span');
|
||||||
|
@ -219,6 +222,7 @@ class ProfileListItem extends Widget
|
||||||
function showHomepage()
|
function showHomepage()
|
||||||
{
|
{
|
||||||
if (!empty($this->profile->homepage)) {
|
if (!empty($this->profile->homepage)) {
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->elementStart('a', array('href' => $this->profile->homepage,
|
$this->out->elementStart('a', array('href' => $this->profile->homepage,
|
||||||
'class' => 'url'));
|
'class' => 'url'));
|
||||||
$this->out->raw($this->highlight($this->profile->homepage));
|
$this->out->raw($this->highlight($this->profile->homepage));
|
||||||
|
|
|
@ -85,6 +85,7 @@ class ProfileSection extends Section
|
||||||
'href' => $profile->profileurl,
|
'href' => $profile->profileurl,
|
||||||
'rel' => 'contact member',
|
'rel' => 'contact member',
|
||||||
'class' => 'url'));
|
'class' => 'url'));
|
||||||
|
$this->out->text(' ');
|
||||||
$avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
|
$avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
|
||||||
$this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_MINI_SIZE)),
|
$this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_MINI_SIZE)),
|
||||||
'width' => AVATAR_MINI_SIZE,
|
'width' => AVATAR_MINI_SIZE,
|
||||||
|
@ -93,6 +94,7 @@ class ProfileSection extends Section
|
||||||
'alt' => ($profile->fullname) ?
|
'alt' => ($profile->fullname) ?
|
||||||
$profile->fullname :
|
$profile->fullname :
|
||||||
$profile->nickname));
|
$profile->nickname));
|
||||||
|
$this->out->text(' ');
|
||||||
$this->out->element('span', 'fn nickname', $profile->nickname);
|
$this->out->element('span', 'fn nickname', $profile->nickname);
|
||||||
$this->out->elementEnd('a');
|
$this->out->elementEnd('a');
|
||||||
$this->out->elementEnd('span');
|
$this->out->elementEnd('span');
|
||||||
|
|
|
@ -45,6 +45,7 @@ class PoweredByStatusNetPlugin extends Plugin
|
||||||
{
|
{
|
||||||
function onEndAddressData($action)
|
function onEndAddressData($action)
|
||||||
{
|
{
|
||||||
|
$action->text(' ');
|
||||||
$action->elementStart('span', 'poweredby');
|
$action->elementStart('span', 'poweredby');
|
||||||
$action->raw(sprintf(_m('powered by %s'),
|
$action->raw(sprintf(_m('powered by %s'),
|
||||||
sprintf('<a href="http://status.net/">%s</a>',
|
sprintf('<a href="http://status.net/">%s</a>',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user