[MERGE] Merge with trunk upto revision no 1349.

bzr revid: ysa@tinyerp.com-20111017051054-5l3pjg5sytilkjwg
bzr revid: ysa@tinyerp.com-20111018045137-msfhlnn9lofb26xv
bzr revid: ysa@tinyerp.com-20111019050434-b2uyjsget3ezfmpp
bzr revid: ysa@tinyerp.com-20111020045022-drhcz2yd62can1sy
bzr revid: ysa@tinyerp.com-20111021044543-1b1v2m4t32rifd33
bzr revid: ysa@tinyerp.com-20111024050516-2hasbf5q4v1j64kk
bzr revid: ysa@tinyerp.com-20111024130602-iixh5nvuio1nhs7x
bzr revid: ysa@tinyerp.com-20111025050237-xvf583083lg1hrrj

2 files changed, 32 insertions, 9 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a814ddbba1b..34ec885b2a9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -40,6 +40,9 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio
 }
 
 /* Loading */
+.loading {
+    cursor: wait;
+}
 .openerp .loading {
     display: none;
     z-index: 100;
@@ -156,7 +159,7 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio
 }
 
 .db_container {
-    width: 15%;
+    width: 196px;
     background: #666666;
 }
 
@@ -222,6 +225,7 @@ label.error {
     background: #f0eeee;
 }
 .openerp .oe-application-container {
+    width: 100%;
     height: 100%;
 }
 
@@ -797,13 +801,15 @@ label.error {
     -moz-border-radius-topright: 7px;
     border-top-right-radius: 7px;
 }
-.openerp .oe-listview table.oe-listview-content tfoot td:first-child,
+.openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:first-child,
+.openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:first-child,
 .openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child th:first-child {
     -webkit-border-bottom-left-radius: 7px;
     -moz-border-radius-bottomleft: 7px;
     border-bottom-left-radius: 7px;
 }
-.openerp .oe-listview table.oe-listview-content tfoot td:last-child,
+.openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:last-child,
+.openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:last-child,
 .openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child td:last-child {
     -webkit-border-bottom-right-radius: 7px;
     -moz-border-radius-bottomright: 7px;
@@ -1369,19 +1375,20 @@ label.error {
 }
 
 ul.oe-arrow-list {
-    padding-left: 0.5em;
+    padding-left: 1.1em;
     margin: 0;
+    white-space: nowrap;
 }
 ul.oe-arrow-list li {
     display: inline-block;
-    margin-left: -0.5em;
+    margin-left: -1em;
 }
 ul.oe-arrow-list li span {
     vertical-align: top;
     display: inline-block;
     border-width:1em;
     border-style:solid;
-    border-color: white;
+    border-color: #DEDEDE;
     line-height:0em;
 }
 ul.oe-arrow-list .oe-arrow-list-before {
@@ -1390,18 +1397,18 @@ ul.oe-arrow-list .oe-arrow-list-before {
 }
 ul.oe-arrow-list .oe-arrow-list-after {
     border-color: rgba(0,0,0,0);
-    border-left-color: white;
+    border-left-color: #DEDEDE;
     border-right-width:0;
 }
 ul.oe-arrow-list li.oe-arrow-list-selected span {
-    border-color: #CFCCCC;
+    border-color: #B5B9FF;
 }
 ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-before {
     border-left-color: rgba(0,0,0,0);
 }
 ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after {
     border-color: rgba(0,0,0,0);
-    border-left-color: #CFCCCC;
+    border-left-color: #B5B9FF;
 }
 .openerp .view_editor{
     font-size: 90%;
diff --git a/addons/web/static/src/css/data_import.css b/addons/web/static/src/css/data_import.css
index 1fb3b22aa45..e5d1c9a910c 100644
--- a/addons/web/static/src/css/data_import.css
+++ b/addons/web/static/src/css/data_import.css
@@ -11,6 +11,22 @@
 .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 .separator.horizontal {
     font-weight: bold;
     border-bottom-width: 1px;