From 044af68e5ce0e8837ed210b26866abd47674debf Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 13 Mar 2015 12:00:22 -0500
Subject: [PATCH] reverted a mistake

---
 .../welcome3/static/css/web2py-bootstrap3.css |  7 +-
 applications/welcome3/views/layout.html       | 66 ++++++++++---------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/applications/welcome3/static/css/web2py-bootstrap3.css b/applications/welcome3/static/css/web2py-bootstrap3.css
index c9e4e961..57803e16 100644
--- a/applications/welcome3/static/css/web2py-bootstrap3.css
+++ b/applications/welcome3/static/css/web2py-bootstrap3.css
@@ -284,10 +284,6 @@ select.autocomplete {
   * application customization
   * add custom rules
 */
-
-body {
-  padding-top: 70px;
-}
 /* web2py logo */
 #web2py-logo {
   color: #c6cecc;
@@ -327,6 +323,9 @@ ul.w2p_list {
 .background {
   background: url(../images/background.jpg) no-repeat center center;
 }
+html {
+  background-color: #333;
+}
 body {
   padding-top: 50px
 }
diff --git a/applications/welcome3/views/layout.html b/applications/welcome3/views/layout.html
index 4bccea3a..b54cb4c2 100644
--- a/applications/welcome3/views/layout.html
+++ b/applications/welcome3/views/layout.html
@@ -74,43 +74,45 @@
     {{block header}}
     {{end}}
     <!-- Main ========================================= -->
-    <main class="container" id="content" role="main">
-      <div class="row">
-        {{if left_sidebar_enabled:}}
-        <!--    left sidebar =========== -->
-        <div class="col-md-3">
-          {{block left_sidebar}}
-          {{end left_sidebar}}
+    <!-- Begin page content -->
+    <div class="container-fluid">
+      {{if left_sidebar_enabled:}}
+        <div class="col-md-3 left-sidebar">
+            {{block left_sidebar}}
+            <h3>Left Sidebar</h3>
+            <p></p>
+            {{end}}
         </div>
-        {{pass}}
-        <!--    central column ============ -->
-        <div class="{{=middle_column}}">
-          {{block center_page}}
-          {{include}}
-          {{end center_page}}
-        </div>
-        {{if right_sidebar_enabled:}}
-        <!--    right sidebar ============- -->
-        <div class="col-md-3">
-          {{block right_sidebar}}
-          {{end right_sidebar}}
-        </div>
-        {{pass}}
+      {{pass}}
+
+      <div class="{{=middle_column}}">
+        {{block center}}
+        {{include}}
+        {{end}}
       </div>
-    </main>
-    <!-- Footer ======================================= -->
-    {{block footer}}
-    <footer class="footer">
-      <div class="container">        
-        <div class="col-xs-6">
-          <p>{{=T('Copyright')}} &#169; {{=request.now.year}}</p>
+
+      {{if right_sidebar_enabled:}}
+        <div class="col-md-3">
+            {{block right_sidebar}}
+            <h3>Right Sidebar</h3>
+            <p></p>
+            {{end}}
         </div>
-        <div class="col-xs-6">
-          <p class="pull-right">{{=T('Powered by')}} <a href="http://www.web2py.com/">web2py</a></p>
-        </div>        
+      {{pass}}
+
+    </div>
+
+    {{block footer}} <!-- this is default footer -->      
+    <footer class="footer">
+      <div class="container-fluid">
+        <div class="copyright pull-left">{{=T('Copyright')}} &#169; {{=request.now.year}}</div>
+          <div id="poweredBy" class="pull-right">
+            {{=T('Powered by')}}
+            <a href="http://www.web2py.com/">web2py</a>
+          </div>
       </div>
     </footer>
-    {{end footer}}
+    {{end}}
     <!-- The javascript =============================== -->
     <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
     <script src="{{=URL('static','js/web2py-bootstrap3.js')}}"></script>