[MERGE] Sync with upstream (trunk)

bzr revid: tde@openerp.com-20140211141925-p3sziwkon7jlsq5r

22 files changed, 23 insertions, 18 deletions

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 80e223eed00..317d9193d94 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -399,7 +399,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .oe_green {
-  background-color: #51d466;
+  background-color: #169c78;
   color: white;
 }
 .oe_green .text-muted {
@@ -407,7 +407,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .oe_blue_light {
-  background-color: #4791d2;
+  background-color: #41b6ab;
   color: white;
 }
 .oe_blue_light .text-muted {
@@ -420,7 +420,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .oe_orange {
-  background-color: #e67e22;
+  background-color: #f05442;
   color: white;
 }
 .oe_orange .text-muted {
@@ -436,7 +436,7 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .oe_red {
-  background-color: #f75353;
+  background-color: #9c1b31;
   color: white;
 }
 .oe_red .text-muted {
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index cea00027315..2390464bfa7 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -328,13 +328,13 @@ div.carousel[data-snippet-id="slider"]
     color: white
 
 .oe_green
-    background-color: #51d466
+    background-color: #169C78
     color: white
     .text-muted
         color: #ddd
 
 .oe_blue_light
-    background-color: #4791d2
+    background-color: #41b6ab
     color: white
     .text-muted
         color: #ddd
@@ -344,7 +344,7 @@ div.carousel[data-snippet-id="slider"]
     color: white
 
 .oe_orange
-    background-color: #e67e22
+    background-color: #f05442
     color: white
     .text-muted
         color: #ddd
@@ -356,7 +356,7 @@ div.carousel[data-snippet-id="slider"]
         color: #ddd
 
 .oe_red
-    background-color: #f75353
+    background-color: #9C1b31
     color: white
     .text-muted
         color: #ddd
diff --git a/addons/website/static/src/img/banner/aqua.jpg b/addons/website/static/src/img/banner/aqua.jpg
index 47ce77005d4..23f4bb820db 100644
--- a/addons/website/static/src/img/banner/aqua.jpg
+++ b/addons/website/static/src/img/banner/aqua.jpg
diff --git a/addons/website/static/src/img/banner/baby_blue.jpg b/addons/website/static/src/img/banner/baby_blue.jpg
index 38a3d85bc28..d13c6683c1d 100644
--- a/addons/website/static/src/img/banner/baby_blue.jpg
+++ b/addons/website/static/src/img/banner/baby_blue.jpg
diff --git a/addons/website/static/src/img/banner/black.jpg b/addons/website/static/src/img/banner/black.jpg
index 7aaee7a0fb4..800d529d032 100644
--- a/addons/website/static/src/img/banner/black.jpg
+++ b/addons/website/static/src/img/banner/black.jpg
diff --git a/addons/website/static/src/img/banner/business_guy.jpg b/addons/website/static/src/img/banner/business_guy.jpg
index 691729beb7e..04551e6ae01 100644
--- a/addons/website/static/src/img/banner/business_guy.jpg
+++ b/addons/website/static/src/img/banner/business_guy.jpg
diff --git a/addons/website/static/src/img/banner/color_splash.jpg b/addons/website/static/src/img/banner/color_splash.jpg
index 7033d3cb41f..a16cf2367ca 100644
--- a/addons/website/static/src/img/banner/color_splash.jpg
+++ b/addons/website/static/src/img/banner/color_splash.jpg
diff --git a/addons/website/static/src/img/banner/flower.jpg b/addons/website/static/src/img/banner/flower.jpg
index 7208e4c99d9..ed33976aa38 100644
--- a/addons/website/static/src/img/banner/flower.jpg
+++ b/addons/website/static/src/img/banner/flower.jpg
diff --git a/addons/website/static/src/img/banner/flower_field.jpg b/addons/website/static/src/img/banner/flower_field.jpg
index eec572fbb89..23bf90844b7 100644
--- a/addons/website/static/src/img/banner/flower_field.jpg
+++ b/addons/website/static/src/img/banner/flower_field.jpg
diff --git a/addons/website/static/src/img/banner/greenfields.jpg b/addons/website/static/src/img/banner/greenfields.jpg
index 58c7bc49738..205406d24d4 100644
--- a/addons/website/static/src/img/banner/greenfields.jpg
+++ b/addons/website/static/src/img/banner/greenfields.jpg
diff --git a/addons/website/static/src/img/banner/landscape.jpg b/addons/website/static/src/img/banner/landscape.jpg
index 35dfa6206c4..08a7f233cdd 100644
--- a/addons/website/static/src/img/banner/landscape.jpg
+++ b/addons/website/static/src/img/banner/landscape.jpg
diff --git a/addons/website/static/src/img/banner/landscape.png b/addons/website/static/src/img/banner/landscape.png
deleted file mode 100644
index 27b1b92e048..00000000000
--- a/addons/website/static/src/img/banner/landscape.png
+++ /dev/null
diff --git a/addons/website/static/src/img/banner/mango.jpg b/addons/website/static/src/img/banner/mango.jpg
index 9f88e2fb987..7582d4f548e 100644
--- a/addons/website/static/src/img/banner/mango.jpg
+++ b/addons/website/static/src/img/banner/mango.jpg
diff --git a/addons/website/static/src/img/banner/mountains.jpg b/addons/website/static/src/img/banner/mountains.jpg
index 47e53c82c8c..7ea1ea48000 100644
--- a/addons/website/static/src/img/banner/mountains.jpg
+++ b/addons/website/static/src/img/banner/mountains.jpg
diff --git a/addons/website/static/src/img/banner/orange_red.jpg b/addons/website/static/src/img/banner/orange_red.jpg
index 18838410c9f..3f7b2ebeaa9 100644
--- a/addons/website/static/src/img/banner/orange_red.jpg
+++ b/addons/website/static/src/img/banner/orange_red.jpg
diff --git a/addons/website/static/src/img/banner/velour.jpg b/addons/website/static/src/img/banner/velour.jpg
index f3b0cf1d528..8a6b034b815 100644
--- a/addons/website/static/src/img/banner/velour.jpg
+++ b/addons/website/static/src/img/banner/velour.jpg
diff --git a/addons/website/static/src/img/banner/wood.jpg b/addons/website/static/src/img/banner/wood.jpg
index 738ff955918..4554794ff19 100644
--- a/addons/website/static/src/img/banner/wood.jpg
+++ b/addons/website/static/src/img/banner/wood.jpg
diff --git a/addons/website/static/src/img/banner/yellow_green.jpg b/addons/website/static/src/img/banner/yellow_green.jpg
index efd4dad9278..4d98768e8b0 100644
--- a/addons/website/static/src/img/banner/yellow_green.jpg
+++ b/addons/website/static/src/img/banner/yellow_green.jpg
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 1e8246366a9..7e867dca685 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -638,7 +638,7 @@
                 image_dialog(editor, new CKEDITOR.dom.element(previous));
                 $image_button.hide();
                 previous = null;
-            });
+            }, 'btn-sm');
 
             // previous is the state of the button-trigger: it's the
             // currently-ish hovered element which can trigger a button showing.
diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 017b47b641a..7d307bd26d7 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -71,8 +71,8 @@
                 {
                     snippet:   'three-columns',
                     placement: 'bottom',
-                    title:     _t("Drag & Drop a Block"),
-                    content:   _t("Drag the <em>'3 Columns'</em> block and drop it below the banner."),
+                    title:     _t("Drag & Drop This Block"),
+                    content:   _t("Drag the <em>'Three Columns'</em> block and drop it below the banner."),
                     popover:   { fixed: true },
                 },
                 {
@@ -98,17 +98,18 @@
                     popover:   { fixed: true },
                 },
                 {
-                    element:   'button[data-dismiss=modal]',
+                    element:   '.modal:has(#mobile-viewport) button[data-dismiss=modal]',
                     placement: 'right',
                     title:     _t("Close Mobile Preview"),
                     content:   _t("Scroll in the mobile preview to test the rendering. Once it's ok, close this dialog."),
                 },
                 {
-                    title:     "Congratulation",
-                    element:   'a[id=content-menu-button]',
+                    waitNot:   '.modal',
+                    element:   '#content-menu-button',
                     placement: 'bottom',
-                    content:   _t("This tour is finished. You can continue discovering features with the <em>'Content'</em> menu."),
-                    popover:   { fixed: true, next: _t("Close Tutorial") },
+                    title:     _t("Add new pages and menus"),
+                    content:   _t("The 'Content' menu allows you to add pages or add the top menu."),
+                    popover:   { next: _t("Close Tutorial") },
                 },
             ];
             return this._super();
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 408a4c01539..8b1284f0a07 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -77,7 +77,11 @@ website.Tour = openerp.Class.extend({
 
         website.Tour.busy = true;
 
-        this.localStorage.setItem("tour-"+this.id+"-test-automatic", automatic);
+        if (automatic) {
+            this.localStorage.setItem("tour-"+this.id+"-test-automatic", true);
+        } else {
+            this.localStorage.removeItem("tour-"+this.id+"-test-automatic");
+        }
         this.automatic = automatic;
 
         if (this.path) {
diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 1365ba08307..dcecef021bb 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -22,6 +22,6 @@
         </div>
     </t>
     <t t-name="website.tour_popover_title">
-        <t t-esc="title"/><button title="Close Tutorial" type="button" class="close" data-role="end">×</button>
+        <t t-esc="title"/><button title="End This Tutorial" type="button" class="close" data-role="end">×</button>
     </t>
 </templates>