From 231a3e127884ef37dfbbde77d138e544811ff0ef Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 5 Oct 2012 10:38:58 -0500 Subject: [PATCH] Try the mobile interface link in site --- VERSION | 2 +- applications/admin/models/access.py | 4 ++-- applications/admin/views/default.mobile/index.html | 1 + applications/admin/views/default.mobile/layout.html | 2 +- applications/admin/views/default/site.html | 3 +++ applications/admin/views/plugin_jqmobile/about.html | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 62148d32..80b4bad6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-10-05 10:24:10) dev +Version 2.0.9 (2012-10-05 10:38:54) dev diff --git a/applications/admin/models/access.py b/applications/admin/models/access.py index a058ddf9..a7066e4e 100644 --- a/applications/admin/models/access.py +++ b/applications/admin/models/access.py @@ -147,8 +147,8 @@ if request.controller == "webservices": time.sleep(10) raise HTTP(403,"Not authorized") elif not session.authorized and not \ - (request.controller == 'default' and \ - request.function in ('index','user')): + (request.controller+'/'+request.function in + ('default/index','default/user','plugin_jqmobile/index','plugin_jqmobile/about')): if request.env.query_string: query_string = '?' + request.env.query_string diff --git a/applications/admin/views/default.mobile/index.html b/applications/admin/views/default.mobile/index.html index 1a408a52..9cb47300 100644 --- a/applications/admin/views/default.mobile/index.html +++ b/applications/admin/views/default.mobile/index.html @@ -11,6 +11,7 @@ {{=T('Administrator Password:')}} + {{else:}} diff --git a/applications/admin/views/default.mobile/layout.html b/applications/admin/views/default.mobile/layout.html index 2365fe29..d93841a0 100644 --- a/applications/admin/views/default.mobile/layout.html +++ b/applications/admin/views/default.mobile/layout.html @@ -86,7 +86,7 @@ $(document).bind("mobileinit", function(){ Logout {{pass}} {{pass}} - {{=T("Home")}} + {{=T("Home")}} {{end}}
diff --git a/applications/admin/views/default/site.html b/applications/admin/views/default/site.html index e983d00c..d3d85785 100644 --- a/applications/admin/views/default/site.html +++ b/applications/admin/views/default/site.html @@ -76,6 +76,9 @@

{{=T("Running on %s", request.env.server_software)}}

+ {{if session.is_mobile=='auto':}}

+ {{=A(T('Try the mobile interface'),_href=URL('plugin_jqmobile','about'))}}

+ {{pass}}
{{pass}} diff --git a/applications/admin/views/plugin_jqmobile/about.html b/applications/admin/views/plugin_jqmobile/about.html index cc88266e..ae3e1e24 100644 --- a/applications/admin/views/plugin_jqmobile/about.html +++ b/applications/admin/views/plugin_jqmobile/about.html @@ -34,7 +34,7 @@ - +

web2py plugin

for jQuery Mobile