Author: gjm Date: Mon Apr 22 16:38:18 2013 New Revision: 1470612 URL: http://svn.apache.org/r1470612 Log: move admin link from 'More' menu to the metanav - #321
Modified: bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html Modified: bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html?rev=1470612&r1=1470611&r2=1470612&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html (original) +++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html Mon Apr 22 16:38:18 2013 @@ -62,7 +62,8 @@ </p> </div> <!--! top menu (login, logout...) --> - <py:with vars="meta_items = dict([i.name, i] for i in chrome.nav.metanav)"> + <py:with vars="meta_items = dict([i.name, i] for i in chrome.nav.metanav); + main_items = dict([i.name, i] for i in chrome.nav.mainnav);"> <div id="usermenu" class="span8"> <div class="metanav pull-right"> <span id="nav_login" py:choose=""> @@ -78,6 +79,9 @@ <span py:if="'logout' in meta_items" id="nav_logout"> ${meta_items.logout.label} </span> + <span py:if="'admin' in main_items"> + ${main_items.admin.label} + </span> <span py:if="'help' in meta_items"> ${meta_items.help.label} </span> @@ -214,6 +218,7 @@ class="nav nav-tabs pull-right" id="mainnav" py:with="mainnav_show = ('wiki', 'tickets', 'browser'); + mainnav_to_meta = ('admin',); metanav_hide = ('login', 'logout', 'prefs', 'help', 'about', 'register')"> <!--! TODO: Parameterize visible mainnav items in trac.ini --> <li py:if="chrome.nav.mainnav" @@ -221,7 +226,7 @@ class="${classes(first_last(idx, chrome.nav.mainnav), active=item.active)}">${item.label}</li> <li class="dropdown ${all(not i.active for i in chrome.nav.mainnav if i.name in mainnav_show) and 'active' or None}" py:if="len([i for i in chrome.nav.metanav if i.name not in metanav_hide] + - [i for i in chrome.nav.mainnav if i.name not in mainnav_show])"> + [i for i in chrome.nav.mainnav if i.name not in mainnav_show + mainnav_to_meta])"> <a class="dropdown-toggle" data-toggle="dropdown" href="#">More<b class="caret"></b></a> <ul class="dropdown-menu"> <li py:if="chrome.nav.mainnav"