fixed mobile admin, and improved it

This commit is contained in:
mdipierro
2012-10-05 10:24:14 -05:00
parent b142fa9f7e
commit 2841fbbf61
12 changed files with 42 additions and 200 deletions
+15 -1
View File
@@ -123,6 +123,21 @@ if session.authorized:
else:
session.last_time = t0
if request.vars.is_mobile in ('true','false','auto'):
session.is_mobile = request.vars.is_mobile or 'auto'
if request.controller=='default' and request.function=='index':
if not request.vars.is_mobile:
session.is_mobile = 'auto'
if not session.is_mobile:
session.is_mobile = 'auto'
if session.is_mobile == 'true':
is_mobile = True
elif session.is_mobile == 'false':
is_mobile = False
else:
is_mobile = request.user_agent().is_mobile
if request.controller == "webservices":
basic = request.env.http_authorization
if not basic or not basic[:6].lower() == 'basic ':
@@ -150,7 +165,6 @@ elif session.authorized and \
request.function == 'index':
redirect(URL(request.application, 'default', 'site'))
if request.controller=='appadmin' and DEMO_MODE:
session.flash = 'Appadmin disabled in demo mode'
redirect(URL('default','sites'))
+1 -1
View File
@@ -8,7 +8,7 @@ def A_button(*a,**b):
return A(*a,**b)
def button(href, label):
if request.user_agent().is_mobile:
if is_mobile:
ret = A_button(SPAN(label), _href=href)
else:
ret = A(SPAN(label),_class='button',_href=href)