[MERGE]Merge trunk-website-al.

bzr revid: bth@tinyerp.com-20131031073239-x07851ujal6yx8pz

4 files changed, 20 insertions, 7 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 8fa0ad80f5f..474012afc98 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 /* ---- CKEditor Minimal Reset ---- */
 .navbar.navbar-inverse .cke_chrome {
   border: none;
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 866d35e8d81..6a30cbef1eb 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -2,7 +2,7 @@
 /*       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
  *
  * css for editor buttons, openerp widget included in the website and other
- * stuff must go to the editor.css 
+ * stuff must go to the editor.css
  *
  */
 /* ----- GENERIC LAYOUTING HELPERS ---- */
@@ -451,4 +451,7 @@ table.well tr th {
 
 table.well tr td span {
   padding-right: 5px;
+
+.logo-img {
+  width: 220px;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 752d32cc9ec..a349049ae40 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -1,10 +1,10 @@
 @charset "utf-8"
 
-/* 
+/*
  *       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
  *
  * css for editor buttons, openerp widget included in the website and other
- * stuff must go to the editor.css 
+ * stuff must go to the editor.css
  *
  */
 
@@ -133,7 +133,7 @@ html,body, #wrapwrap
 
 header, #wrap, footer
     display: table-row
- 
+
 footer
     height: 100%
     background: rgb(239, 248, 248)
@@ -183,7 +183,7 @@ footer
 // .navbar .nav > li  a
 //     text-shadow: none
 
-// .nav > li  a 
+// .nav > li  a
 //     display: block
 
 .carousel-inner .item
@@ -284,7 +284,6 @@ footer
         height: 300px
     &.oe_big
         height: 450px
-
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal
     overflow: hidden
@@ -345,3 +344,6 @@ table.well tr
         padding-right: 10px
     td
         padding-right: 5px
+
+.logo-img
+    width: 220px
diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index c29325c8de8..303e670b133 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -1037,6 +1037,11 @@
             this.$target.attr("id", "myCarousel" + id);
             this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
             this.$target.find("[data-target='#myCarousel']").attr("data-target", "#myCarousel" + id);
+
+            this.$target.attr('contentEditable', 'false')
+                .find('.content, .carousel-image img')
+                    .attr('contentEditable', 'true');
+
             this.rebind_event();
         },
         onFocus: function () {
@@ -1053,6 +1058,9 @@
             if(!this.$target.find(".item.active").length) {
                 this.$target.find(".item:first").addClass("active");
             }
+            this.$target.removeAttr('contentEditable')
+                .find('.content, .carousel-image img')
+                    .removeAttr('contentEditable');
         },
         start : function () {
             this._super();
@@ -1223,7 +1231,6 @@
                 size = 'oe_small';
             else if ($el.hasClass('oe_medium'))
                 size = 'oe_medium';
-
             var $ul = this.$editor.find('ul[name="parallax-size"]');
             var $li = $ul.find("li");