GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

better pagination and no rows in subscriptions and subscribed

Browse Source 
darcs-hash:20080618165041-84dde-d98bebb8e74286993c582710ae385d5d7ef1b3fb.gz
This commit is contained in:
Evan Prodromou 2008-06-18 12:50:41 -04:00
parent a4b36e28f4
commit b87ba90732
2 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
actions/subscribed.php
View File

@ -75,9 +75,6 @@ class SubscribedAction extends Action {
while ($subs->fetch()) { while ($subs->fetch()) {
$idx++; $idx++;
if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
common_element_start('div', 'row');
}
$other = Profile::staticGet($subs->subscriber); $other = Profile::staticGet($subs->subscriber);
@ -98,32 +95,14 @@ class SubscribedAction extends Action {
# XXX: subscribe form here # XXX: subscribe form here
if ($idx % SUBSCRIPTIONS_PER_ROW == 0) {
common_element_end('div');
}
if ($idx == SUBSCRIPTIONS_PER_PAGE) { if ($idx == SUBSCRIPTIONS_PER_PAGE) {
break; break;
} }
} }
if ($page > 1) {
common_element('a', array('href' =>
common_local_url('subscriptions',
array('nickname' => $profile->nickname,
'page' => $page - 1)),
'class' => 'prev'),
_t('Previous'));
}
if ($subs_count > SUBSCRIPTIONS_PER_PAGE) {
common_element('a', array('href' =>
common_local_url('subscriptions',
array('nickname' => $profile->nickname,
'page' => $page + 1)),
'class' => 'next'),
_t('Next'));
}
common_element_end('div'); common_element_end('div');
common_pagination($page > 1, $subs_count > SUBSCRIPTIONS_PER_PAGE,
$page, 'subscribed', array('nickname' => $profile->nickname));
} }
} }

27
actions/subscriptions.php
View File

@ -72,9 +72,6 @@ class SubscriptionsAction extends Action {
while ($subs->fetch()) { while ($subs->fetch()) {
$idx++; $idx++;
if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
common_element_start('div', 'row');
}
$other = Profile::staticGet($subs->subscribed); $other = Profile::staticGet($subs->subscribed);
@ -98,32 +95,14 @@ class SubscriptionsAction extends Action {
# XXX: subscribe form here # XXX: subscribe form here
if ($idx % SUBSCRIPTIONS_PER_ROW == 0) {
common_element_end('div');
}
if ($idx == SUBSCRIPTIONS_PER_PAGE) { if ($idx == SUBSCRIPTIONS_PER_PAGE) {
break; break;
} }
} }
if ($page > 1) {
common_element('a', array('href' =>
common_local_url('subscriptions',
array('nickname' => $profile->nickname,
'page' => $page - 1)),
'class' => 'prev'),
_t('Previous'));
}
if ($subs_count > SUBSCRIPTIONS_PER_PAGE) {
common_element('a', array('href' =>
common_local_url('subscriptions',
array('nickname' => $profile->nickname,
'page' => $page + 1)),
'class' => 'next'),
_t('Next'));
}
common_element_end('div'); common_element_end('div');
common_pagination($page > 1, $subs_count > SUBSCRIPTIONS_PER_PAGE,
$page, 'subscriptions', array('nickname' => $profile->nickname));
} }
} }