welcome more bootstrap3 compliant, thanks Paolo Caruccio

applications/welcome/views/default/user.html

@@ -1,25 +1,34 @@
 {{extend 'layout.html'}}
 
 <h2>{{=T( request.args(0).replace('_',' ').capitalize() )}}</h2>
-<div id="web2py_user_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
-}}
+
+<div class="container">
+    <div class="row">
+        <div id="web2py_user_form" class="col-lg-6">
+        {{
+        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
+        }}
+        </div>
+    </div>
 </div>
-<script language="javascript"><!--
-jQuery("#web2py_user_form input:visible:enabled:first").focus();
+
+
+{{block page_js}}
+<script>
+    jQuery("#web2py_user_form input:visible:enabled:first").focus();
 {{if request.args(0)=='register':}}
     web2py_validate_entropy(jQuery('#auth_user_password'),100);
 {{elif request.args(0)=='change_password':}}
     web2py_validate_entropy(jQuery('#no_table_new_password'),100);
 {{pass}}
-//--></script>
+</script>
+{{end page_js}}
 

applications/welcome/views/layout.html

@@ -29,17 +29,20 @@
         {{
         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/web2py-bootstrap3.css'))
+        response.files.insert(3,URL('static','css/bootstrap-theme.min.css'))
+        response.files.insert(4,URL('static','css/web2py-bootstrap3.css'))
         }}
-	<!--  <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js"></script> -->
-	<!--[if lt IE 9]>
-	    <script src="{{=URL('static','js/respond.min.js')}}"></script>
-	    <![endif]-->
+        <!-- All JavaScript at the bottom, except for Modernizr which enables
+             HTML5 elements & feature detects -->
+        <script src="{{=URL('static','js/modernizr.custom.js')}}"></script>
         <!-- Favicons -->
         <link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
         <link rel="apple-touch-icon" href="{{=URL('static','images/favicon.png')}}">
         {{include 'web2py_ajax.html'}}
         {{block head}}{{end}}
+        <!--[if lt IE 9]>
+            <script src="{{=URL('static','js/respond.min.js')}}"></script>
+        <![endif]-->
         {{
           # using sidebars need to know what sidebar you want to use
           mc0 = 'col-md-12'
@@ -52,7 +55,7 @@
         }}
     </head>
     <body>
-        <div class="flash alert alert-dismissable">{{=response.flash or ''}}</div>
+        <div class="flash alert centered alert-dismissable">{{=response.flash or ''}}</div>
 <!-- Navbar =================================================================== -->
         <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
             <div class="container">