rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection code is consistent
This commit is contained in:
parent
69394c1680
commit
09b4660c7d
2
boot.php
2
boot.php
@ -2090,7 +2090,7 @@ function construct_page() {
|
||||
|
||||
$installing = false;
|
||||
|
||||
$navbar = get_config('system','navbar','nav');
|
||||
$navbar = get_config('system','navbar','default');
|
||||
if(App::$profile_uid) {
|
||||
$navbar = get_pconfig(App::$profile_uid,'system','navbar',$navbar);
|
||||
}
|
||||
|
@ -640,7 +640,7 @@ The condensed notation isn't part of Comanche itself but is recognised by $Proje
|
||||
[navbar]tucson[/navbar]
|
||||
[/code]
|
||||
|
||||
Use the 'tucson' navbar template and CSS rules. By default the 'nav' navbar template will be used.
|
||||
Use the 'tucson' navbar template and CSS rules. By default the 'default' navbar template will be used.
|
||||
|
||||
|
||||
[h4]Regions[/h4]
|
||||
|
@ -6,7 +6,7 @@ require_once('include/security.php');
|
||||
require_once('include/menu.php');
|
||||
|
||||
|
||||
function nav($template = 'nav') {
|
||||
function nav($template = 'default') {
|
||||
|
||||
/**
|
||||
*
|
||||
@ -248,7 +248,7 @@ EOT;
|
||||
}
|
||||
|
||||
if(! $tpl) {
|
||||
$tpl = get_markup_template('nav.tpl');
|
||||
$tpl = get_markup_template('navbar_default.tpl');
|
||||
}
|
||||
|
||||
App::$page['nav'] .= replace_macros($tpl, array(
|
||||
|
Reference in New Issue
Block a user