diff --git a/boot.php b/boot.php index 3feac5177..367fe7709 100755 --- a/boot.php +++ b/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); } diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb index 0794f24d3..4a9262741 100644 --- a/doc/member/member_guide.bb +++ b/doc/member/member_guide.bb @@ -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] diff --git a/include/nav.php b/include/nav.php index b5f713145..0d554fc84 100644 --- a/include/nav.php +++ b/include/nav.php @@ -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( diff --git a/view/tpl/nav.tpl b/view/tpl/navbar_default.tpl similarity index 100% rename from view/tpl/nav.tpl rename to view/tpl/navbar_default.tpl