[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: bth@tinyerp.com-20130930102430-vnjn78mn65mq03r0

4 files changed, 37 insertions, 41 deletions

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 8b8f82a3678..7b0ae426553 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -265,16 +265,16 @@ class Website(openerp.addons.web.controllers.main.Home):
         hashed_session = hashlib.md5(request.session_id).hexdigest()
         retag = hashed_session
         try:
-            ids = Model.read(request.cr, request.uid, [('id', '=', id)], request.context)
+            id = int(id)
+            ids = Model.search(request.cr, request.uid, [('id', '=', id)], context=request.context)
             if not ids:
-                id = Model.read(request.cr, openerp.SUPERUSER_ID, [('id', '=', id), ('website_published', '=', True)], request.context)[0]
-
+                id = Model.search(request.cr, openerp.SUPERUSER_ID, [('id', '=', id), ('website_published', '=', True)], context=request.context)[0]
             if etag:
                 date = Model.read(request.cr, openerp.SUPERUSER_ID, [id], [last_update], request.context)[0].get(last_update)
                 if hashlib.md5(date).hexdigest() == etag:
                     return werkzeug.wrappers.Response(status=304)
 
-            res = Model.read(request.cr, openerp.SUPERUSER_ID, [id], [last_update, field], request.context)[0]
+            res = Model.read(request.cr, openerp.SUPERUSER_ID, [id], [last_update, field], context=request.context)[0]
             retag = hashlib.md5(res.get(last_update)).hexdigest()
             image_base64 = res.get(field)
 
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index f037f87b34f..80057dbf21d 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -345,18 +345,13 @@ footer {
 
 /* Parallax Theme */
 .parallax_full {
-  background: #eeeeee top left repeat;
+  background: #eeeeee bottom center repeat fixed;
   min-height: 650px;
   width: 100%;
-  overflow: hidden;
-  position: relative;
-}
-.parallax_full > img {
-  position: absolute;
-  top: 0;
-  left: 0;
 }
 
+/* overflow: hidden
+ * position: relative */
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal {
   overflow: hidden;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index ac85bf67ed3..b1f43b543a3 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -264,15 +264,12 @@ footer
 /* Parallax Theme */
 
 .parallax_full
-    background: #eee top left repeat
+    background: #eee bottom center repeat fixed
     min-height: 650px
     width: 100%
+/*
     overflow: hidden
-    position: relative
-    > img
-        position: absolute
-        top: 0
-        left: 0
+    position: relative */
 
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal
@@ -309,4 +306,4 @@ ul.nav-stacked > li > a
     /*     display: block*/
 
 ::selection
-    background: rgba(150, 150, 220, 0.3)
\ No newline at end of file
+    background: rgba(150, 150, 220, 0.3)
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index c2ec2ba243b..3854b54b936 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -278,6 +278,7 @@
                   <t t-raw="res_company.name"></t>
               </t>
               <div id="wrap">
+                <div class="oe_structure"/>
                 <div class="container">
                     <h1>Contact us</h1>
                     <div class="row">
@@ -306,6 +307,7 @@
                         </div>
                     </div>
                 </div>
+                <div class="oe_structure"/>
               </div>
             </t>
         </template>
@@ -314,28 +316,30 @@
             <t t-call="website.layout">
               <t t-set="title">About <t t-raw="res_company.name"></t>
               </t>
-              <div id="wrap" class="oe_structure">
-                <div class="container mb32">
-                    <div class="row col-wrap" id="aboutus">
-                        <div class="col-sm-12 text-center">
-                            <h1>About us</h1>
-                            <h3 class="text-muted">A passion for great products</h3>
-                        </div>
-                        <div class="col-sm-8 mt16">
-                            <p>
-                                We are a team of passionated people whose goal is to improve everyone's
-                                life through disruptive products. We build great products to solve your
-                                business problems.
-                            </p>
-                            <p>
-                                Our products are designed for small to medium companies willing to optimize
-                                their performance.
-                            </p>
-                        </div><div class="col-sm-3 col-sm-offset-1">
-                            <img src="/website/static/src/img/library/business_conference.jpg" class="img img-responsive shadow" alt="Out Team"/>
-                        </div>
-                    </div>
-                </div>
+              <div id="wrap">
+                  <div class="oe_structure"/>
+                  <div class="container mb32">
+                      <div class="row col-wrap" id="aboutus">
+                          <div class="col-sm-12 text-center">
+                              <h1>About us</h1>
+                              <h3 class="text-muted">A passion for great products</h3>
+                          </div>
+                          <div class="col-sm-8 mt16">
+                              <p>
+                                  We are a team of passionated people whose goal is to improve everyone's
+                                  life through disruptive products. We build great products to solve your
+                                  business problems.
+                              </p>
+                              <p>
+                                  Our products are designed for small to medium companies willing to optimize
+                                  their performance.
+                              </p>
+                          </div><div class="col-sm-3 col-sm-offset-1">
+                              <img src="/website/static/src/img/library/business_conference.jpg" class="img img-responsive shadow" alt="Out Team"/>
+                          </div>
+                      </div>
+                  </div>
+                  <div class="oe_structure"/>
               </div>
             </t>
         </template>