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

re-write the subscriptions section

Browse Source 
darcs-hash:20080521192048-84dde-45745601b743798b205c56a7d7f018d8b020275e.gz
This commit is contained in:
Evan Prodromou 2008-05-21 15:20:48 -04:00
parent 5dce1e47a3
commit 127bc561ff
1 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
actions/showstream.php
View File

@ -172,42 +172,42 @@ class ShowstreamAction extends StreamAction {
common_element('h2', 'subscriptions', _t('Subscriptions')); common_element('h2', 'subscriptions', _t('Subscriptions'));
$cnt = 0; $idx = 0;
if ($subs) { while ($subs->fetch()) {
while ($subs->fetch()) { $idx++;
$cnt++; if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) { common_element_start('div', 'row');
common_element_start('div', 'row'); }
}
$other = Profile::staticGet($subs->subscribed);
common_element_start('a', array('title' => ($subs->fullname) ?
$subs->fullname : common_element_start('a', array('title' => ($other->fullname) ?
$subs->nickname, $other->fullname :
'href' => $subs->profileurl, $other->nickname,
'class' => 'subscription')); 'href' => $other->profileurl,
$avatar = $subs->getAvatar(AVATAR_MINI_SIZE); 'class' => 'subscription'));
common_element('img', array('src' => (($avatar) ? $avatar->url : common_default_avatar(AVATAR_MINI_SIZE)), $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
'width' => AVATAR_MINI_SIZE, common_element('img', array('src' => (($avatar) ? $avatar->url : common_default_avatar(AVATAR_MINI_SIZE)),
'height' => AVATAR_MINI_SIZE, 'width' => AVATAR_MINI_SIZE,
'class' => 'avatar mini', 'height' => AVATAR_MINI_SIZE,
'alt' => ($subs->fullname) ? 'class' => 'avatar mini',
$subs->fullname : 'alt' => ($other->fullname) ?
$subs->nickname)); $other->fullname :
common_element_end('a'); $other->nickname));
common_element_end('a');
if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) {
common_element_end('div'); if ($idx % SUBSCRIPTIONS_PER_ROW == 0) {
} common_element_end('div');
}
if ($cnt == SUBSCRIPTIONS) {
break; if ($idx == SUBSCRIPTIONS) {
} break;
} }
} }
# close any unclosed row # close any unclosed row
if ($cnt % SUBSCRIPTIONS_PER_ROW != 0) { if ($idx % SUBSCRIPTIONS_PER_ROW != 0) {
common_element_end('div'); common_element_end('div');
} }
@ -224,27 +224,15 @@ class ShowstreamAction extends StreamAction {
// XXX: WORM cache this // XXX: WORM cache this
$subs = DB_DataObject::factory('subscription'); $subs = DB_DataObject::factory('subscription');
$subs->subscriber = $profile->id; $subs->subscriber = $profile->id;
$subs_count = $subs->count(); $subs_count = (int) $subs->count();
if (!$subs_count) {
$subs_count = 0;
}
$subbed = DB_DataObject::factory('subscription'); $subbed = DB_DataObject::factory('subscription');
$subbed->subscribed = $profile->id; $subbed->subscribed = $profile->id;
$subbed_count = $subbed->count(); $subbed_count = (int) $subbed->count();
if (!$subbed_count) {
$subbed_count = 0;
}
$notices = DB_DataObject::factory('notice'); $notices = DB_DataObject::factory('notice');
$notices->profile_id = $profile->id; $notices->profile_id = $profile->id;
$notice_count = $notices->count(); $notice_count = (int) $notices->count();
if (!$notice_count) {
$notice_count = 0;
}
common_element_start('div', 'statistics'); common_element_start('div', 'statistics');
common_element('h2', 'statistics', _t('Statistics')); common_element('h2', 'statistics', _t('Statistics'));