Updated navigation to bootstrap 2.1 and added support for navigation …

…placement in options
timReynolds · Sep 30, 2012 · 83cfc90 · 83cfc90
1 parent f137e65
commit 83cfc90
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ If you have any suggestions, feedback or would just like to say hi feel free to
 ## Feathers 
 
 - Fixed 2 column 960 grid style layout 
-- Fixed top bar navigation, supporting login and drop down account option sub nab
+- Option driven navigation including account dropdown
 - PyroCMS widget sidebar
 - Updated Contact form, User login, User registration, User password reset and user edit using bootstrap stacked form and alerts
 - Includes JQuery and full bootstrap JS library
diff --git a/theme.php b/theme.php
@@ -25,6 +25,12 @@ class Theme_Bootstrap extends Theme {
                             'options'       => 'yes=Yes|no=No',
                             'is_required'   => TRUE
                         ),
+        'navigation_layout' =>  array('title' => 'Navigation layout',
+                                'description'   => 'How would you like the navigation displayed?',
+                                'default'       => 'bar',
+                                'type'          => 'select',
+                                'options'       => 'bar=Bar|navbar-fixed-top=Fixed to top|navbar-fixed-bottom=Fixed to bottom',
+                                'is_required'   => TRUE),
         );
 }
 

diff --git a/views/layouts/default.html b/views/layouts/default.html
@@ -4,9 +4,9 @@
   </head>
   <body>
 
-    {{ theme:partial name="header" }}
-
     <div class="container">
+
+      {{ theme:partial name="navbar" }}
 
       <div class="row">
 

diff --git a/views/partials/header.html b/views/partials/header.html
diff --git a/views/partials/navbar.html b/views/partials/navbar.html
@@ -0,0 +1,31 @@
+<div class="navbar {{ theme:options:navigation_layout }}">
+  <div class="navbar-inner">
+    <a class="brand" href="{{ url:site }}">{{ settings:site_name }}</a>
+    <ul class="nav">
+        {{ navigation:links group="header" }}
+    </ul>
+    {{ if user:logged_in }}
+    <ul class="nav pull-right">
+    	<li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user:display_name }} <i class="icon-chevron-down"></i></a>
+        <ul class="dropdown-menu">
+          {{ if settings:enable_profiles }}
+         		<li><a href="{{ url:site uri="my-profile" }}">{{ user:display_name }}</a></li>
+      	 		<li><a href="{{ url:site uri="edit-profile" }}">{{ helper:lang line="edit_profile_label" }}</a><li>
+		     	{{ endif }}
+  		    {{ if user:has_cp_permissions }}
+            <li><a href="{{ url:site uri="admin" }}" target="_blank">{{ helper:lang line="global:control-panel" }}</a></li>
+      	  {{ endif }}
+          <li class="divider"></li>
+          <li><a href="{{ url:site uri="users/logout" }}">{{ helper:lang line="logout_label" }}</a></li>
+        </ul>
+      </li>
+    </ul>
+    {{ else }}
+    <ul class="nav pull-right">
+      <li><a href="{{ url:site }}users/login">{{ helper:lang line="user_login_header" }}</a></li>
+      <li><a href="{{ url:site }}register">{{ helper:lang line="user_register_title" }}</a></li>
+    </ul>
+    {{ endif }}
+  </div>
+</div>