summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/all.php49
-rw-r--r--lib/util.php4
2 files changed, 14 insertions, 39 deletions
diff --git a/actions/all.php b/actions/all.php
index 70641a0f6..e51dc375c 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -47,12 +47,6 @@ class AllAction extends StreamAction {
common_show_header($profile->nickname . _t(" and friends"),
array($this, 'show_header'), $user);
- $cur = common_current_user();
-
- if ($cur && $profile->id == $cur->id) {
- common_notice_form();
- }
-
$this->show_notices($profile);
common_show_footer();
@@ -83,39 +77,20 @@ class AllAction extends StreamAction {
$cnt = $notice->find();
- common_element_start('div', 'notices width100');
- common_element('h2', 'notices', _t('Notices'));
-
- for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
- if ($notice->fetch()) {
- $this->show_notice($notice);
- } else {
- // shouldn't happen!
- break;
+ if ($cnt > 0) {
+ common_element_start('ul', array('id' => 'notices'));
+ for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
+ if ($notice->fetch()) {
+ $this->show_notice($notice);
+ } else {
+ // shouldn't happen!
+ break;
+ }
}
- }
-
- 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');
+ common_element_end('ul');
}
- if ($cnt > NOTICES_PER_PAGE) {
- common_element_start('span', 'floatRight width25');
- 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');
+ common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+ $page, 'all', array('nickname' => $profile->nickname));
}
}
diff --git a/lib/util.php b/lib/util.php
index cbf60619d..df8ae7241 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -169,12 +169,12 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $notice=NULL
($config['site']['logo']) : theme_path('logo.png'),
'alt' => $config['site']['name'],
'id' => 'logo'));
- if ($notice && common_logged_in()) {
+ if (common_logged_in()) {
common_notice_form();
}
common_element_end('div');
common_element_start('div', array('id' => 'content'));
- if ($notice && common_logged_in()) {
+ if (common_logged_in()) {
common_views_menu();
}
}