menu on home and profile

darcs-hash:20080611155258-84dde-7afab3908ff3464975f8478fcd41f065466170ae.gz
This commit is contained in:
Evan Prodromou 2008-06-11 11:52:58 -04:00
parent e4534d60be
commit 9f39fd31af
4 changed files with 30 additions and 17 deletions

View File

@ -47,6 +47,8 @@ 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);
$this->views_menu();
$this->show_notices($profile); $this->show_notices($profile);
common_show_footer(); common_show_footer();

View File

@ -54,6 +54,8 @@ class ShowstreamAction extends StreamAction {
common_show_header($profile->nickname, array($this, 'show_header'), $user); common_show_header($profile->nickname, array($this, 'show_header'), $user);
$this->views_menu();
$this->show_profile($profile); $this->show_profile($profile);
$this->show_notices($profile); $this->show_notices($profile);

View File

@ -27,6 +27,24 @@ class StreamAction extends Action {
parent::handle($args); parent::handle($args);
} }
function views_menu() {
$action = $this->trimmed('action');
$nickname = $this->trimmed('nickname');
common_element_start('ul', array('id' => 'nav_views'));
common_menu_item(common_local_url('showstream', array('nickname' =>
$nickname)),
_t('Profile'),
($user->fullname) ? $user->fullname : $nickname,
$action == 'showstream');
common_element_end('ul');
common_menu_item(common_local_url('all', array('nickname' =>
$nickname)),
_t('All'),
_t('All'),
$action == 'all');
}
function show_notice($notice) { function show_notice($notice) {
global $config; global $config;
$profile = $notice->getProfile(); $profile = $notice->getProfile();

View File

@ -232,19 +232,6 @@ function common_nav_menu() {
common_element_end('ul'); common_element_end('ul');
} }
function common_views_menu($selected=NULL) {
$user = common_current_user();
common_element_start('ul', array('id' => 'nav_views'));
common_menu_item(common_local_url('all', array('nickname' =>
$user->nickname)),
_t('Home'));
common_menu_item(common_local_url('showstream', array('nickname' =>
$user->nickname)),
_t('Profile'),
($user->fullname) ? $user->fullname : $user->nickname);
common_element_end('ul');
}
function common_foot_menu() { function common_foot_menu() {
common_element_start('ul', array('id' => 'nav_sub')); common_element_start('ul', array('id' => 'nav_sub'));
common_menu_item(common_local_url('doc', array('title' => 'about')), common_menu_item(common_local_url('doc', array('title' => 'about')),
@ -256,12 +243,16 @@ function common_foot_menu() {
common_element_end('ul'); common_element_end('ul');
} }
function common_menu_item($url, $text, $title=NULL) { function common_menu_item($url, $text, $title=NULL, $is_selected) {
$lattrs = array();
if ($is_selected) {
$lattrs['class'] = 'current';
}
common_element_start('li', $lattrs);
$attrs['href'] = $url; $attrs['href'] = $url;
if ($title) { if ($title) {
$attrs['title'] = $title; $attrs['title'] = $title;
} }
common_element_start('li');
common_element('a', $attrs, $text); common_element('a', $attrs, $text);
common_element_end('li'); common_element_end('li');
} }