Removed dl "stuff"

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

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 4c448e250d5011b13d3d8280fac33c97cf482bd5..39a9b2d948c0b674d149a5ae97b466ccf7734ec0 100644 (file)
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Widget to show a list of groups
  *
@@ -21,14 +21,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Public
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-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,10 +40,10 @@ define('GROUPS_PER_PAGE', 20);
  * Widget to show a list of groups
  *
  * @category Public
- * @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 GroupList extends Widget
@@ -97,7 +97,7 @@ class GroupList extends Widget
 
         $this->out->elementStart('a', array('href' => $this->group->homeUrl(),
                                             'class' => 'url',
-                                            'rel' => 'group'));
+                                            'rel' => 'contact group'));
         $this->out->element('img', array('src' => $logo,
                                          'class' => 'photo avatar',
                                          'width' => AVATAR_STREAM_SIZE,
@@ -105,53 +105,36 @@ class GroupList extends Widget
                                          'alt' =>
                                          ($this->group->fullname) ? $this->group->fullname :
                                          $this->group->nickname));
-        $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid';
+        $hasFN = ($this->group->fullname) ? 'nickname url' : 'fn org nickname url';
         $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->group->nickname));
         $this->out->elementEnd('span');
         $this->out->elementEnd('a');
 
         if ($this->group->fullname) {
-            $this->out->elementStart('dl', 'entity_fn');
-            $this->out->element('dt', null, 'Full name');
-            $this->out->elementStart('dd');
             $this->out->elementStart('span', 'fn org');
             $this->out->raw($this->highlight($this->group->fullname));
             $this->out->elementEnd('span');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
         if ($this->group->location) {
-            $this->out->elementStart('dl', 'entity_location');
-            $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'location');
+            $this->out->elementStart('span', 'label');
             $this->out->raw($this->highlight($this->group->location));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
         if ($this->group->homepage) {
-            $this->out->elementStart('dl', 'entity_url');
-            $this->out->element('dt', null, _('URL'));
-            $this->out->elementStart('dd');
             $this->out->elementStart('a', array('href' => $this->group->homepage,
                                                 'class' => 'url'));
             $this->out->raw($this->highlight($this->group->homepage));
             $this->out->elementEnd('a');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
         if ($this->group->description) {
-            $this->out->elementStart('dl', 'entity_note');
-            $this->out->element('dt', null, _('Note'));
-            $this->out->elementStart('dd', 'note');
+            $this->out->elementStart('p', 'note');
             $this->out->raw($this->highlight($this->group->description));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('p');
         }
 
         # 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();
         }
 
@@ -166,7 +149,7 @@ class GroupList extends Widget
             if ($user->isMember($this->group)) {
                 $lf = new LeaveForm($this->out, $this->group);
                 $lf->show();
-            } else {
+            } else if (!Group_block::isBlocked($this->group, $user->getProfile())) {
                 $jf = new JoinForm($this->out, $this->group);
                 $jf->show();
             }