From 106d4be274012c23cfbf4078ce6ae00ea5a9b6a6 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 23 Feb 2014 22:18:08 -0600 Subject: [PATCH] fixed the bs3 left menu but not the login menu --- VERSION | 2 +- applications/welcome/models/menu.py | 2 +- applications/welcome/views/layout.html | 2 +- gluon/tools.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 810c9172..20646bbb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.8.2-stable+timestamp.2014.02.21.11.14.25 +Version 2.8.2-stable+timestamp.2014.02.23.22.17.01 diff --git a/applications/welcome/models/menu.py b/applications/welcome/models/menu.py index f705a8ee..b053b8d6 100644 --- a/applications/welcome/models/menu.py +++ b/applications/welcome/models/menu.py @@ -6,7 +6,7 @@ ######################################################################### response.logo = A(B('web',SPAN(2),'py'),XML('™ '), - _class="brand",_href="http://www.web2py.com/") + _class="navbar-brand",_href="http://www.web2py.com/") response.title = request.application.replace('_',' ').title() response.subtitle = '' diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index 5636a150..3a8549d0 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -75,7 +75,7 @@ {{='auth' in globals() and auth.navbar('Welcome',mode='dropdown') or ''}} {{if response.menu:}} - {{=MENU(response.menu, _class='mobile-menu nav',li_class='dropdown',ul_class='dropdown-menu')}} + {{=MENU(response.menu, _class='nav navbar-nav',li_class='dropdown',ul_class='dropdown-menu')}} {{pass}} diff --git a/gluon/tools.py b/gluon/tools.py index f445b150..d062e671 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -1400,13 +1400,13 @@ class Auth(object): def bootstrap3(): # Default web2py scaffolding def rename(icon): return icon+' '+icon.replace('icon','glyphicon') - self.bar = UL(LI(Anr(I(_class=rename(items[0]['icon'])), + self.bar = UL(LI(Anr(I(_class=rename('icon '+items[0]['icon'])), ' ' + items[0]['name'], _href=items[0]['href'])),_class='dropdown-menu', _id='w2p-auth-bar',_role="menu") del items[0] for item in items: - self.bar.insert(-1, LI(Anr(I(_class=rename(item['icon'])), + self.bar.insert(-1, LI(Anr(I(_class=rename('icon '+item['icon'])), ' ' + item['name'], _href=item['href']))) self.bar.insert(-1, LI('', _class='divider'))