Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

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

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 869e448970cc9c968f4074a1df69b06a19644398..8e2637fec9626de9615f6243b2e3cba5dd19acee 100644 (file)
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -34,7 +34,7 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/widget.php';
 
-define('groupS_PER_PAGE', 20);
+define('GROUPS_PER_PAGE', 20);
 
 /**
  * Widget to show a list of groups
@@ -72,7 +72,7 @@ class GroupList extends Widget
 
         while ($this->group->fetch()) {
             $cnt++;
-            if($cnt > groupS_PER_PAGE) {
+            if($cnt > GROUPS_PER_PAGE) {
                 break;
             }
             $this->showgroup();
@@ -99,12 +99,12 @@ class GroupList extends Widget
                                             'class' => 'url',
                                             'rel' => 'group'));
         $this->out->element('img', array('src' => $logo,
-                                    'class' => 'photo avatar',
-                                    'width' => AVATAR_STREAM_SIZE,
-                                    'height' => AVATAR_STREAM_SIZE,
-                                    'alt' =>
-                                    ($this->group->fullname) ? $this->group->fullname :
-                                    $this->group->nickname));
+                                         'class' => 'photo avatar',
+                                         'width' => AVATAR_STREAM_SIZE,
+                                         'height' => AVATAR_STREAM_SIZE,
+                                         'alt' =>
+                                         ($this->group->fullname) ? $this->group->fullname :
+                                         $this->group->nickname));
         $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid';
         $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->group->nickname));
@@ -124,7 +124,7 @@ class GroupList extends Widget
         if ($this->group->location) {
             $this->out->elementStart('dl', 'entity_location');
             $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'location');
+            $this->out->elementStart('dd', 'label');
             $this->out->raw($this->highlight($this->group->location));
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');
@@ -151,22 +151,30 @@ class GroupList extends Widget
 
         # If we're on a list with an owner (subscriptions or subscribers)...
 
-        if ($user && $user->id == $this->owner->id) {
+        if (!empty($user) && !empty($this->owner) && $user->id == $this->owner->id) {
             $this->showOwnerControls();
         }
 
         $this->out->elementEnd('div');
 
         if ($user) {
+            $this->out->elementStart('div', 'entity_actions');
+            $this->out->elementStart('ul');
+            $this->out->elementStart('li', 'entity_subscribe');
             # XXX: special-case for user looking at own
             # subscriptions page
             if ($user->isMember($this->group)) {
-                $lf = new LeaveForm($this->out, $this->group);
-                $lf->show();
+                if (!$user->isAdmin($this->group)) {
+                    $lf = new LeaveForm($this->out, $this->group);
+                    $lf->show();
+                }
             } else {
-                $jf = new JoinForm();
+                $jf = new JoinForm($this->out, $this->group);
                 $jf->show();
             }
+            $this->out->elementEnd('li');
+            $this->out->elementEnd('ul');
+            $this->out->elementEnd('div');
         }
 
         $this->out->elementEnd('li');