[REVERT] snippets drop zone too complex

bzr revid: fp@tinyerp.com-20131017141959-fpkds0a7e1m1sfrw

5 files changed, 45 insertions, 107 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index dc9bb076e59..a009bf61f23 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -305,87 +305,53 @@ table.editorbar-panel td.selected {
 }
 
 /* ---- SNIPPETS DROP ZONES ---- */
-#dark_for_dropzone {
-  width: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  opacity: 0.4;
-  z-index: 1000;
-  pointer-events: none;
-}
-#dark_for_dropzone td {
-  background: black;
-}
-#dark_for_dropzone td.center.active {
-  background: transparent;
-}
-
-.oe_drop_zone, .oe_drop_zone_style {
-  border: none;
-  background: rgba(100, 255, 255, 0.9);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -o-border-radius: 4px;
-  border-radius: 4px;
-}
-.oe_drop_zone div, .oe_drop_zone_style div {
-  margin: 0;
-  line-height: 48px;
-  text-align: center;
-  color: magenta;
-  font-weight: bold;
-  font-size: 24px;
-}
-.oe_drop_zone .oe_active, .oe_drop_zone_style .oe_active {
-  display: none;
-}
-
-.oe_drop_zone_style div {
-  line-height: 24px;
-}
-
-.oe_drop_zone {
+.oe_drop_zone.oe_insert {
   display: block;
   height: 48px;
   margin: 0px;
   margin-top: -4px;
   margin-bottom: -44px;
-  z-index: 1002;
+  -webkit-transition: margin 250ms linear;
+  -moz-transition: margin 250ms linear;
+  -o-transition: margin 250ms linear;
+  transition: margin 250ms linear;
   width: 100%;
   position: absolute;
+  z-index: 1000;
 }
-.oe_drop_zone:not(.oe_vertical):before {
+.oe_drop_zone.oe_insert:not(.oe_vertical):before {
   content: "";
   display: block;
   border-top: dashed 2px rgba(209, 178, 255, 0.72);
   position: relative;
   top: 0px;
 }
-.oe_drop_zone.oe_hover:before {
+.oe_drop_zone.oe_insert.oe_hover:before {
   border-top: dashed 2px rgba(116, 255, 161, 0.72);
 }
-.oe_drop_zone.oe_vertical {
+.oe_drop_zone.oe_insert.oe_vertical {
   width: 48px;
   float: left;
   position: relative;
-  margin: 4px -24px !important;
+  margin: 0px -24px !important;
 }
-.oe_drop_zone.oe_vertical div {
-  display: none;
-}
-.oe_drop_zone.oe_overlay {
+.oe_drop_zone.oe_insert.oe_overlay {
   border-radius: 3px;
+  background: rgba(153, 0, 255, 0.5);
 }
-.oe_drop_zone.oe_drop_active {
-  background: rgba(100, 255, 255, 0.3);
-}
-.oe_drop_zone.oe_drop_active div {
-  display: none;
+
+.oe_drop_zone, .oe_drop_zone_style {
+  border: none;
+  background: rgba(153, 0, 255, 0.3);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
 }
-.oe_drop_zone.oe_drop_active .oe_active {
-  display: block;
+.oe_drop_zone.oe_hover, .oe_drop_zone_style.oe_hover {
+  background: rgba(0, 255, 133, 0.3);
+  z-index: 1001;
 }
 
 .oe_drop_zone_style {
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index bc8b238736e..461667d8e54 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -242,45 +242,16 @@ table.editorbar-panel
 
 /* ---- SNIPPETS DROP ZONES ---- */
 
-#dark_for_dropzone
-    width: 100%
-    position: absolute
-    top: 0
-    left: 0
-    opacity: 0.4
-    z-index: 1000
-    pointer-events: none
-    td
-        background: #000
-        &.center.active
-            background: transparent
-
-.oe_drop_zone, .oe_drop_zone_style
-    border: none
-    background: rgba(100, 255, 255, .9)
-    +border-radius(4px)
-    div
-        margin: 0
-        line-height: 48px
-        text-align: center
-        color: #FF00FF
-        font-weight: bold
-        font-size: 24px
-    .oe_active
-        display: none
-
-.oe_drop_zone_style div
-    line-height: 24px
-
-.oe_drop_zone
+.oe_drop_zone.oe_insert
     display: block
     height: 48px
     margin: 0px
     margin-top: -4px
     margin-bottom: -44px
-    z-index: 1002
+    @include transition(margin 250ms linear)
     width: 100%
     position: absolute
+    z-index: 1000
     &:not(.oe_vertical):before
         content: ""
         display: block
@@ -293,17 +264,22 @@ table.editorbar-panel
         width: 48px
         float: left
         position: relative
-        margin: 4px -24px !important
-        div
-            display: none
+        margin: 0px -24px !important
     &.oe_overlay
         border-radius: 3px
-    &.oe_drop_active
-        background: rgba(100, 255, 255, .3)
-        div
-            display: none
-        .oe_active
-            display: block
+        //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px))
+        //background-size: 100px 100px
+        background: rgba(153, 0, 255,.5)
+
+.oe_drop_zone, .oe_drop_zone_style
+    border: none
+    //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.1) ,rgba(255,255,255,.1) 35px, rgba(0,0,0,.1) 35px, rgba(0,0,0,.1) 75px))
+    //background-size: 100px 100px
+    background: rgba(153, 0, 255, .3)
+    +border-radius(4px)
+    &.oe_hover
+        background: rgba(0, 255, 133, .3)
+        z-index: 1001
 
 .oe_drop_zone_style
     color: white
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index c6bb24d04f0..63e8fbefa76 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -216,4 +216,5 @@
 [data-snippet-id] {
     min-height: 10px;
     min-width: 10px;
-}
\ 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 c5b58815c67..ce87e592136 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -235,10 +235,7 @@ footer {
 }
 
 .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
-  position: relative;
-}
-.oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child div, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child div {
-  display: none;
+  position: static;
 }
 
 .oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before {
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 2735dfe9fc8..5197653429c 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -161,9 +161,7 @@ footer
     height: 220px !important
 
 .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
-    position: relative
-    div
-        display: none
+    position: static
 
 .oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
     content: 'Click Edit To Create Content'