Commit faa12e63 authored by mmn's avatar mmn

No nickname in profile listing

parent 51e96e58
......@@ -157,6 +157,10 @@ class ProfileListItem extends Widget
$this->out->elementEnd('a');
Event::handle('EndProfileListItemAvatar', array($this));
}
if (Event::handle('StartProfileListItemNickname', array($this))) {
$this->showNickname();
Event::handle('EndProfileListItemNickname', array($this));
}
if (Event::handle('StartProfileListItemFullName', array($this))) {
$this->showFullName();
Event::handle('EndProfileListItemFullName', array($this));
......@@ -187,23 +191,24 @@ class ProfileListItem extends Widget
$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()
{
if (!empty($this->profile->fullname)) {
$this->out->text(' ');
$this->out->elementStart('span', 'p-name');
$this->out->raw($this->highlight($this->profile->fullname));
$this->out->elementEnd('span');
$this->out->element('span', 'p-name', $this->profile->fullname);
}
}
function showLocation()
{
if (!empty($this->profile->location)) {
$this->out->text(' ');
$this->out->elementStart('span', 'label');
$this->out->raw($this->highlight($this->profile->location));
$this->out->elementEnd('span');
$this->out->element('span', 'label p-location', $this->profile->location);
}
}
......
......@@ -77,6 +77,7 @@ class SubscriptionListItem extends ProfileListItem
{
$this->startProfile();
$this->showAvatar($this->profile);
$this->showNickname();
$this->showFullName();
$this->showLocation();
$this->showHomepage();
......
......@@ -191,7 +191,7 @@ class SortableSubscriptionListItem extends SubscriptionListItem
function startProfile()
{
$this->out->elementStart('td', 'entity_profile h-card e-content');
$this->out->elementStart('td', 'entity_profile h-card');
}
function endProfile()
......
......@@ -1593,6 +1593,13 @@ height:16px;
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_fn {
margin-left:0;
......@@ -1879,14 +1886,6 @@ margin-left:0;
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 .u-url,
.profile .entity_profile .entity_tags,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment