wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a menuItem method to Action

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-15 14:31:03 -05:00
parent 565cbfbe77
commit 34d859c4a6
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/action.php
View File

@ -238,25 +238,25 @@ class Action extends HTMLOutputter // lawsuit
$user = common_current_user(); $user = common_current_user();
$this->elementStart('ul', array('id' => 'nav')); $this->elementStart('ul', array('id' => 'nav'));
if ($user) { if ($user) {
common_menu_item(common_local_url('all', array('nickname' => $user->nickname)), $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
_('Home')); _('Home'));
} }
common_menu_item(common_local_url('peoplesearch'), _('Search')); $this->menuItem(common_local_url('peoplesearch'), _('Search'));
if ($user) { if ($user) {
common_menu_item(common_local_url('profilesettings'), $this->menuItem(common_local_url('profilesettings'),
_('Settings')); _('Settings'));
common_menu_item(common_local_url('invite'), $this->menuItem(common_local_url('invite'),
_('Invite')); _('Invite'));
common_menu_item(common_local_url('logout'), $this->menuItem(common_local_url('logout'),
_('Logout')); _('Logout'));
} else { } else {
common_menu_item(common_local_url('login'), _('Login')); $this->menuItem(common_local_url('login'), _('Login'));
if (!common_config('site', 'closed')) { if (!common_config('site', 'closed')) {
common_menu_item(common_local_url('register'), _('Register')); $this->menuItem(common_local_url('register'), _('Register'));
} }
common_menu_item(common_local_url('openidlogin'), _('OpenID')); $this->menuItem(common_local_url('openidlogin'), _('OpenID'));
} }
common_menu_item(common_local_url('doc', array('title' => 'help')), $this->menuItem(common_local_url('doc', array('title' => 'help')),
_('Help')); _('Help'));
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->elementEnd('dl'); $this->elementEnd('dl');
@ -300,7 +300,7 @@ class Action extends HTMLOutputter // lawsuit
$this->element('dt', null, _('Local views')); $this->element('dt', null, _('Local views'));
$this->elementStart('ul', array('id' => 'nav')); $this->elementStart('ul', array('id' => 'nav'));
foreach ($menu as $menuaction => $menudesc) { foreach ($menu as $menuaction => $menudesc) {
common_menu_item(common_local_url($menuaction, $this->menuItem(common_local_url($menuaction,
isset($menudesc[2]) ? $menudesc[2] : null), isset($menudesc[2]) ? $menudesc[2] : null),
$menudesc[0], $menudesc[0],
$menudesc[1], $menudesc[1],
@ -377,17 +377,17 @@ class Action extends HTMLOutputter // lawsuit
function showSecondaryNav() function showSecondaryNav()
{ {
$this->elementStart('ul', array('id' => 'nav_sub')); $this->elementStart('ul', array('id' => 'nav_sub'));
common_menu_item(common_local_url('doc', array('title' => 'help')), $this->menuItem(common_local_url('doc', array('title' => 'help')),
_('Help')); _('Help'));
common_menu_item(common_local_url('doc', array('title' => 'about')), $this->menuItem(common_local_url('doc', array('title' => 'about')),
_('About')); _('About'));
common_menu_item(common_local_url('doc', array('title' => 'faq')), $this->menuItem(common_local_url('doc', array('title' => 'faq')),
_('FAQ')); _('FAQ'));
common_menu_item(common_local_url('doc', array('title' => 'privacy')), $this->menuItem(common_local_url('doc', array('title' => 'privacy')),
_('Privacy')); _('Privacy'));
common_menu_item(common_local_url('doc', array('title' => 'source')), $this->menuItem(common_local_url('doc', array('title' => 'source')),
_('Source')); _('Source'));
common_menu_item(common_local_url('doc', array('title' => 'contact')), $this->menuItem(common_local_url('doc', array('title' => 'contact')),
_('Contact')); _('Contact'));
$this->elementEnd('ul'); $this->elementEnd('ul');
} }
@ -546,7 +546,7 @@ class Action extends HTMLOutputter // lawsuit
$action = $this->trimmed('action'); $action = $this->trimmed('action');
$this->elementStart('ul', array('id' => 'nav_views')); $this->elementStart('ul', array('id' => 'nav_views'));
foreach ($menu as $menuaction => $menudesc) { foreach ($menu as $menuaction => $menudesc) {
common_menu_item(common_local_url($menuaction, $this->menuItem(common_local_url($menuaction,
isset($menudesc[2]) ? $menudesc[2] : null), isset($menudesc[2]) ? $menudesc[2] : null),
$menudesc[0], $menudesc[0],
$menudesc[1], $menudesc[1],
@ -578,7 +578,8 @@ class Action extends HTMLOutputter // lawsuit
} }
// Added @id to li for some control. We might want to move this to htmloutputter.php // Added @id to li for some control. We might want to move this to htmloutputter.php
function common_menu_item($id=null, $url, $text, $title=null, $is_selected=false)
function menuItem($id=null, $url, $text, $title=null, $is_selected=false)
{ {
$lattrs = array(); $lattrs = array();
if ($is_selected) { if ($is_selected) {