take out public from views menu for now
darcs-hash:20080614122517-84dde-c78fbdd9c3329e87f405040e851650a81ab63d5c.gz
This commit is contained in:
parent
52205fc6be
commit
2fcae93272
|
@ -40,12 +40,9 @@ class PublicAction extends StreamAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
function show_top() {
|
function show_top() {
|
||||||
|
|
||||||
if (common_logged_in()) {
|
if (common_logged_in()) {
|
||||||
common_notice_form();
|
common_notice_form();
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->views_menu();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function show_header() {
|
function show_header() {
|
||||||
|
|
|
@ -28,23 +28,26 @@ class StreamAction extends Action {
|
||||||
}
|
}
|
||||||
|
|
||||||
function views_menu() {
|
function views_menu() {
|
||||||
|
|
||||||
|
$user = NULL;
|
||||||
$action = $this->trimmed('action');
|
$action = $this->trimmed('action');
|
||||||
$nickname = $this->trimmed('nickname');
|
$nickname = $this->trimmed('nickname');
|
||||||
|
|
||||||
|
if ($nickname) {
|
||||||
|
$user = User::staticGet('nickname', $nickname);
|
||||||
|
}
|
||||||
|
|
||||||
common_element_start('ul', array('id' => 'nav_views'));
|
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' =>
|
common_menu_item(common_local_url('all', array('nickname' =>
|
||||||
$nickname)),
|
$nickname)),
|
||||||
_t('Personal'),
|
_t('Personal'),
|
||||||
(($user->fullname) ? $user->fullname : $nickname) . _t(' and friends'),
|
(($user && $user->fullname) ? $user->fullname : $nickname) . _t(' and friends'),
|
||||||
$action == 'all');
|
$action == 'all');
|
||||||
common_menu_item(common_local_url('showstream', array('nickname' =>
|
common_menu_item(common_local_url('showstream', array('nickname' =>
|
||||||
$nickname)),
|
$nickname)),
|
||||||
_t('Profile'),
|
_t('Profile'),
|
||||||
($user->fullname) ? $user->fullname : $nickname,
|
($user && $user->fullname) ? $user->fullname : $nickname,
|
||||||
$action == 'showstream');
|
$action == 'showstream');
|
||||||
common_element_end('ul');
|
common_element_end('ul');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user