[REM] import from core, moving to module

bzr revid: xmo@openerp.com-20120911063607-xvhyjqohptynro30

3 files changed, 12 insertions, 48 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 73457e2bc19..f952dd298fd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2574,10 +2574,13 @@
 .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page {
   display: none;
 }
+.openerp .oe_list_buttons .oe_alternative {
+  visibility: hidden;
+}
 .openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard {
   display: none;
 }
-.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_list_button_import {
+.openerp .oe_list_buttons.oe_editing .oe_list_add {
   display: none;
 }
 .openerp .oe_list_buttons.oe_editing .oe_list_save {
@@ -2586,6 +2589,9 @@
 .openerp .oe_list_buttons.oe_editing .oe_list_discard {
   display: inline;
 }
+.openerp .oe_list_buttons.oe_editing .oe_alternative {
+  visibility: visible;
+}
 .openerp .oe_list {
   position: relative;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5e346b32df2..1f332756cf7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1971,15 +1971,19 @@ $sheet-max-width: 860px
     // }}}
     // ListView {{{
     .oe_list_buttons
+        .oe_alternative
+            visibility: hidden
         .oe_list_save, .oe_list_discard
             display: none
         &.oe_editing
-            .oe_list_add, .oe_list_button_import
+            .oe_list_add
                 display: none
             .oe_list_save
                 display: inline-block
             .oe_list_discard
                 display: inline
+            .oe_alternative
+                visibility: visible
 
     .oe_list
         position: relative
diff --git a/addons/web/static/src/css/data_import.css b/addons/web/static/src/css/data_import.css
deleted file mode 100644
index 47cd52aa081..00000000000
--- a/addons/web/static/src/css/data_import.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.openerp .oe_import_grid {
-    border: none;
-    border-collapse: collapse;
-}
-.openerp .oe_import_grid-header .oe_import_grid-cell {
-    background: url(../img/gradientlinebg.gif) repeat-x #CCCCCC;
-    border-bottom: 1px solid #E3E3E3;
-    font-weight: bold;
-    text-align: left;
-}
-.openerp .oe_import_grid-row .oe_import_grid-cell {
-    border-bottom: 1px solid #E3E3E3;
-}
-
-.openerp .oe_import_no_result .oe_import_result {
-    display: none;
-}
-.openerp .oe_import fieldset {
-    cursor: pointer;
-}
-.openerp .oe_import fieldset legend:before {
-    content: '\25BC  ';
-}
-.openerp .oe_import fieldset.oe_closed legend:before {
-    content: '\25B6  ';
-}
-.openerp .oe_import fieldset.oe_closed table {
-    display: none;
-}
-.openerp .oe_import .separator.horizontal {
-    font-weight: bold;
-    border-bottom-width: 1px;
-    margin: 6px 4px 6px 1px;
-    height: 20px;
-}
-.openerp .duplicate_fld{
-    background-color:#FF6666;
-}
-.openerp .select_fld{
-    background: none repeat scroll 0 0 white;
-}
-.openerp .ui-autocomplete {
-    max-height: 300px;
-    overflow-y: auto;
-    padding-right: 20px;
-}