From 460a190ea8e8fce343eaa0f28d96653451959a26 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 2 Jul 2013 22:20:18 +0200
Subject: [PATCH] [IMP] improved contact us page

bzr revid: fp@tinyerp.com-20130702202018-6whpdecz0sedwvcs
---
 addons/website/static/src/css/website.css  |  1 -
 addons/website/static/src/css/website.sass |  1 -
 addons/website/views/views.xml             | 21 +++++++++++++++------
 addons/website_crm/views/website_crm.xml   |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index b18d61ce4a8..7064a292f64 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -36,7 +36,6 @@
   background: white;
   color: #333333;
   padding-bottom: 32px;
-  padding-top: 32px;
 }
 
 /* }}} */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index b2df343a5c6..c3b8ef27f77 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -146,7 +146,6 @@
     background: #fff
     color: #333
     padding-bottom: 32px
-    padding-top: 32px
 /* }}} */
 
 /* Footer {{{ */
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index f4517a8da3c..b9dec514126 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -256,14 +256,14 @@
                     <div class="container">
                         <div class="row">
                             <div class="span12">
-                                <h1>404: Page not found!</h1>
-                                <p>
+                                <h1 class="oe_slogan">404: Page not found!</h1>
+                                <p class="oe_grey">
                                     The page you were looking for could not be
                                     found; it is possible you have typed the
                                     address incorrectly, but it has most
                                     probably been removed due to the recent
                                     website reorganisation.
-                                </p><p>
+                                </p><p class="oe_grey">
                                     Maybe you were looking for one of these
                                     popular pages ?
                                 </p>
@@ -290,10 +290,19 @@
                 <t t-call="website.layout">
                     <t t-set="title">Contact us - <t t-esc="res_company.name"/></t>
                     <div class="container">
+                        <div class="oe_row">
+                            <h2 class="oe_slogan">Contact us</h2>
+                        </div>
                         <div class="row">
                             <div class="span8">
-                                <h1>Contact us</h1>
-                                Description of your company.
+                                <p>
+                                    Contact us about anything related to our company or services.
+                                </p><p>
+                                    We'll do our best to get back to you as soon as possible.
+                                </p>
+                                <div class="oe_centeralign oe_mt32" name="mail_button">
+                                    <a t-att-href="'mailto:'+res_company.email" class="oe_button oe_big oe_tacky">Send us an email</a>
+                                </div>
                             </div>
                             <div class="span4">
                                 <address>
@@ -305,7 +314,7 @@
                                     &amp;#x2706; <t t-esc="res_company.phone"/><br/>
                                     <i class="icon-envelope"></i> <t t-esc="res_company.email"/>
                                 </address>
-                                <img t-att-src="google_map_url"/>
+                                <img class="oe_screenshot" t-att-src="google_map_url"/>
                             </div>
                         </div>
                     </div>
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 54abe4888fb..5976cb453a2 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -6,7 +6,7 @@
             <field name="type">qweb</field>
             <field name="inherit_id" ref="website.contactus"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@class='span8']" position="inside">
+                <xpath expr="//div[@name='mail_button']" position="replace">
                     <form action="/crm/contactus" method="post" class="navbar-form pull-left">
                         <input class="span4" type="text" name="contact_name" required="True" placeholder="Name..."/><br/>
                         <input class="span4" type="text" name="phone" required="True" placeholder="Phone number..."/><br/>