remove wrapping ul from main menu area in template and put in tag file

delving · Jul 31, 2012 · 4d72f20 · 4d72f20
1 parent f88dd7c
commit 4d72f20
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/app/views/layout-3.html b/app/views/layout-3.html
@@ -27,9 +27,7 @@
     </div>
     <div class="span8">
         <div id="site-nav">
-            <ul class="nav nav-pills pull-right">
-                #{mainMenu menu:menu /}
-            </ul>
+            #{mainMenu menu:menu, extraClass: "nav-pills pull-right" /}
         </div>
     </div>
         </div>

diff --git a/app/views/layout-bc.html b/app/views/layout-bc.html
@@ -31,9 +31,7 @@
                 </div>
                 <div class="span10">
                     <div id="site-nav">
-                        <ul class="nav nav-pills">
-                        #{mainMenu menu:menu /}
-                        </ul>
+                    #{mainMenu menu:menu, extraClass: "nav-pills" /}
                     </div>
                 </div>
             </div>

diff --git a/app/views/layout-def.html b/app/views/layout-def.html
@@ -28,9 +28,7 @@ <h2 class="site-slogan">${themeInfo.siteSlogan}</h2>
                 </div>
             </div>
             <div class="span6 site-nav">
-                <ul class="nav nav-pills bordered">
-                    #{mainMenu menu:menu /}
-                </ul>
+            #{mainMenu menu:menu, extraClass: "nav-pills bordered" /}
             </div>
         </div>
     </div>

diff --git a/app/views/tags/mainMenu.html b/app/views/tags/mainMenu.html
@@ -1,4 +1,6 @@
+<ul class="nav ${_extraClass ? _extraClass : ''}">
 #{list _menu, as:'m'}
 <li class="#{if m.key == pageId}active#{/if}"><a href="${m.mainEntry.url}">&{m.mainEntry.titleKey}</a></li>
 #{/list}
+</ul>
 
diff --git a/app/views/tags/userNav.html b/app/views/tags/userNav.html
@@ -15,7 +15,7 @@
         <li class="dropdown" id="orgs">
             <a class="dropdown-toggle" data-toggle="dropdown" href="#orgs">
             ${messages.get('thing.organizations')}
-                <b class="caret"></b>
+            <b class="caret"></b>
             </a>
             <ul class="dropdown-menu">
                 #{list _organizations, as: 'org'}
@@ -27,6 +27,6 @@
     <li class="divider-vertical"></li>
     <li><a href="/logout">${messages.get('ui.label.logout')}</a></li>
 #{/else}
-    <li class="divider-vertical"></li>
+    *{<li class="divider-vertical"></li>}*
 </ul>