[MERGE] with trunk-survey2-rim addons branch

bzr revid: dizzy.zala@gmail.com-20140225053204-mra08nfvumkxyixa

3 files changed, 75 insertions, 25 deletions

diff --git a/addons/website/views/ir_actions.xml b/addons/website/views/ir_actions.xml
new file mode 100644
index 00000000000..0b017a43192
--- /dev/null
+++ b/addons/website/views/ir_actions.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_server_action_form_website">
+            <field name="name">ir.actions.server.form.website</field>
+            <field name="model">ir.actions.server</field>
+            <field name="inherit_id" ref="base.view_server_action_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='state']" position="after">
+                    <field name="website_published"
+                        attrs="{'invisible': [('state', '!=', 'code')]}"/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 2012340dea1..16cbaf9d066 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -560,13 +560,12 @@
     <div data-snippet-id="cta" data-selector-children=".oe_structure, [data-oe-type=html]">
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
-            <span class="oe_snippet_thumbnail_title">Button</span>   
+            <span class="oe_snippet_thumbnail_title">Button</span>
         </div>
-        <section class="oe_snippet_body oe_snippet_darken oe_dark">
+        <section class="oe_snippet_body oe_snippet_darken oe_dark mb32 mt32">
             <div class="container">
               <div class="row">
                 <div class="col-md-12 text-center mt16 mb16">
-                    <a href="/shop" class="btn btn-info btn-lg">View Products</a>
                     <a href="/page/website.contactus" class="btn btn-primary btn-lg">Contact us</a>
                 </div>
               </div>
@@ -688,25 +687,21 @@
                         <span class="fa fa-suitcase fa-5x"></span>
                         <h3 class="mt8 mb0">First Feature</h3>
                         <p class="text-muted">Tell what's the value for the customer for this feature.</p>
-                        <p><a class="btn btn-primary">Learn More</a></p>
                     </div>
                     <div class="col-md-3 text-center">
                         <span class="fa fa-lock fa-5x"></span>
                         <h3 class="mt8 mb0">Second Feature</h3>
                         <p class="text-muted">Write what the customer would like to know, not what you want to show.</p>
-                        <p><a class="btn btn-success">Take Tour</a></p>
                     </div>
                     <div class="col-md-3 text-center">
                         <span class="fa fa-heart fa-5x"></span>
                         <h3 class="mt8 mb0">Third Feature</h3>
                         <p class="text-muted">A small explanation of this great feature, in clear words.</p>
-                        <p><a class="btn btn-info">Buy Now</a></p>
                     </div>
                     <div class="col-md-3 text-center">
                         <span class="fa fa-credit-card fa-5x"></span>
                         <h3 class="mt8 mb0">Fourth Feature</h3>
                         <p class="text-muted">A small explanation of this great feature on two lines.</p>
-                        <p><a class="btn btn-danger">Buy Now</a></p>
                     </div>
                 </div>
             </div>
@@ -903,7 +898,7 @@
     </div>
 
     <div data-snippet-style-id='background' data-selector="section, section[data-snippet-id='parallax'], div[data-snippet-id='carousel'], div[data-snippet-id='slider']">
-        <li class="dropdown-submenu">
+        <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Background</a>
             <ul class="dropdown-menu">
                 <li class="dropdown-submenu">
@@ -912,7 +907,7 @@
                         <li data-class='oe_dark'><a>Darken</a></li>
                         <li data-class='oe_green'><a>Green</a></li>
                         <li data-class='oe_red'><a>Red</a></li>
-                        <li data-class='oe_blue_light'><a>Light Blue</a></li>
+                        <li data-class='oe_blue_light'><a>Turquoise</a></li>
                         <li data-class='oe_blue'><a>Dark Blue</a></li>
                         <li data-class='oe_orange'><a>Orange</a></li>
                         <li data-class='oe_purple'><a>Purple</a></li>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index ebcd52c6b67..69452bc6a5f 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -213,7 +213,7 @@
     </html>
 </template>
 
-<template id="layout_logo_show" inherit_option_id="website.layout" name="Show Logo">
+<template id="layout_logo_show" inherit_id="website.layout" inherit_option_id="website.layout" name="Show Logo">
     <xpath expr="//header//a[@class='navbar-brand']" position="replace">
         <a href="/" class="navbar-brand logo">
             <img src="/logo.png"/>
@@ -222,6 +222,34 @@
 </template>
 
 <template id="editor_head" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher">
+    <xpath expr="//body" position="attributes">
+        <attribute name="style">padding-top: 51px;</attribute>
+    </xpath>
+    <xpath expr="//body" position="inside">
+        <div id="website-top-navbar-placeholder" class="navbar navbar-inverse navbar-fixed-top hidden-xs">
+            <div class="navbar-header">
+                <form class="navbar-form navbar-left">
+                    <button type="button" class="btn btn-primary">Edit</button>
+                </form>
+            </div>
+            <div class="collapse navbar-collapse navbar-edit-collapse">
+                <ul class="nav navbar-nav navbar-right">
+                    <li><a href="#" onclick="return false;"><i class="fa fa-mobile" title="Mobile preview"/></a></li>
+                    <li class="divider-vertical"/>
+                    <li><a href="#" onclick="return false;"><span title="Promote page on the web">Promote</span></a></li>
+                    <li class="dropdown">
+                        <a href="#" onclick="return false;">Content <span class="caret"/></a>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" onclick="return false;">Customize <span class="caret"/></a>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" onclick="return false;">Help <span class="caret"/></a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </xpath>
     <xpath expr='//t[@name="layout_head"]' position="before">
         <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
         <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
@@ -257,6 +285,13 @@
     </xpath>
 </template>
 
+<template id="debugger" inherit_option_id="website.layout" name="Debugger &amp; Tests">
+    <xpath expr='//t[@name="layout_head"]' position="after">
+        <script type="text/javascript" src="/website/static/src/js/website.tour.test.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.tour.test.admin.js"></script>
+    </xpath>
+</template>
+
 <template id="login_layout" inherit_id="web.login_layout" name="Website Login Layout">
     <xpath expr="t" position="replace">
         <t t-call="website.layout">
@@ -638,11 +673,11 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 </template>
 
 <template id="company_description" name="Company Description">
-    <address>
-        <div t-field="res_company.name">Name</div>
+    <address itemscope="itemscope" itemtype="http://schema.org/Organization">
+        <div itemprop="name" t-field="res_company.name">Name</div>
         <br />
-        <div><i class="fa fa-phone"/> <span t-field="res_company.phone"/></div>
-        <div><i class="fa fa-envelope"/> <span t-field="res_company.email"/></div>
+        <div><i class="fa fa-phone"/> <span itemprop="telephone" t-field="res_company.phone"/></div>
+        <div><i class="fa fa-envelope"/> <span itemprop="email" t-field="res_company.email"/></div>
     </address>
      <a t-att-href="res_company.google_map_link()" target="_BLANK">
         <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" />
@@ -724,18 +759,20 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 </template>
 
 <template id="contact">
-    <address t-ignore="true" class="mb0">
-        <div t-att-class="'name' not in fields and 'css_non_editable_mode_hidden'"><span t-esc="name"/></div>
-        <div t-if="address and 'address' in fields" class='css_editable_mode_hidden'>
-            <i class='fa fa-map-marker'/> <span t-raw="address.replace('\n', options.get('no_tag_br') and ', ' or '&lt;br/&gt; &amp;nbsp; &amp;nbsp; ')"/>
-        </div>
-        <div t-if="city and 'city' in fields" class='css_editable_mode_hidden'>
-            <i class='fa fa-map-marker'/> <span t-raw="city"/>, <span t-raw="country_id"/>
+    <address t-ignore="true" class="mb0" itemscope="itemscope" itemtype="http://schema.org/Organization">
+        <div t-att-class="'name' not in fields and 'css_non_editable_mode_hidden'"><span itemprop="name" t-esc="name"/></div>
+        <div itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress">
+            <div t-if="address and 'address' in fields" class='css_editable_mode_hidden'>
+                <i class='fa fa-map-marker'/> <span itemprop="streetAddress" t-raw="address.replace('\n', options.get('no_tag_br') and ', ' or '&lt;br/&gt; &amp;nbsp; &amp;nbsp; ')"/>
+            </div>
+            <div t-if="city and 'city' in fields" class='css_editable_mode_hidden'>
+                <i class='fa fa-map-marker'/> <span itemprop="addressLocality" t-raw="city"/>, <span itemprop="addressCountry" t-raw="country_id"/>
+            </div>
+            <div t-if="phone and 'phone' in fields" class='css_editable_mode_hidden'><i class='fa fa-phone'/> <span itemprop="telephone" t-esc="phone"/></div>
+            <div t-if="mobile and 'mobile' in fields" class='css_editable_mode_hidden'><i class='fa fa-mobile-phone'/> <span itemprop="telephone" t-esc="mobile"/></div>
+            <div t-if="fax and 'fax' in fields" class='css_editable_mode_hidden'><i class='fa fa-file-text-o'/> <span itemprop="faxNumber" t-esc="fax"/></div>
+            <div t-if="email and 'email' in fields" class='css_editable_mode_hidden'><i class='fa fa-envelope'/> <span itemprop="email" t-esc="email"/></div>
         </div>
-        <div t-if="phone and 'phone' in fields" class='css_editable_mode_hidden'><i class='fa fa-phone'/> <span t-esc="phone"/></div>
-        <div t-if="mobile and 'mobile' in fields" class='css_editable_mode_hidden'><i class='fa fa-mobile-phone'/> <span t-esc="mobile"/></div>
-        <div t-if="fax and 'fax' in fields" class='css_editable_mode_hidden'><i class='fa fa-file-text-o'/> <span t-esc="fax"/></div>
-        <div t-if="email and 'email' in fields" class='css_editable_mode_hidden'><i class='fa fa-envelope'/> <span t-esc="email"/></div>
     </address>
 </template>