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

new layout for all action

Browse Source 
darcs-hash:20080610193305-84dde-ef9bfe958f79d8668f14302b22e098f2f8232bc1.gz
This commit is contained in:
Evan Prodromou
2008-06-10 15:33:05 -04:00
parent 74517da3f5
commit 644948fb1e
2 changed files with 14 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
actions/all.php
View File

@@ -47,12 +47,6 @@ class AllAction extends StreamAction {
common_show_header($profile->nickname . _t(" and friends"), common_show_header($profile->nickname . _t(" and friends"),
array($this, 'show_header'), $user); array($this, 'show_header'), $user);
$cur = common_current_user();
if ($cur && $profile->id == $cur->id) {
common_notice_form();
}
$this->show_notices($profile); $this->show_notices($profile);
common_show_footer(); common_show_footer();
@@ -83,9 +77,8 @@ class AllAction extends StreamAction {
$cnt = $notice->find(); $cnt = $notice->find();
common_element_start('div', 'notices width100'); if ($cnt > 0) {
common_element('h2', 'notices', _t('Notices')); common_element_start('ul', array('id' => 'notices'));
for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) { for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
if ($notice->fetch()) { if ($notice->fetch()) {
$this->show_notice($notice); $this->show_notice($notice);
@@ -94,28 +87,10 @@ class AllAction extends StreamAction {
break; break;
} }
} }
common_element_end('ul');
if ($page > 1) {
common_element_start('span', 'floatLeft width25');
common_element('a', array('href' => common_local_url('all',
array('nickname' => $profile->nickname,
'page' => $page-1)),
'class' => 'newer'),
_t('Newer'));
common_element_end('span');
} }
if ($cnt > NOTICES_PER_PAGE) { common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
common_element_start('span', 'floatRight width25'); $page, 'all', array('nickname' => $profile->nickname));
common_element('a', array('href' => common_local_url('all',
array('nickname' => $profile->nickname,
'page' => $page+1)),
'class' => 'older'),
_t('Older'));
common_element_end('span');
}
# XXX: show a link for the next page
common_element_end('div');
} }
} }

4
lib/util.php
View File

@@ -169,12 +169,12 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $notice=NULL
($config['site']['logo']) : theme_path('logo.png'), ($config['site']['logo']) : theme_path('logo.png'),
'alt' => $config['site']['name'], 'alt' => $config['site']['name'],
'id' => 'logo')); 'id' => 'logo'));
if ($notice && common_logged_in()) { if (common_logged_in()) {
common_notice_form(); common_notice_form();
} }
common_element_end('div'); common_element_end('div');
common_element_start('div', array('id' => 'content')); common_element_start('div', array('id' => 'content'));
if ($notice && common_logged_in()) { if (common_logged_in()) {
common_views_menu(); common_views_menu();
} }
} }