[MERGE] Sync with website-al

bzr revid: tde@openerp.com-20131202154935-t8wcgt180bbop8yy

5 files changed, 98 insertions, 5 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 7a71740671b..f05db4c88b8 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;
@@ -85,6 +86,10 @@
   display: none;
 }
 
+.cke_editable .css_editable_mode_hidden {
+  display: none;
+}
+
 .oe_carousel_options {
   cursor: pointer;
   position: absolute;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index ea7bbb1480a..1e35c352374 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -70,6 +70,9 @@
 .css_non_editable_mode_hidden
     display: none
 
+.cke_editable .css_editable_mode_hidden
+    display: none
+
 .oe_carousel_options
     cursor: pointer
     position: absolute
diff --git a/addons/website/static/src/css/website.backend.css b/addons/website/static/src/css/website.backend.css
new file mode 100644
index 00000000000..e6601788bcc
--- /dev/null
+++ b/addons/website/static/src/css/website.backend.css
@@ -0,0 +1,6 @@
+.oe_WidgetWebsiteButton .btn-danger .oe_publish {
+    display: none;
+}
+.oe_WidgetWebsiteButton .btn-success .oe_unpublish {
+    display: none;
+}
\ No newline at end of file
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index b5c176ee173..71f030a8bec 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -254,6 +254,13 @@ footer {
   content: "Drag Building Blocks Here";
 }
 
+.oe_structure.oe_editable [data-snippet-id]:empty {
+  background: rgba(255, 0, 0, 0.1);
+}
+.oe_structure.oe_editable [data-snippet-id]:empty:before {
+  content: "Please Edit This Empty Block";
+}
+
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 .navbar .nav > li > p {
   margin-bottom: 0px;
@@ -406,14 +413,14 @@ ul.nav-stacked > li > a {
 }
 
 /* Parallax Theme */
-.parallax_quote {
+.parallax_quote, [data-snippet-id="slider"] {
   background: center center no-repeat fixed;
   background-size: contain;
 }
-.parallax_quote .carousel-indicators li {
+.parallax_quote .carousel-indicators li, [data-snippet-id="slider"] .carousel-indicators li {
   border: 1px solid grey;
 }
-.parallax_quote .carousel-indicators .active {
+.parallax_quote .carousel-indicators .active, [data-snippet-id="slider"] .carousel-indicators .active {
   background-color: grey;
 }
 
@@ -456,3 +463,40 @@ ul.nav-stacked > li > a {
   height: 100%;
   background-size: 100%;
 }
+
+.texttop {
+  vertical-align: top;
+}
+
+table.well tr th {
+  text-align: right;
+  padding-right: 10px;
+}
+table.well tr td {
+  padding-right: 5px;
+}
+
+.logo-img {
+  width: 220px;
+}
+
+.oe_demo {
+  position: relative;
+}
+.oe_demo img {
+  width: 100%;
+}
+.oe_demo div {
+  position: absolute;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  opacity: 0.85;
+  bottom: 0px;
+  width: 100%;
+  padding: 7px;
+  color: white;
+  font-weight: bold;
+}
+.oe_demo div a {
+  color: white;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index fc309da3281..157fd19148c 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -171,6 +171,11 @@ footer
 .oe_structure.oe_editable.oe_empty:empty:before, .oe_editable[data-oe-type=html]:empty:before, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
     content: 'Drag Building Blocks Here'
 
+.oe_structure.oe_editable [data-snippet-id]:empty
+    background: rgba(255,0,0,0.1)
+    &:before
+        content: 'Please Edit This Empty Block'
+
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
 .navbar .nav > li > p
@@ -304,7 +309,7 @@ ul.nav-stacked > li > a
 
 /* Parallax Theme */
 
-.parallax_quote
+.parallax_quote, [data-snippet-id="slider"]
     background: center center no-repeat fixed
     background-size: contain
     .carousel-indicators
@@ -337,4 +342,34 @@ ul.nav-stacked > li > a
     background-color: rgba(255, 0, 0, 0.8)
 .oe_img_bg
     height: 100%
-    background-size: 100%
\ No newline at end of file
+    background-size: 100%
+
+.texttop
+    vertical-align: top
+
+table.well tr
+    th
+        text-align: right
+        padding-right: 10px
+    td
+        padding-right: 5px
+
+.logo-img
+    width: 220px
+
+.oe_demo
+    position: relative
+    img
+        width: 100%
+    div
+        position: absolute
+        left: 0
+        background-color: rgba(0,0,0,0.4)
+        opacity: 0.85
+        bottom: 0px
+        width: 100%
+        padding: 7px
+        color: white
+        font-weight: bold
+        a
+            color: white