[IMP] CSS cleaning: edit menu

bzr revid: fp@tinyerp.com-20131115115122-zzg6xeisa85n45e1

3 files changed, 24 insertions, 134 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 24d41e90421..823a1d30f81 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -147,81 +147,26 @@ div.oe_menu_buttons {
   right: -8px;
 }
 
-ul.oe_menu_editor .icon-home:before {
-  content: " ";
-}
-ul.oe_menu_editor > li:first-child > div > i.icon-home:before {
-  content: "\f015";
-}
-ul.oe_menu_editor, ul.oe_menu_editor ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}
-ul.oe_menu_editor ul {
-  padding-left: 30px;
-}
-ul.oe_menu_editor button {
-  margin-left: 4px;
+ul.oe_menu_editor .icon-home {
+  display: none;
 }
-ul.oe_menu_editor li {
-  margin: 5px 0 0 0;
-  padding: 0;
+ul.oe_menu_editor > li:first-child .icon-home {
+  display: block;
 }
 ul.oe_menu_editor .oe_menu_placeholder {
   outline: 1px dashed #4183c4;
 }
-ul.oe_menu_editor .mjs-nestedSortable-error {
-  background: #fbe3e4;
-  border-color: transparent;
+ul.oe_menu_editor ul {
+  list-style: none;
 }
 ul.oe_menu_editor li div {
-  border: 1px solid #d4d4d4;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  border-color: #d4d4d4 #d4d4d4 #bcbcbc;
-  padding: 6px;
-  margin: 0;
   cursor: move;
-  background: #f6f6f6;
-  background: -moz-linear-gradient(top, white 0%, #f6f6f6 47%, #ededed 100%);
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(47%, #f6f6f6), color-stop(100%, #ededed));
-  background: -webkit-linear-gradient(top, white 0%, #f6f6f6 47%, #ededed 100%);
-  background: -o-linear-gradient(top, white 0%, #f6f6f6 47%, #ededed 100%);
-  background: -ms-linear-gradient(top, white 0%, #f6f6f6 47%, #ededed 100%);
-  background: linear-gradient(to bottom, #ffffff 0%, #f6f6f6 47%, #ededed 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 );
-}
-ul.oe_menu_editor li.mjs-nestedSortable-branch div {
-  background: -moz-linear-gradient(top, white 0%, #f6f6f6 47%, #f0ece9 100%);
-  background: -webkit-linear-gradient(top, white 0%, #f6f6f6 47%, #f0ece9 100%);
-}
-ul.oe_menu_editor li.mjs-nestedSortable-leaf div {
-  background: -moz-linear-gradient(top, white 0%, #f6f6f6 47%, #bcccbc 100%);
-  background: -webkit-linear-gradient(top, white 0%, #f6f6f6 47%, #bcccbc 100%);
-}
-ul.oe_menu_editor li.mjs-nestedSortable-collapsed.mjs-nestedSortable-hovering div {
-  border-color: #999999;
-  background: #fafafa;
 }
 ul.oe_menu_editor .disclose {
   cursor: pointer;
   width: 10px;
   display: none;
 }
-ul.oe_menu_editor li.mjs-nestedSortable-collapsed > ul {
-  display: none;
-}
-ul.oe_menu_editor li.mjs-nestedSortable-branch > div > .disclose {
-  display: inline-block;
-}
-ul.oe_menu_editor li.mjs-nestedSortable-collapsed > div > .disclose > span:before {
-  content: "+ ";
-}
-ul.oe_menu_editor li.mjs-nestedSortable-expanded > div > .disclose > span:before {
-  content: "- ";
-}
 
 /* ---- RTE ---- */
 .oe_editable .btn {
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index da1bc7a70ef..918714ea92f 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -128,80 +128,23 @@ table.editorbar-panel
 div.oe_menu_buttons
     top: -8px
     right: -8px
-ul.oe_menu_editor
-    .icon-home:before
-        content: " "
-    > li:first-child > div > i.icon-home:before
-        content: "\f015"
-    &, & ul
-        list-style-type: none
-        margin: 0
-        padding: 0
-    & ul
-        padding-left: 30px
-
-    button
-        margin-left: 4px
-
-    li
-        margin: 5px 0 0 0
-        padding: 0
 
+ul.oe_menu_editor
+    .icon-home
+        display: none
+    > li:first-child .icon-home
+        display: block
     .oe_menu_placeholder
         outline: 1px dashed #4183C4
-
-    .mjs-nestedSortable-error
-        background: #fbe3e4
-        border-color: transparent
-
-
-    // TODO: use compass mixins
+    ul
+        list-style: none
     li div
-        border: 1px solid #d4d4d4
-        -webkit-border-radius: 3px
-        -moz-border-radius: 3px
-        border-radius: 3px
-        border-color: #D4D4D4 #D4D4D4 #BCBCBC
-        padding: 6px
-        margin: 0
         cursor: move
-        background: #f6f6f6
-        background: -moz-linear-gradient(top,  #ffffff 0%, #f6f6f6 47%, #ededed 100%)
-        background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed))
-        background: -webkit-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
-        background: -o-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
-        background: -ms-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
-        background: linear-gradient(to bottom,  #ffffff 0%,#f6f6f6 47%,#ededed 100%)
-        filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 )
-
-    li.mjs-nestedSortable-branch div
-        background: -moz-linear-gradient(top,  #ffffff 0%, #f6f6f6 47%, #f0ece9 100%)
-        background: -webkit-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#f0ece9 100%)
-
-    li.mjs-nestedSortable-leaf div
-        background: -moz-linear-gradient(top,  #ffffff 0%, #f6f6f6 47%, #bcccbc 100%)
-        background: -webkit-linear-gradient(top,  #ffffff 0%,#f6f6f6 47%,#bcccbc 100%)
-
-    li.mjs-nestedSortable-collapsed.mjs-nestedSortable-hovering div
-        border-color: #999
-        background: #fafafa
-
     .disclose
         cursor: pointer
         width: 10px
         display: none
 
-    li.mjs-nestedSortable-collapsed > ul
-        display: none
-
-    li.mjs-nestedSortable-branch > div > .disclose
-        display: inline-block
-
-    li.mjs-nestedSortable-collapsed > div > .disclose > span:before
-        content: '+ '
-
-    li.mjs-nestedSortable-expanded > div > .disclose > span:before
-        content: '- '
 // }}}
 
 /* ---- RTE ---- */
diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index b755f0af1e0..22bec817778 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -1,18 +1,20 @@
 <templates id="template" xml:space="preserve">
 <t t-name="website.menu.dialog.submenu">
     <li t-att-data-menu-id="submenu.id">
-        <div>
-            <i class="icon-reorder"/>
-            <span><t t-esc="submenu.name"/></span>
-            <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
-                <button type="button" class="btn js_edit_menu">
+        <div class="input-group">
+            <span class="input-group-addon icon-reorder"/>
+            <span type="text" class="form-control">
+                <t t-esc="submenu.name"/>
+                <i class="pull-right icon-home" style="margin-top: 3px"/>
+            </span>
+            <span class="input-group-btn">
+                <button type="button" class="btn btn-primary js_edit_menu">
                     <i class="icon-edit"/>
                 </button>
-                <button type="button" class="btn js_delete_menu">
+                <button type="button" class="btn btn-danger js_delete_menu">
                     <i class="icon-trash"/>
                 </button>
-            </div>
-            <i class="icon-home pull-right"/>
+            </span>
         </div>
         <t t-set="children" t-value="submenu.children"/>
         <ul t-if="children">
@@ -25,7 +27,7 @@
 <t t-name="website.menu.dialog.edit">
     <t t-call="website.editor.dialog">
         <t t-set="title">Edit Menu</t>
-        <ul class="oe_menu_editor">
+        <ul class="oe_menu_editor list-unstyled">
             <t t-foreach="widget.menu.children" t-as="submenu">
                 <t t-call="website.menu.dialog.submenu"/>
             </t>