No more needed (for this fix) but maybe later. So I always only comment them out.

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

diff --git a/lib/groupsection.php b/lib/groupsection.php
index bf26ab48ca7226c209b6e2e046d577bbebade127..fa648f5062fae77628a114caa5e16da020fcd08c 100644 (file)
--- a/lib/groupsection.php
+++ b/lib/groupsection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Base class for sections showing lists of groups
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Widget
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -40,13 +40,12 @@ define('GROUPS_PER_SECTION', 6);
  * group, or site.
  *
  * @category Widget
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
-
-class GroupSection extends Section
+abstract class GroupSection extends Section
 {
     function showContent()
     {
@@ -58,13 +57,13 @@ class GroupSection extends Section
 
         $cnt = 0;
 
-        $this->out->elementStart('ul', 'entities group xoxo');
+        $this->out->elementStart('table');
 
         while ($profiles->fetch() && ++$cnt <= GROUPS_PER_SECTION) {
             $this->showGroup($profiles);
         }
 
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('table');
 
         return ($cnt > GROUPS_PER_SECTION);
     }
@@ -76,28 +75,24 @@ class GroupSection extends Section
 
     function showGroup($group)
     {
-        $this->out->elementStart('li', 'vcard');
-        $this->out->elementStart('a', array('title' => ($group->fullname) ?
-                                            $group->fullname :
-                                            $group->nickname,
+        $this->out->elementStart('tr');
+        $this->out->elementStart('td');
+        $this->out->elementStart('a', array('title' => $group->getBestName(),
                                             'href' => $group->homeUrl(),
                                             'rel' => 'contact group',
-                                            'class' => 'url'));
-        $logo = ($group->stream_logo) ?
-          $group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
-
+                                            'class' => 'h-card org nickname'));
+        $logo = $group->stream_logo ?: User_group::defaultLogo(AVATAR_STREAM_SIZE);
         $this->out->element('img', array('src' => $logo,
                                          'width' => AVATAR_MINI_SIZE,
                                          'height' => AVATAR_MINI_SIZE,
-                                         'class' => 'avatar photo',
-                                         'alt' =>  ($group->fullname) ?
-                                         $group->fullname :
-                                         $group->nickname));
-        $this->out->element('span', 'fn org nickname', $group->nickname);
+                                         'class' => 'avatar u-photo',
+                                         'alt' =>  $group->getBestName()));
+        $this->out->text($group->nickname);
         $this->out->elementEnd('a');
+        $this->out->elementEnd('td');
         if ($group->value) {
-            $this->out->element('span', 'value', $group->value);
+            $this->out->element('td', 'value', $group->value);
         }
-        $this->out->elementEnd('li');
+        $this->out->elementEnd('tr');
     }
 }