X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fpeopletaglist.php;h=b2f2dcca463753c2766de08dda9834505b81e911;hb=4b40d6bb2ad6540fe114eebe74b2330902382a81;hp=5c027d75869f6a9b539b54377e998d16cc4d4ddc;hpb=b0dfc70a54e5e184023ed982dfaf5439041e9708;p=quix0rs-gnu-social.git diff --git a/lib/peopletaglist.php b/lib/peopletaglist.php index 5c027d7586..b2f2dcca46 100644 --- a/lib/peopletaglist.php +++ b/lib/peopletaglist.php @@ -142,7 +142,7 @@ class PeopletagListItem extends Widget function showStart() { $mode = ($this->peopletag->private) ? 'private' : 'public'; - $this->out->elementStart('li', array('class' => 'hentry peopletag mode-' . $mode, + $this->out->elementStart('li', array('class' => 'h-entry peopletag mode-' . $mode, 'id' => 'peopletag-' . $this->peopletag->id)); } @@ -221,23 +221,16 @@ class PeopletagListItem extends Widget function showCreator() { - $this->out->elementStart('span', 'author vcard'); $attrs = array(); $attrs['href'] = $this->profile->profileurl; - $attrs['class'] = 'url'; + $attrs['class'] = 'h-card p-author nickname p-name'; $attrs['rel'] = 'contact'; + $attrs['title'] = $this->profile->getFancyName(); - if (!empty($this->profile->fullname)) { - $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ')'; - } $this->out->elementStart('a', $attrs); - $this->showAvatar(); - $this->out->text(' '); - $this->out->element('span', 'nickname fn', - htmlspecialchars($this->profile->nickname)); - + $this->showAvatar($this->profile); + $this->out->text($this->profile->getNickname()); $this->out->elementEnd('a'); - $this->out->elementEnd('span'); } function showUpdated() @@ -272,29 +265,6 @@ class PeopletagListItem extends Widget $this->out->elementEnd('span'); } - /** - * show the avatar of the peopletag's creator - * - * This will use the default avatar if no avatar is assigned for the author. - * It makes a link to the author's profile. - * - * @return void - */ - - function showAvatar($size=AVATAR_STREAM_SIZE) - { - $avatarUrl = $this->profile->avatarUrl($size); - - $this->out->element('img', array('src' => $avatarUrl, - 'class' => 'avatar photo', - 'width' => $size, - 'height' => $size, - 'alt' => - ($this->profile->fullname) ? - $this->profile->fullname : - $this->profile->nickname)); - } - function showActions() { $this->out->elementStart('div', 'entity_actions'); @@ -313,7 +283,6 @@ class PeopletagListItem extends Widget function showDescription() { - $this->out->element('div', 'entry-content description', - $this->peopletag->description); + $this->out->element('div', 'e-content description', $this->peopletag->description); } }