Improve display of user's groups page.

* Show page notice as for subscriptions
* Show instructions when user has no groups
* Add explanation of remote groups and link to skilledtest wiki

diff --git a/actions/usergroups.php b/actions/usergroups.php
index d4756dffb5914a995eaa0feac300b48a3ab86eb3..84f159f38dfd5aececa100c3a562c1fd9e56aa28 100644 (file)
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -62,21 +62,44 @@ class UsergroupsAction extends GalleryAction
         }
     }
 
-    function showContent()
+    function showPageNotice()
     {
-        $this->elementStart('p', array('id' => 'new_group'));
-        $this->element('a', array('href' => common_local_url('newgroup'),
-                                  'class' => 'more'),
-                       // TRANS: Link text on group page to create a new group.
-                       _('Create a new group'));
-        $this->elementEnd('p');
+        if ($this->scoped instanceof Profile && $this->scoped->sameAs($this->getTarget())) {
+            $this->element('p', null,
+                           // TRANS: Page notice for page with an overview of all subscribed groups
+                           // TRANS: of the logged in user's own profile.
+                           _('These are the groups whose notices '.
+                             'you listen to.'));
+        } else {
+            $this->element('p', null,
+                           // TRANS: Page notice for page with an overview of all groups a user other
+                           // TRANS: than the logged in user. %s is the user nickname.
+                           sprintf(_('These are the groups whose '.
+                                     'notices %s listens to.'),
+                                   $this->target->getNickname()));
+        }
+    }
 
-        $this->elementStart('p', array('id' => 'group_search'));
-        $this->element('a', array('href' => common_local_url('groupsearch'),
-                                  'class' => 'more'),
-                       // TRANS: Link text on group page to search for groups.
-                       _('Search for more groups'));
-        $this->elementEnd('p');
+    function showContent()
+    {
+        if ($this->scoped instanceof Profile && $this->scoped->sameAs($this->getTarget())) {
+         $notice =
+          // TRANS: Page notice of user's groups page.
+          // TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
+          // TRANS: This message contains Markdown links in the form [link text](link).
+          sprintf(_('Groups let you find and talk with ' .
+                   'people of similar interests. ' .
+                   'You can [search for groups](%%%%action.groups%%%%) in your instance or ' .
+                    '[create a new group](%%%%action.newgroup%%%%). ' .
+                   'You can also follow groups ' .
+                   'from other GNU social instances: click on the remote button below ' .
+                   'and copy the group\'s link. ' .
+                   'You can find a list of GNU social groups [here](http://skilledtests.com/wiki/List_of_federated_GNU_social_groups)' .
+                   ''));
+         $this->elementStart('div', 'instructions');
+         $this->raw(common_markup_to_html($notice));
+         $this->elementEnd('div');
+       }
 
         if (Event::handle('StartShowUserGroupsContent', array($this))) {
             $offset = ($this->page-1) * GROUPS_PER_PAGE;
@@ -87,11 +110,13 @@ class UsergroupsAction extends GalleryAction
             if ($groups instanceof User_group) {
                 $gl = new GroupList($groups, $this->getTarget(), $this);
                 $cnt = $gl->show();
-                $this->pagination($this->page > 1, $cnt > GROUPS_PER_PAGE,
-                              $this->page, 'usergroups',
-                              array('nickname' => $this->getTarget()->getNickname()));
-            } else {
-                $this->showEmptyListMessage();
+               if (0 == $cnt) {
+                 $this->showEmptyListMessage();
+               } else {
+                 $this->pagination($this->page > 1, $cnt > GROUPS_PER_PAGE,
+                                   $this->page, 'usergroups',
+                                   array('nickname' => $this->getTarget()->getNickname()));
+               }
             }
 
             Event::handle('EndShowUserGroupsContent', array($this));
@@ -103,15 +128,16 @@ class UsergroupsAction extends GalleryAction
         // TRANS: Text on group page for a user that is not a member of any group.
         // TRANS: %s is a user nickname.
         $message = sprintf(_('%s is not a member of any group.'), $this->getTarget()->getNickname()) . ' ';
-
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->scoped->sameAs($this->getTarget())) {
                 // TRANS: Text on group page for a user that is not a member of any group. This message contains
                 // TRANS: a Markdown link in the form [link text](link) and a variable that should not be changed.
-                $message .= _('Try [searching for groups](%%action.groupsearch%%) and joining them.');
+               $message = _('You are not member of any group yet. After you join a group ' .
+                            'you can send messages to its members using the ' .
+                            'syntax "!groupname".');
             }
-        }
+       }
         $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');