- {{
- if request.args(0)=='login':
- if not 'register' in auth.settings.actions_disabled:
- form.add_button(T('Register'),URL(args='register', vars={'_next': request.vars._next} if request.vars._next else None),_class='btn btn-default')
- pass
- if not 'request_reset_password' in auth.settings.actions_disabled:
- form.add_button(T('Lost Password'),URL(args='request_reset_password'),_class='btn btn-default')
- pass
- pass
- =form
- }}
-
-
+
+{{
+if request.args(0)=='login':
+ if not 'register' in auth.settings.actions_disabled:
+ form.add_button(T('Register'),URL(args='register', vars={'_next': request.vars._next} if request.vars._next else None),_class='btn')
+ pass
+ if not 'request_reset_password' in auth.settings.actions_disabled:
+ form.add_button(T('Lost Password'),URL(args='request_reset_password'),_class='btn')
+ pass
+pass
+=form
+}}
-
-
-{{block page_js}}
-
-{{end page_js}}
+//-->
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index c12afa6a..7291ccf7 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -6,139 +6,164 @@
-
-
-
-
-
-
-
- {{=response.title or request.application}}
-
-
-
-
-
- {{
- response.files.insert(0,URL('static','css/web2py.css'))
- response.files.insert(1,URL('static','css/bootstrap.min.css'))
- response.files.insert(3,URL('static','css/bootstrap-theme.min.css'))
- response.files.insert(4,URL('static','css/web2py-bootstrap3.css'))
- }}
-
-
-
-
-
- {{include 'web2py_ajax.html'}}
- {{block head}}{{end}}
-
- {{
- # using sidebars need to know what sidebar you want to use
- mc0 = 'col-md-12'
- mc1 = 'col-md-9'
- mc2 = 'col-md-6'
- left_sidebar_enabled = globals().get('left_sidebar_enabled', False)
- right_sidebar_enabled = globals().get('right_sidebar_enabled', False)
- middle_column = {0: mc0, 1: mc1, 2: mc2}[
- (left_sidebar_enabled and 1 or 0)+(right_sidebar_enabled and 1 or 0)]
- }}
-
-
-
{{=response.flash or ''}}
-
-
-
-
+
+{{=response.title or request.application}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ response.files.insert(0,URL('static','css/web2py.css'))
+ response.files.insert(1,URL('static','css/bootstrap.min.css'))
+ response.files.insert(2,URL('static','css/bootstrap-responsive.min.css'))
+ response.files.insert(3,URL('static','css/web2py_bootstrap.css'))
+ }}
+
+ {{include 'web2py_ajax.html'}}
+
+ {{
+ # using sidebars need to know what sidebar you want to use
+ left_sidebar_enabled = globals().get('left_sidebar_enabled',False)
+ right_sidebar_enabled = globals().get('right_sidebar_enabled',False)
+ middle_columns = {0:'span12',1:'span9',2:'span6'}[
+ (left_sidebar_enabled and 1 or 0)+(right_sidebar_enabled and 1 or 0)]
+ }}
+
+
+
+ {{block head}}{{end}}
+
+
+
+
+
+
{{=response.flash or ''}}
+
+
+ {{is_mobile=request.user_agent().is_mobile}}
+
+
+ {{=response.logo or ''}}
+
{{='auth' in globals() and auth.navbar(mode="dropdown") or ''}}