dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed the bs3 left menu but not the login menu

Browse Source
This commit is contained in:
mdipierro
2014-02-23 22:18:08 -06:00
parent 8e5d6bc467
commit 106d4be274
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -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
applications/welcome/models/menu.py
+1 -1
View File
@@ -6,7 +6,7 @@
######################################################################### #########################################################################
response.logo = A(B('web',SPAN(2),'py'),XML('™ '), 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.title = request.application.replace('_',' ').title()
response.subtitle = '' response.subtitle = ''
applications/welcome/views/layout.html
+1 -1
View File
@@ -75,7 +75,7 @@
{{='auth' in globals() and auth.navbar('Welcome',mode='dropdown') or ''}} {{='auth' in globals() and auth.navbar('Welcome',mode='dropdown') or ''}}
</ul> </ul>
{{if response.menu:}} {{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}} {{pass}}
</div> </div>
</div> </div>
gluon/tools.py
+2 -2
View File
@@ -1400,13 +1400,13 @@ class Auth(object):
def bootstrap3(): # Default web2py scaffolding def bootstrap3(): # Default web2py scaffolding
def rename(icon): return icon+' '+icon.replace('icon','glyphicon') 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'], ' ' + items[0]['name'],
_href=items[0]['href'])),_class='dropdown-menu', _href=items[0]['href'])),_class='dropdown-menu',
_id='w2p-auth-bar',_role="menu") _id='w2p-auth-bar',_role="menu")
del items[0] del items[0]
for item in items: 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'], ' ' + item['name'],
_href=item['href']))) _href=item['href'])))
self.bar.insert(-1, LI('', _class='divider')) self.bar.insert(-1, LI('', _class='divider'))