GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'uiredesign' of ../evan into uiredesign

Browse Source 
Conflicts:

	lib/action.php
This commit is contained in:
sarven 2009-01-15 23:18:56 +00:00
commit 33ee34dc26
1 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/action.php
View File

@ -331,7 +331,7 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('dl', array('id' => 'page_notice', $this->elementStart('dl', array('id' => 'page_notice',
'class' => 'system_notice')); 'class' => 'system_notice'));
$this->element('dt', null, _('Page notice')); $this->element('dt', null, _('Page notice'));
$this->elementStart('dd', null); $this->elementStart('dd');
$this->showPageNotice(); $this->showPageNotice();
$this->elementEnd('dd'); $this->elementEnd('dd');
$this->elementEnd('dl'); $this->elementEnd('dl');
@ -553,42 +553,6 @@ class Action extends HTMLOutputter // lawsuit
return common_local_url($action, $args); return common_local_url($action, $args);
} }
function nav_menu($menu)
{
$action = $this->trimmed('action');
$this->elementStart('ul', array('id' => 'nav_views'));
foreach ($menu as $menuaction => $menudesc) {
$this->menuItem(common_local_url($menuaction,
isset($menudesc[2]) ? $menudesc[2] : null),
$menudesc[0],
$menudesc[1],
$action == $menuaction);
}
$this->elementEnd('ul');
}
function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null)
{
global $config, $xw;
global $action; /* XXX: kind of cheating here. */
common_start_html();
$this->elementStart('head');
if ($callable) {
if ($data) {
call_user_func($callable, $data);
} else {
call_user_func($callable);
}
}
$this->elementEnd('head');
$this->elementStart('body', $action);
$this->elementStart('div', array('id' => 'wrap'));
$this->elementStart('div', array('id' => 'content'));
}
// Added @id to li for some control. // Added @id to li for some control.
// XXX: We might want to move this to htmloutputter.php // XXX: We might want to move this to htmloutputter.php