Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / plugins / Directory / lib / sortablegrouplist.php

diff --git a/plugins/Directory/lib/sortablegrouplist.php b/plugins/Directory/lib/sortablegrouplist.php
index db6bc1d068e9b14781d7e7ce33c426157120b36b..4f34a8a897722be45c7f8584ee197157ffe40a5d 100644 (file)
--- a/plugins/Directory/lib/sortablegrouplist.php
+++ b/plugins/Directory/lib/sortablegrouplist.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
@@ -43,7 +42,6 @@ require_once INSTALLDIR . '/lib/subscriptionlist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class SortableGroupList extends SortableSubscriptionList
 {
     /** Owner of this list */
@@ -63,12 +61,13 @@ class SortableGroupList extends SortableSubscriptionList
         $this->out->elementStart('tr');
 
         $tableHeaders = array(
+            // TRANS: Column header in table for user nickname.
             'nickname'    => _m('Nickname'),
+            // TRANS: Column header in table for timestamp when user was created.
             'created'     => _m('Created')
         );
 
         foreach ($tableHeaders as $id => $label) {
-
             $attrs   = array('id' => $id);
             $current = (!empty($this->action->sort) && $this->action->sort == $id);
 
@@ -110,8 +109,8 @@ class SortableGroupList extends SortableSubscriptionList
             $this->out->elementEnd('th');
         }
 
+        // TRANS: Column header in table for members of a group.
         $this->out->element('th', array('id' => 'Members'), _m('Members'));
-        $this->out->element('th', array('id' => 'Admins'), _m('Admins'));
         $this->out->element('th', array('id' => 'controls'), null);
 
         $this->out->elementEnd('tr');
@@ -139,20 +138,6 @@ class SortableGroupListItem extends SortableSubscriptionListItem
         $this->owner = $owner;
     }
 
-    function startItem()
-    {
-        $attr = array(
-            'class' => 'profile',
-            'id'    => 'profile-' . $this->profile->id
-        );
-
-        if ($this->alt) {
-            $attr['class'] .= ' alt';
-        }
-
-        $this->out->elementStart('tr', $attr);
-    }
-
     function showHomepage()
     {
         if (!empty($this->profile->homepage)) {
@@ -166,54 +151,37 @@ class SortableGroupListItem extends SortableSubscriptionListItem
 
     function showAvatar()
     {
-        $avatar = $this->profile->stream_logo;
-        $aAttrs = $this->linkAttributes();
-        $this->out->elementStart('a', $aAttrs);
+        $logo = ($this->profile->stream_logo) ?
+        $this->profile->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
+
+        $this->out->elementStart(
+            'a',
+            array(
+                'href'  => $this->profile->homeUrl(),
+                'class' => 'url entry-title',
+                'rel'   => 'contact group'
+            )
+        );
         $this->out->element(
-            'img', 
-             array(
-                'src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
+            'img',
+            array(
+                'src'    => $logo,
                 'class'  => 'photo avatar',
                 'width'  => AVATAR_STREAM_SIZE,
                 'height' => AVATAR_STREAM_SIZE,
-                'alt'    => ($this->profile->fullname) ? $this->profile->fullname : $this->profile->nickname
-             )
+                'alt'    => ($this->profile->fullname)
+                    ? $this->profile->fullname : $this->profile->nickname
+            )
         );
+
         $this->out->text(' ');
-        $hasFN = (!empty($this->profile->fullname)) ? 'nickname' : 'fn nickname';
+        $hasFN = ($this->profile->fullname) ? 'nickname' : 'fn org nickname';
         $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->profile->nickname));
         $this->out->elementEnd('span');
         $this->out->elementEnd('a');
     }
 
-    function endItem()
-    {
-        $this->out->elementEnd('tr');
-    }
-
-    function startProfile()
-    {
-        $this->out->elementStart('td', 'entity_profile vcard entry-content');
-    }
-
-    function endProfile()
-    {
-        $this->out->elementEnd('td');
-    }
-
-    function startActions()
-    {
-        $this->out->elementStart('td', 'entity_actions');
-        $this->out->elementStart('ul');
-    }
-
-    function endActions()
-    {
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('td');
-    }
-
     function show()
     {
         if (Event::handle('StartProfileListItem', array($this))) {
@@ -226,13 +194,13 @@ class SortableGroupListItem extends SortableSubscriptionListItem
             // XXX Add events?
             $this->showCreatedDate();
             $this->showMemberCount();
-            $this->showAdmins();
 
             if (Event::handle('StartProfileListItemActions', array($this))) {
                 $this->showActions();
                 Event::handle('EndProfileListItemActions', array($this));
             }
             $this->endItem();
+
             Event::handle('EndProfileListItem', array($this));
         }
     }
@@ -251,7 +219,7 @@ class SortableGroupListItem extends SortableSubscriptionListItem
     {
         $user = $this->owner;
         if ($user) {
-  
+
             $this->out->elementStart('li', 'entity_subscribe');
             // XXX: special-case for user looking at own
             // subscriptions page
@@ -262,12 +230,14 @@ class SortableGroupListItem extends SortableSubscriptionListItem
                 $jf = new JoinForm($this->out, $this->profile);
                 $jf->show();
             }
+
+            $this->out->elementEnd('li');
         }
     }
 
     function showMemberCount()
     {
-        $this->out->elementStart('td', 'entry_subscriber_count');
+        $this->out->elementStart('td', 'entry_member_count');
         $this->out->raw($this->profile->getMemberCount());
         $this->out->elementEnd('td');
     }
@@ -275,13 +245,14 @@ class SortableGroupListItem extends SortableSubscriptionListItem
     function showCreatedDate()
     {
         $this->out->elementStart('td', 'entry_created');
+        // @todo FIXME: Should we provide i18n for timestamps in core?
         $this->out->raw(date('j M Y', strtotime($this->profile->created)));
         $this->out->elementEnd('td');
     }
 
     function showAdmins()
     {
-        $this->out->elementStart('td', 'entry_notice_count');
+        $this->out->elementStart('td', 'entry_admins');
         // @todo
         $this->out->raw('gargargar');
         $this->out->elementEnd('td');
@@ -297,5 +268,4 @@ class SortableGroupListItem extends SortableSubscriptionListItem
         }
 
     }
-
 }