better output for registration confirmation

[quix0rs-gnu-social.git] / lib / noticelistitem.php

diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
index 9c509664060523c1964f379dcdc8720c0f0cfa3b..05b0dab16ee806baf78d93fa1720af61b3fcaa43 100644 (file)
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@@ -202,20 +202,91 @@ class NoticeListItem extends Widget
      *
      * @return void
      */
+
     function showAuthor()
     {
+        $this->out->elementStart('div', 'author');
+
         $this->out->elementStart('span', 'vcard author');
+
         $attrs = array('href' => $this->profile->profileurl,
-                       'class' => 'url');
-        if (!empty($this->profile->fullname)) {
-            $attrs['title'] = $this->profile->getFancyName();
-        }
+                       'class' => 'url',
+                       'title' => $this->profile->nickname);
+
         $this->out->elementStart('a', $attrs);
         $this->showAvatar();
         $this->out->text(' ');
-        $this->showNickname();
+        $this->out->element('span',array('class' => 'fn'),
+                            $this->profile->getBestName());
         $this->out->elementEnd('a');
+
         $this->out->elementEnd('span');
+
+        $this->showAddressees();
+
+        $this->out->elementEnd('div');
+    }
+
+    function showAddressees()
+    {
+        $this->out->elementStart('span', 'addressees');
+
+        $cnt = $this->showGroupAddressees(true);
+        $cnt = $this->showProfileAddressees($cnt == 0);
+
+        $this->out->elementEnd('span', 'addressees');
+    }
+
+    function showGroupAddressees($first)
+    {
+        $groups = $this->getGroups();
+
+        foreach ($groups as $group) {
+            if (!$first) {
+                $this->out->text( _m('SEPARATOR',', '));
+            } else {
+                $this->out->text(_(' ▸ '));
+                $first = false;
+            }
+            $this->out->element('a', array('href' => $group->homeUrl(),
+                                           'title' => $group->nickname,
+                                           'class' => 'addressee group'),
+                                $group->getBestName());
+        }
+
+        return count($groups);
+    }
+
+    function getGroups()
+    {
+        return $this->notice->getGroups();
+    }
+
+    function showProfileAddressees($first)
+    {
+        $replies = $this->getReplyProfiles();
+
+        foreach ($replies as $reply) {
+            if (!$first) {
+                // TRANS: Separator in profile addressees list.
+                $this->out->text(_m('SEPARATOR',', '));
+            } else {
+                // TRANS: Start of profile addressees list.
+                $this->out->text(_(' ▸ '));
+                $first = false;
+            }
+            $this->out->element('a', array('href' => $reply->profileurl,
+                                           'title' => $reply->nickname,
+                                           'class' => 'addressee account'),
+                                $reply->getBestName());
+        }
+
+        return count($replies);
+    }
+
+    function getReplyProfiles()
+    {
+        return $this->notice->getReplyProfiles();
     }
 
     /**
@@ -424,7 +495,7 @@ class NoticeListItem extends Widget
             $source_name = (empty($ns->name)) ? ($ns->code ? _($ns->code) : _m('SOURCE','web')) : _($ns->name);
             $this->out->text(' ');
             $this->out->elementStart('span', 'source');
-            // FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).
+            // @todo FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).
             // TRANS: Followed by notice source.
             $this->out->text(_('from'));
             $this->out->text(' ');