welcome improvements

applications/welcome/views/appadmin.html

@@ -9,6 +9,9 @@
 });
 //--></script>
 
+<div class="row">
+  <div class="col-md-12">
+
 {{if request.function=='index':}}
 <h2>{{=T("Available Databases and Tables")}}</h2>
   {{if not databases:}}{{=T("No databases in this application")}}{{pass}}
@@ -271,3 +274,6 @@
   {{pass}}
 </div>
 {{pass}}
+
+  </div>
+</div>

applications/welcome/views/default/index.html

@@ -8,6 +8,8 @@
 </div>
 {{end}}
 
+<div class="row">
+  <div class="col-md-12">
     {{if 'message' in globals():}}
     <h2>{{=message}}</h2>
     <p class="lead">{{=T('How did you get here?')}}</p>
@@ -42,6 +44,8 @@
     {{else:}}
     {{=BEAUTIFY(response._vars)}}
     {{pass}}
+  </div>
+</div>
 
 
 

applications/welcome/views/default/user.html

@@ -1,26 +1,24 @@
 {{extend 'layout.html'}}
 
+<div class="row"> 
+  <div id="web2py_user_form" class="col-lg-6" style="background-color:white; margin: 0 auto 0 auto; box-shadow: 0 0 5px #a1a1a1; border-radius:5px;padding: 20px">
     <h2>
       {{=T('Sign Up') if request.args(0) == 'register' else T('Log In') if request.args(0) == 'login' else T(request.args(0).replace('_',' ').title())}}
     </h2>
+    {{=form}}
+    {{if request.args(0)=='login' and not 'register' in auth.settings.actions_disabled:}}
+    <a href="{{=URL('user/register')}}">Register</a>
+    <br/>
+    {{pass}}
+    {{if request.args(0)=='login' and not 'request_reset_password' in auth.settings.actions_disabled:}}
+    <a href="{{=URL('user/request_reset_password')}}">Lost your password?</a>
+    {{pass}}
+    {{if request.args(0)=='register':}}
+    <a href="{{=URL('user/login')}}">Login</a>
+    {{pass}}
+  </div>
+</div>
 
-<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('Sign Up'),URL(args='register', vars={'_next': request.vars._next} if request.vars._next else None),_class='btn btn-default btn-secondary')
-            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 btn-secondary')
-            pass
-        pass
-        =form
-        }}
-        </div>
-    </div>
-</div>
 
 
 {{block page_js}}

applications/welcome/views/layout.html

@@ -97,15 +97,9 @@
     <!-- Main ========================================= -->
     <!-- Begin page content -->
     <div class="container-fluid main-container">
-      <div class="row">
-        <div class="col-md-12">
-          {{block center}}
       {{include}}
-          {{end}}
       {{=response.toolbar() if response.show_toolbar else ''}}
     </div>
-      </div>
-    </div>
 
     {{block footer}} <!-- this is default footer -->
     <footer class="footer container-fluid">