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

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

Browse Source
This commit is contained in:
Zach Copley 2009-04-07 18:30:41 -07:00
commit a8a870303e
5 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/showfavorites.php
View File

@ -203,7 +203,7 @@ class ShowfavoritesAction extends Action
$cnt = $nl->show(); $cnt = $nl->show();
if (0 == $cnt) { if (0 == $cnt) {
$this->showemptyListMessage(); $this->showEmptyListMessage();
} }
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,

2
actions/showstream.php
View File

@ -357,7 +357,7 @@ class ShowstreamAction extends ProfileAction
$pnl = new ProfileNoticeList($notice, $this); $pnl = new ProfileNoticeList($notice, $this);
$cnt = $pnl->show(); $cnt = $pnl->show();
if (0 == $cnt) { if (0 == $cnt) {
$this->showemptyListMessage(); $this->showEmptyListMessage();
} }
$this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page, $this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,

22
actions/subscribers.php
View File

@ -88,6 +88,9 @@ class SubscribersAction extends GalleryAction
if ($subscribers) { if ($subscribers) {
$subscribers_list = new SubscribersList($subscribers, $this->user, $this); $subscribers_list = new SubscribersList($subscribers, $this->user, $this);
$cnt = $subscribers_list->show(); $cnt = $subscribers_list->show();
if (0 == $cnt) {
$this->showEmptyListMessage();
}
} }
$subscribers->free(); $subscribers->free();
@ -96,6 +99,25 @@ class SubscribersAction extends GalleryAction
$this->page, 'subscribers', $this->page, 'subscribers',
array('nickname' => $this->user->nickname)); array('nickname' => $this->user->nickname));
} }
function showEmptyListMessage()
{
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
$message = _('You have no subscribers. Try subscribing to people you know and they might return the favor');
} else {
$message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname);
}
}
else {
$message = sprintf(_('%s has no subscribers. Why not [register an account](%%%%action.register%%%%) and be the first?'), $this->user->nickname);
}
$this->elementStart('div', 'guide');
$this->raw(common_markup_to_html($message));
$this->elementEnd('div');
}
} }
class SubscribersList extends ProfileList class SubscribersList extends ProfileList

22
actions/subscriptions.php
View File

@ -95,6 +95,9 @@ class SubscriptionsAction extends GalleryAction
if ($subscriptions) { if ($subscriptions) {
$subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this); $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this);
$cnt = $subscriptions_list->show(); $cnt = $subscriptions_list->show();
if (0 == $cnt) {
$this->showEmptyListMessage();
}
} }
$subscriptions->free(); $subscriptions->free();
@ -103,6 +106,25 @@ class SubscriptionsAction extends GalleryAction
$this->page, 'subscriptions', $this->page, 'subscriptions',
array('nickname' => $this->user->nickname)); array('nickname' => $this->user->nickname));
} }
function showEmptyListMessage()
{
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
$message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to people you already follow there.');
} else {
$message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname);
}
}
else {
$message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname);
}
$this->elementStart('div', 'guide');
$this->raw(common_markup_to_html($message));
$this->elementEnd('div');
}
} }
class SubscriptionsList extends ProfileList class SubscriptionsList extends ProfileList

18
actions/usergroups.php
View File

@ -139,10 +139,28 @@ class UsergroupsAction extends Action
if ($groups) { if ($groups) {
$gl = new GroupList($groups, $this->user, $this); $gl = new GroupList($groups, $this->user, $this);
$cnt = $gl->show(); $cnt = $gl->show();
if (0 == $cnt) {
$this->showEmptyListMessage();
}
} }
$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->user->nickname)); array('nickname' => $this->user->nickname));
} }
function showEmptyListMessage()
{
$message = sprintf(_('%s is not a member of any group.'), $this->user->nickname) . ' ';
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
$message .= _('Try [searching for groups](%%action.groupsearch%%) and joining them.');
}
}
$this->elementStart('div', 'guide');
$this->raw(common_markup_to_html($message));
$this->elementEnd('div');
}
} }