Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 34a43e61ae72a8e4e2345a2f7d787549adb53543..d29a149573323b56ffd612643de9a7aa59d49d0e 100644 (file)
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/widget.php';
 
-define('GROUPS_PER_PAGE', 20);
-
 /**
  * Widget to show a list of groups
  *
@@ -85,36 +83,29 @@ class GroupList extends Widget
 
     function showGroup()
     {
-        $this->out->elementStart('li', array('class' => 'profile hentry',
+        $this->out->elementStart('li', array('class' => 'profile h-card',
                                              'id' => 'group-' . $this->group->id));
 
         $user = common_current_user();
 
-        $this->out->elementStart('div', 'entity_profile vcard entry-content');
+        $this->out->elementStart('div', 'entity_profile');
 
-        $logo = ($this->group->stream_logo) ?
-          $this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
+        $logo = $this->group->stream_logo ?: User_group::defaultLogo(AVATAR_STREAM_SIZE);
 
         $this->out->elementStart('a', array('href' => $this->group->homeUrl(),
-                                            'class' => 'url entry-title',
+                                            'class' => 'u-url p-nickname',
                                             'rel' => 'contact group'));
         $this->out->element('img', array('src' => $logo,
-                                         'class' => 'photo avatar',
+                                         'class' => 'avatar u-photo',
                                          'width' => AVATAR_STREAM_SIZE,
                                          'height' => AVATAR_STREAM_SIZE,
-                                         'alt' =>
-                                         ($this->group->fullname) ? $this->group->fullname :
-                                         $this->group->nickname));
-        $this->out->text(' ');
-        $hasFN = ($this->group->fullname) ? 'nickname' : 'fn org nickname';
-        $this->out->elementStart('span', $hasFN);
-        $this->out->raw($this->highlight($this->group->nickname));
-        $this->out->elementEnd('span');
+                                         'alt' => $this->group->getBestName()));
+        $this->out->text($this->group->getNickname());
         $this->out->elementEnd('a');
 
         if ($this->group->fullname) {
             $this->out->text(' ');
-            $this->out->elementStart('span', 'fn org');
+            $this->out->elementStart('span', 'p-name');
             $this->out->raw($this->highlight($this->group->fullname));
             $this->out->elementEnd('span');
         }
@@ -127,7 +118,7 @@ class GroupList extends Widget
         if ($this->group->homepage) {
             $this->out->text(' ');
             $this->out->elementStart('a', array('href' => $this->group->homepage,
-                                                'class' => 'url'));
+                                                'class' => 'u-url'));
             $this->out->raw($this->highlight($this->group->homepage));
             $this->out->elementEnd('a');
         }
@@ -145,7 +136,7 @@ class GroupList extends Widget
 
         $this->out->elementEnd('div');
 
-        if ($user) {
+        if ($user instanceof User) {
             $this->out->elementStart('div', 'entity_actions');
             $this->out->elementStart('ul');
             $this->out->elementStart('li', 'entity_subscribe');