diff options
| -rw-r--r-- | actions/public.php | 13 | ||||
| -rw-r--r-- | lib/stream.php | 14 |
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'); } |