Commit 09b4660c authored by Zot's avatar Zot
Browse files

rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection code is consistent

parent 69394c16
......@@ -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(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment