wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'usergroups_page' into 'nightly'

Browse Source 
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

Here is how it looks when a logged in user is not following groups yet

![login_nogroups](https://git.gnu.io/aroque/gnu-social/uploads/34b1bdcdb9e7277ec3deff4594061c59/login_nogroups.png)

After following a group, you still see the instruction notice. This way you have links to searching groups and creating a new one.

![login_groups](https://git.gnu.io/aroque/gnu-social/uploads/cb50689bcdfca7adc5cdcbe620487aa4/login_groups.png)

Finally when logged out:

![nologin_groups](https://git.gnu.io/aroque/gnu-social/uploads/40d81ab909321f8729c2696dd3938d46/nologin_groups.png)

The current version on nightly has basically no text at all.

See merge request !25
This commit is contained in:
mmn 2015-10-10 20:35:36 +00:00
commit 89d3d9b2ce
1 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
actions/usergroups.php
View File

@ -62,21 +62,44 @@ class UsergroupsAction extends GalleryAction
} }
} }
function showPageNotice()
{
if ($this->scoped instanceof Profile && $this->scoped->sameAs($this->getTarget())) {
$this->element('p', 'instructions',
// 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', 'instructions',
// 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()));
}
}
function showContent() function showContent()
{ {
$this->elementStart('p', array('id' => 'new_group')); if ($this->scoped instanceof Profile && $this->scoped->sameAs($this->getTarget())) {
$this->element('a', array('href' => common_local_url('newgroup'), $notice =
'class' => 'more'), // TRANS: Page notice of user's groups page.
// TRANS: Link text on group page to create a new group. // TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
_('Create a new group')); // TRANS: This message contains Markdown links in the form [link text](link).
$this->elementEnd('p'); sprintf(_('Groups let you find and talk with ' .
'people of similar interests. ' .
$this->elementStart('p', array('id' => 'group_search')); 'You can [search for groups](%%%%action.groups%%%%) in your instance or ' .
$this->element('a', array('href' => common_local_url('groupsearch'), '[create a new group](%%%%action.newgroup%%%%). ' .
'class' => 'more'), 'You can also follow groups ' .
// TRANS: Link text on group page to search for groups. 'from other GNU social instances: click on the remote button below ' .
_('Search for more groups')); 'and copy the group\'s link. ' .
$this->elementEnd('p'); '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))) { if (Event::handle('StartShowUserGroupsContent', array($this))) {
$offset = ($this->page-1) * GROUPS_PER_PAGE; $offset = ($this->page-1) * GROUPS_PER_PAGE;
@ -87,11 +110,13 @@ class UsergroupsAction extends GalleryAction
if ($groups instanceof User_group) { if ($groups instanceof User_group) {
$gl = new GroupList($groups, $this->getTarget(), $this); $gl = new GroupList($groups, $this->getTarget(), $this);
$cnt = $gl->show(); $cnt = $gl->show();
if (0 == $cnt) {
$this->showEmptyListMessage();
} else {
$this->pagination($this->page > 1, $cnt > GROUPS_PER_PAGE, $this->pagination($this->page > 1, $cnt > GROUPS_PER_PAGE,
$this->page, 'usergroups', $this->page, 'usergroups',
array('nickname' => $this->getTarget()->getNickname())); array('nickname' => $this->getTarget()->getNickname()));
} else { }
$this->showEmptyListMessage();
} }
Event::handle('EndShowUserGroupsContent', array($this)); Event::handle('EndShowUserGroupsContent', array($this));
@ -103,13 +128,13 @@ class UsergroupsAction extends GalleryAction
// TRANS: Text on group page for a user that is not a member of any group. // TRANS: Text on group page for a user that is not a member of any group.
// TRANS: %s is a user nickname. // TRANS: %s is a user nickname.
$message = sprintf(_('%s is not a member of any group.'), $this->getTarget()->getNickname()) . ' '; $message = sprintf(_('%s is not a member of any group.'), $this->getTarget()->getNickname()) . ' ';
if (common_logged_in()) { if (common_logged_in()) {
$current_user = common_current_user();
if ($this->scoped->sameAs($this->getTarget())) { 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: 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. // 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->elementStart('div', 'guide');