summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-06-14 08:20:38 -0400
committerEvan Prodromou <evan@prodromou.name>2008-06-14 08:20:38 -0400
commit27a615aefdb63875ebeb2d1657f7773e7d3bd9e8 (patch)
tree019ac4953287c80f0f9cc030de9c780412496048
parent9ff4794f1b586d693a0e8649c985b99dc74bbc5e (diff)
add public tab
darcs-hash:20080614122038-84dde-af7c2be04d41c1d85b62cf74724fe8e4a877a84a.gz
-rw-r--r--actions/public.php13
-rw-r--r--lib/stream.php14
2 files changed, 21 insertions, 6 deletions
diff --git a/actions/public.php b/actions/public.php
index 270c082ba..099d1cc88 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -28,7 +28,9 @@ class PublicAction extends StreamAction {
$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
- common_show_header(_t('Public timeline'), array($this, 'show_header'));
+ common_show_header(_t('Public timeline'),
+ array($this, 'show_header'), NULL,
+ array($this, 'show_top'));
# XXX: Public sidebar here?
@@ -37,6 +39,15 @@ class PublicAction extends StreamAction {
common_show_footer();
}
+ function show_top($user) {
+
+ if (common_logged_in()) {
+ common_notice_form();
+ }
+
+ $this->views_menu();
+ }
+
function show_header() {
common_element('link', array('rel' => 'alternate',
'href' => common_local_url('publicrss'),
diff --git a/lib/stream.php b/lib/stream.php
index a50576654..2e22b3576 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -32,16 +32,20 @@ class StreamAction extends Action {
$nickname = $this->trimmed('nickname');
common_element_start('ul', array('id' => 'nav_views'));
+ common_menu_item(common_local_url('public'),
+ _t('Public'),
+ _t('Public stream'),
+ $action == 'public');
+ common_menu_item(common_local_url('all', array('nickname' =>
+ $nickname)),
+ _t('Personal'),
+ (($user->fullname) ? $user->fullname : $nickname) . _t(' and friends'),
+ $action == 'all');
common_menu_item(common_local_url('showstream', array('nickname' =>
$nickname)),
_t('Profile'),
($user->fullname) ? $user->fullname : $nickname,
$action == 'showstream');
- common_menu_item(common_local_url('all', array('nickname' =>
- $nickname)),
- _t('All'),
- _t('All'),
- $action == 'all');
common_element_end('ul');
}