summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsarven <csarven@plantard.controlezvous.ca>2009-01-15 23:18:56 +0000
committersarven <csarven@plantard.controlezvous.ca>2009-01-15 23:18:56 +0000
commit33ee34dc2617fd70cab85212aecb24e01c1e367e (patch)
treec8e38e393bf50eeea16709b731997bd5776eac81
parent39b5957068126be3d0fbe93769daf6038a53f4d4 (diff)
parenta22714b5ee84afe387d3a2671b787822461154b0 (diff)
Merge branch 'uiredesign' of ../evan into uiredesign
Conflicts: lib/action.php
-rw-r--r--lib/action.php38
1 files changed, 1 insertions, 37 deletions
diff --git a/lib/action.php b/lib/action.php
index cc385a086..f9f5acf2c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -331,7 +331,7 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('dl', array('id' => 'page_notice',
'class' => 'system_notice'));
$this->element('dt', null, _('Page notice'));
- $this->elementStart('dd', null);
+ $this->elementStart('dd');
$this->showPageNotice();
$this->elementEnd('dd');
$this->elementEnd('dl');
@@ -553,42 +553,6 @@ class Action extends HTMLOutputter // lawsuit
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.
// XXX: We might want to move this to htmloutputter.php