X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowgroup.php;h=411940ef9a2ed124a036e2db7d3fa53664aca0e2;hb=b8b1fbb6b5cb3a044acab3487e0a041220bf263d;hp=2806944452288c95c4f03a3780f54876b1574328;hpb=b09276635c6e20290f0955c4f86ff4a13c7774de;p=quix0rs-gnu-social.git

diff --git a/actions/showgroup.php b/actions/showgroup.php
index 2806944452..411940ef9a 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -167,7 +167,7 @@ class ShowgroupAction extends GroupDesignAction
      *
      * @return void
      */
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new GroupNav($this, $this->group);
         $nav->show();
@@ -195,7 +195,7 @@ class ShowgroupAction extends GroupDesignAction
         $notice = $this->group->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                            NOTICES_PER_PAGE + 1);
 
-        $nl = new NoticeList($notice, $this);
+        $nl = new ThreadedNoticeList($notice, $this);
         $cnt = $nl->show();
 
         $this->pagination($this->page > 1,
@@ -217,66 +217,47 @@ class ShowgroupAction extends GroupDesignAction
         $this->elementStart('div', array('id' => 'i',
                                          'class' => 'entity_profile vcard author'));
 
-        if (Event::handle('StartGroupProfileElements', array($this, $this->group))) {
-
-            // TRANS: Group profile header (h2). Text hidden by default.
-            $this->element('h2', null, _('Group profile'));
-
-            $this->elementStart('dl', 'entity_depiction');
-            // TRANS: Label for group avatar (dt). Text hidden by default.
-            $this->element('dt', null, _('Avatar'));
-            $this->elementStart('dd');
-
-            $logo = ($this->group->homepage_logo) ?
-                $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
-
-            $this->element('img', array('src' => $logo,
-                                        'class' => 'photo avatar',
-                                        'width' => AVATAR_PROFILE_SIZE,
-                                        'height' => AVATAR_PROFILE_SIZE,
-                                        'alt' => $this->group->nickname));
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-
-            $this->elementStart('dl', 'entity_nickname');
-            // TRANS: Label for group nickname (dt). Text hidden by default.
-            $this->element('dt', null, _('Nickname'));
-            $this->elementStart('dd');
-            $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid';
-            $this->element('a', array('href' => $this->group->homeUrl(),
-                                      'rel' => 'me', 'class' => $hasFN),
-                           $this->group->nickname);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-
-            if ($this->group->fullname) {
-                $this->elementStart('dl', 'entity_fn');
-                // TRANS: Label for full group name (dt). Text hidden by default.
-                $this->element('dt', null, _('Full name'));
-                $this->elementStart('dd');
-                $this->element('span', 'fn org', $this->group->fullname);
-                $this->elementEnd('dd');
-                $this->elementEnd('dl');
-            }
+        $logo = ($this->group->homepage_logo) ?
+          $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
 
-            if ($this->group->location) {
-                $this->elementStart('dl', 'entity_location');
-                // TRANS: Label for group location (dt). Text hidden by default.
-                $this->element('dt', null, _('Location'));
-                $this->element('dd', 'label', $this->group->location);
-                $this->elementEnd('dl');
-            }
+        $this->element('img', array('src' => $logo,
+                                    'class' => 'photo avatar entity_depiction',
+                                    'width' => AVATAR_PROFILE_SIZE,
+                                    'height' => AVATAR_PROFILE_SIZE,
+                                    'alt' => $this->group->nickname));
 
-            if ($this->group->homepage) {
-                $this->elementStart('dl', 'entity_url');
-                // TRANS: Label for group URL (dt). Text hidden by default.
-                $this->element('dt', null, _('URL'));
-                $this->elementStart('dd');
-                $this->element('a', array('href' => $this->group->homepage,
-                                          'rel' => 'me', 'class' => 'url'),
-                               $this->group->homepage);
-                $this->elementEnd('dd');
-                $this->elementEnd('dl');
+        $hasFN = ($this->group->fullname) ? 'entity_nickname nickname url uid' :
+            'entity_nickname fn org nickname url uid';
+        $this->element('a', array('href' => $this->group->homeUrl(),
+                                  'rel' => 'me', 'class' => $hasFN),
+                            $this->group->nickname);
+
+        if ($this->group->fullname) {
+            $this->element('div', 'entity_fn fn org', $this->group->fullname);
+        }
+
+        if ($this->group->location) {
+            $this->element('div', 'entity_location label', $this->group->location);
+        }
+
+        if ($this->group->homepage) {
+            $this->element('a', array('href' => $this->group->homepage,
+                                      'rel' => 'me',
+                                      'class' => 'url entity_url'),
+                           $this->group->homepage);
+        }
+
+        if ($this->group->description) {
+            $this->element('div', 'note entity_note', $this->group->description);
+        }
+
+        if (common_config('group', 'maxaliases') > 0) {
+            $aliases = $this->group->getAliases();
+
+            if (!empty($aliases)) {
+                $this->element('div',
+                               'aliases entity_aliases',
+                               implode(' ', $aliases));
             }
 
             if ($this->group->description) {
@@ -459,15 +440,10 @@ class ShowgroupAction extends GroupDesignAction
         // TRANS: Header for group statistics on a group page (h2).
         $this->element('h2', null, _('Statistics'));
 
-        $this->elementStart('dl', 'entity_created');
-        // @todo FIXME: i18n issue. This label gets a colon added from somewhere. Should be part of the message.
-        // TRANS: Label for creation date in statistics on group page.
+        $this->elementEnd('dl');
         $this->element('dt', null, _m('LABEL','Created'));
-        $this->element('dd', null, date('j M Y',
+        $this->element('dd', 'entity_created', date('j M Y',
                                                  strtotime($this->group->created)));
-        $this->elementEnd('dl');
-
-        $this->elementStart('dl', 'entity_members');
         // @todo FIXME: i18n issue. This label gets a colon added from somewhere. Should be part of the message.
         // TRANS: Label for member count in statistics on group page.
         $this->element('dt', null, _m('LABEL','Members'));