Merge branch 'uiredesign' of ../evan into uiredesign
This commit is contained in:
commit
b3c171d317
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ _darcs/*
|
||||
config.php
|
||||
.htaccess
|
||||
*.tmproj
|
||||
dataobject.ini
|
||||
|
@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
require_once INSTALLDIR.'/lib/form.php';
|
||||
require_once INSTALLDIR.'/lib/noticeform.php';
|
||||
require_once INSTALLDIR.'/lib/htmloutputter.php';
|
||||
|
||||
/**
|
||||
@ -238,25 +238,25 @@ class Action extends HTMLOutputter // lawsuit
|
||||
$user = common_current_user();
|
||||
$this->elementStart('ul', array('id' => 'nav'));
|
||||
if ($user) {
|
||||
common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
|
||||
$this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
|
||||
_('Home'));
|
||||
}
|
||||
common_menu_item(common_local_url('peoplesearch'), _('Search'));
|
||||
$this->menuItem(common_local_url('peoplesearch'), _('Search'));
|
||||
if ($user) {
|
||||
common_menu_item(common_local_url('profilesettings'),
|
||||
$this->menuItem(common_local_url('profilesettings'),
|
||||
_('Settings'));
|
||||
common_menu_item(common_local_url('invite'),
|
||||
$this->menuItem(common_local_url('invite'),
|
||||
_('Invite'));
|
||||
common_menu_item(common_local_url('logout'),
|
||||
$this->menuItem(common_local_url('logout'),
|
||||
_('Logout'));
|
||||
} else {
|
||||
common_menu_item(common_local_url('login'), _('Login'));
|
||||
$this->menuItem(common_local_url('login'), _('Login'));
|
||||
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'));
|
||||
$this->elementEnd('ul');
|
||||
$this->elementEnd('dl');
|
||||
@ -290,25 +290,11 @@ class Action extends HTMLOutputter // lawsuit
|
||||
$this->elementEnd('div');
|
||||
}
|
||||
|
||||
// SHOULD overload (perhaps this should be a MUST because sometimes it is not used)
|
||||
// SHOULD overload
|
||||
|
||||
function showLocalNav($menu)
|
||||
function showLocalNav()
|
||||
{
|
||||
$action = $this->trimmed('action');
|
||||
|
||||
$this->elementStart('dl', array('id' => 'site_nav_local_views'));
|
||||
$this->element('dt', null, _('Local views'));
|
||||
$this->elementStart('ul', array('id' => 'nav'));
|
||||
foreach ($menu as $menuaction => $menudesc) {
|
||||
common_menu_item(common_local_url($menuaction,
|
||||
isset($menudesc[2]) ? $menudesc[2] : null),
|
||||
$menudesc[0],
|
||||
$menudesc[1],
|
||||
$action == $menuaction);
|
||||
}
|
||||
$this->elementEnd('ul');
|
||||
$this->elementEnd('dd');
|
||||
$this->elementEnd('dl');
|
||||
// does nothing by default
|
||||
}
|
||||
|
||||
function showContentBlock()
|
||||
@ -377,17 +363,17 @@ class Action extends HTMLOutputter // lawsuit
|
||||
function showSecondaryNav()
|
||||
{
|
||||
$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'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'about')),
|
||||
$this->menuItem(common_local_url('doc', array('title' => 'about')),
|
||||
_('About'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'faq')),
|
||||
$this->menuItem(common_local_url('doc', array('title' => 'faq')),
|
||||
_('FAQ'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'privacy')),
|
||||
$this->menuItem(common_local_url('doc', array('title' => 'privacy')),
|
||||
_('Privacy'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'source')),
|
||||
$this->menuItem(common_local_url('doc', array('title' => 'source')),
|
||||
_('Source'));
|
||||
common_menu_item(common_local_url('doc', array('title' => 'contact')),
|
||||
$this->menuItem(common_local_url('doc', array('title' => 'contact')),
|
||||
_('Contact'));
|
||||
$this->elementEnd('ul');
|
||||
}
|
||||
@ -546,7 +532,7 @@ class Action extends HTMLOutputter // lawsuit
|
||||
$action = $this->trimmed('action');
|
||||
$this->elementStart('ul', array('id' => 'nav_views'));
|
||||
foreach ($menu as $menuaction => $menudesc) {
|
||||
common_menu_item(common_local_url($menuaction,
|
||||
$this->menuItem(common_local_url($menuaction,
|
||||
isset($menudesc[2]) ? $menudesc[2] : null),
|
||||
$menudesc[0],
|
||||
$menudesc[1],
|
||||
@ -577,8 +563,10 @@ class Action extends HTMLOutputter // lawsuit
|
||||
$this->elementStart('div', array('id' => 'content'));
|
||||
}
|
||||
|
||||
// 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)
|
||||
// Added @id to li for some control.
|
||||
// XXX: We might want to move this to htmloutputter.php
|
||||
|
||||
function menuItem($url, $text, $id=null, $title=null, $is_selected=false)
|
||||
{
|
||||
$lattrs = array();
|
||||
if ($is_selected) {
|
||||
|
@ -32,6 +32,8 @@ if (!defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
require_once INSTALLDIR.'/lib/widget.php';
|
||||
|
||||
/**
|
||||
* Base class for all actions
|
||||
*
|
||||
@ -55,29 +57,42 @@ class PublicGroupNav
|
||||
{
|
||||
var $action = null;
|
||||
|
||||
/**
|
||||
* Construction
|
||||
*
|
||||
* @param Action $action current action, used for output
|
||||
*/
|
||||
|
||||
function __construct($action=null)
|
||||
{
|
||||
parent::__construct($action);
|
||||
$this->action = $action;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the menu
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function show()
|
||||
{
|
||||
$this->action->elementStart('ul', array('class' => 'nav'));
|
||||
|
||||
common_menu_item(common_local_url('public'), _('Public'),
|
||||
$this->menuItem(common_local_url('public'), _('Public'),
|
||||
_('Public timeline'), $this->action == 'public');
|
||||
|
||||
common_menu_item(common_local_url('tag'), _('Recent tags'),
|
||||
$this->menuItem(common_local_url('tag'), _('Recent tags'),
|
||||
_('Recent tags'), $this->action == 'tag');
|
||||
|
||||
if (count(common_config('nickname', 'featured')) > 0) {
|
||||
common_menu_item(common_local_url('featured'), _('Featured'),
|
||||
$this->menuItem(common_local_url('featured'), _('Featured'),
|
||||
_('Featured users'), $this->action == 'featured');
|
||||
}
|
||||
|
||||
common_menu_item(common_local_url('favorited'), _('Popular'),
|
||||
$this->menuItem(common_local_url('favorited'), _('Popular'),
|
||||
_("Popular notices"), $this->action == 'favorited');
|
||||
|
||||
common_element_end('ul');
|
||||
$this->action->elementEnd('ul');
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user