wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No nickname in profile listing

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-06-23 18:59:32 +02:00
parent 51e96e580f
commit faa12e63c0
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/profilelist.php
View File

@ -157,6 +157,10 @@ class ProfileListItem extends Widget
$this->out->elementEnd('a'); $this->out->elementEnd('a');
Event::handle('EndProfileListItemAvatar', array($this)); Event::handle('EndProfileListItemAvatar', array($this));
} }
if (Event::handle('StartProfileListItemNickname', array($this))) {
$this->showNickname();
Event::handle('EndProfileListItemNickname', array($this));
}
if (Event::handle('StartProfileListItemFullName', array($this))) { if (Event::handle('StartProfileListItemFullName', array($this))) {
$this->showFullName(); $this->showFullName();
Event::handle('EndProfileListItemFullName', array($this)); Event::handle('EndProfileListItemFullName', array($this));
@ -187,23 +191,24 @@ class ProfileListItem extends Widget
$this->out->elementStart('div', 'entity_profile h-card'); $this->out->elementStart('div', 'entity_profile h-card');
} }
function showNickname()
{
$this->out->element('a', array('href'=>$this->profile->getUrl(),
'class'=>'p-nickname'),
$this->profile->getNickname());
}
function showFullName() function showFullName()
{ {
if (!empty($this->profile->fullname)) { if (!empty($this->profile->fullname)) {
$this->out->text(' '); $this->out->element('span', 'p-name', $this->profile->fullname);
$this->out->elementStart('span', 'p-name');
$this->out->raw($this->highlight($this->profile->fullname));
$this->out->elementEnd('span');
} }
} }
function showLocation() function showLocation()
{ {
if (!empty($this->profile->location)) { if (!empty($this->profile->location)) {
$this->out->text(' '); $this->out->element('span', 'label p-location', $this->profile->location);
$this->out->elementStart('span', 'label');
$this->out->raw($this->highlight($this->profile->location));
$this->out->elementEnd('span');
} }
} }

1
lib/subscriptionlist.php
View File

@ -77,6 +77,7 @@ class SubscriptionListItem extends ProfileListItem
{ {
$this->startProfile(); $this->startProfile();
$this->showAvatar($this->profile); $this->showAvatar($this->profile);
$this->showNickname();
$this->showFullName(); $this->showFullName();
$this->showLocation(); $this->showLocation();
$this->showHomepage(); $this->showHomepage();

2
plugins/Directory/lib/sortablesubscriptionlist.php
View File

@ -191,7 +191,7 @@ class SortableSubscriptionListItem extends SubscriptionListItem
function startProfile() function startProfile()
{ {
$this->out->elementStart('td', 'entity_profile h-card e-content'); $this->out->elementStart('td', 'entity_profile h-card');
} }
function endProfile() function endProfile()

15
theme/base/css/display.css
View File

@ -1593,6 +1593,13 @@ height:16px;
top: -3px; top: -3px;
} }
table.profile_list .h-card .u-photo {
margin-right: 4px;
}
table.profile_list .h-card .p-nickname {
display: block;
}
.entity_profile .entity_nickname, .entity_profile .entity_nickname,
.entity_profile .entity_fn { .entity_profile .entity_fn {
margin-left:0; margin-left:0;
@ -1879,14 +1886,6 @@ margin-left:0;
display:inline; display:inline;
} }
.profile .entity_profile .p-name,
.profile .entity_profile .label {
margin-left:11px;
margin-bottom:4px;
width:auto;
clear:none;
}
.profile .entity_profile .note, .profile .entity_profile .note,
.profile .entity_profile .u-url, .profile .entity_profile .u-url,
.profile .entity_profile .entity_tags, .profile .entity_profile .entity_tags,