Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline...

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

diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
index 9c509664060523c1964f379dcdc8720c0f0cfa3b..0231f3a57fa7deeea7868bcd05cb20344576f7cd 100644 (file)
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@@ -167,6 +167,9 @@ class NoticeListItem extends Widget
             if ($this->notice->scope != 0 && $this->notice->scope != 1) {
                 $class .= ' limited-scope';
             }
+            if (!empty($this->notice->source)) {
+                $class .= ' notice-source-'.$this->notice->source;
+            }
             $this->out->elementStart('li', array('class' => $class,
                                                  'id' => 'notice-' . $id));
             Event::handle('EndOpenNoticeListItemElement', array($this));
@@ -202,20 +205,97 @@ 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()
+    {
+        $ga = $this->getGroupAddressees();
+        $pa = $this->getProfileAddressees();
+
+        $a = array_merge($ga, $pa);
+
+        if (!empty($a)) {
+            $this->out->elementStart('span', 'addressees');
+            $first = true;
+            foreach ($a as $addr) {
+                if (!$first) {
+                    // TRANS: Separator in profile addressees list.
+                    $this->out->text(_m('SEPARATOR',', '));
+                } else {
+                    // Start of profile addressees list.
+                    $first = false;
+                }
+                $text = $addr['text'];
+                unset($addr['text']);
+                $this->out->element('a', $addr, $text);
+            }
+            $this->out->elementEnd('span', 'addressees');
+        }
+    }
+
+    function getGroupAddressees()
+    {
+        $ga = array();
+
+        $groups = $this->getGroups();
+
+        foreach ($groups as $group) {
+            $ga[] = array('href' => $group->homeUrl(),
+                          'title' => $group->nickname,
+                          'class' => 'addressee group',
+                          'text' => $group->getBestName());
+        }
+
+        return $ga;
+    }
+
+    function getGroups()
+    {
+        return $this->notice->getGroups();
+    }
+
+    function getProfileAddressees()
+    {
+        $pa = array();
+
+        $replies = $this->getReplyProfiles();
+
+        foreach ($replies as $reply) {
+            $pa[] = array('href' => $reply->profileurl,
+                          'title' => $reply->nickname,
+                          'class' => 'addressee account',
+                          'text' => $reply->getBestName());
+        }
+
+        return $pa;
+    }
+
+    function getReplyProfiles()
+    {
+        return $this->notice->getReplyProfiles();
     }
 
     /**
@@ -424,7 +504,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(' ');
@@ -523,6 +603,7 @@ class NoticeListItem extends Widget
 
             // TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
             $this->out->raw(_('Repeated by'));
+            $this->out->raw(_(' '));
 
             $this->out->elementStart('a', $attrs);
             $this->out->element('span', 'fn nickname', $repeater->nickname);
@@ -549,7 +630,7 @@ class NoticeListItem extends Widget
             $this->out->elementStart('a', array('href' => $reply_url,
                                                 'class' => 'notice_reply',
                                                 // TRANS: Link title in notice list item to reply to a notice.
-                                                'title' => _('Reply to this notice')));
+                                                'title' => _('Reply to this notice.')));
             // TRANS: Link text in notice list item to reply to a notice.
             $this->out->text(_('Reply'));
             $this->out->text(' ');
@@ -577,7 +658,7 @@ class NoticeListItem extends Widget
             $this->out->element('a', array('href' => $deleteurl,
                                            'class' => 'notice_delete',
                                            // TRANS: Link title in notice list item to delete a notice.
-                                           'title' => _('Delete this notice')),
+                                           'title' => _('Delete this notice from the timeline.')),
                                            // TRANS: Link text in notice list item to delete a notice.
                                            _('Delete'));
         }