[MERGE] Merged with trunk

bzr revid: fme@openerp.com-20110801092617-f4vcc8dhx31n5ot3

2 files changed, 140 insertions, 15 deletions

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 84b51b2cd54..b173386e234 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -30,6 +30,9 @@ body.openerp {
 .openerp .oe-number {
     text-align: right !important;
 }
+.openerp .oe_hide {
+    display: none !important;
+}
 
 /* STATES */
 .openerp .on_logged {
@@ -577,6 +580,10 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
     display: none;
 }
 
+.openerp .searchview_extended_delete_prop {
+    text-decoration: none;
+}
+
 .openerp .searchview_extended_delete_group span,
 .openerp .searchview_extended_delete_prop span {
     font-size: 0.9em;
@@ -591,6 +598,10 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
     border: 1px solid silver;
 }
 
+.openerp .oe-listview thead table {
+    width: 100%;
+    border:  none;
+}
 .openerp .oe-listview tr.odd {
     background-color: #f3f3f3;
 }
@@ -600,16 +611,27 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
 .openerp .oe-listview tbody tr:hover {
     background-color: #eae9f0;
 }
+.openerp .oe-listview thead table tr,
+.openerp .oe-listview thead table tr:hover {
+    background: none;
+}
 
 .openerp .oe-listview td,
 .openerp .oe-listview th {
     vertical-align: middle;
     text-align: left;
 }
-.openerp .oe-listview th.oe-sortable,
-.openerp .oe-listview th.oe-sortable .ui-icon {
+.openerp .oe-listview td.oe-record-delete {
+    text-align: right;
+}
+.openerp .oe-listview th.oe-sortable {
     cursor: pointer;
 }
+.openerp .oe-listview th.oe-sortable .ui-icon {
+    height: 1em;
+    display: inline;
+    display: inline-block;
+}
 
 .openerp .oe-listview .oe-field-cell {
     cursor: pointer;
@@ -632,9 +654,22 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
 
 .openerp .oe-listview th.oe-actions {
     text-align: left;
+    white-space: nowrap;
 }
 .openerp .oe-listview th.oe-list-pager {
     text-align: right;
+    white-space: nowrap;
+}
+.openerp .oe-list-pager .oe-pager-state {
+    cursor: pointer;
+}
+
+.openerp .oe-listview .oe-group-name {
+    padding-right: 1em;
+}
+.openerp .oe-listview .oe-group-name,
+.openerp .oe-listview .oe-group-pagination {
+    white-space: nowrap;
 }
 
 .openerp .oe-listview tfoot td {
@@ -653,29 +688,29 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
     rounded corners are a pain on tables: need to round not only table, but
     also on the first and last children of the first and last row
  */
-.openerp .oe-listview table {
+.openerp .oe-listview table.oe-listview-content {
     -webkit-border-radius: 7px;
     -moz-border-radius: 7px;
     border-radius: 7px;
 }
-.openerp .oe-listview table thead tr:first-child th:first-child {
+.openerp .oe-listview table.oe-listview-content thead tr:first-child th:first-child {
     -webkit-border-top-left-radius: 7px;
     -moz-border-radius-topleft: 7px;
     border-top-left-radius: 7px;
 }
-.openerp .oe-listview table thead tr:first-child th:last-child {
+.openerp .oe-listview table.oe-listview-content thead tr:first-child th:last-child {
     -webkit-border-top-right-radius: 7px;
     -moz-border-radius-topright: 7px;
     border-top-right-radius: 7px;
 }
-.openerp .oe-listview table tfoot td:first-child,
-.openerp .oe-listview table tbody:last-child tr:last-child th:first-child {
+.openerp .oe-listview table.oe-listview-content tfoot 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 tfoot td:last-child,
-.openerp .oe-listview table tbody:last-child tr:last-child td:last-child {
+.openerp .oe-listview table.oe-listview-content tfoot 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;
     border-bottom-right-radius: 7px;
@@ -773,13 +808,14 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
     position: relative;
     vertical-align: top;
 }
-.openerp input.field_date, .openerp input.field_datetime {
-    background: #fff url('../img/ui/field_calendar.png') no-repeat right center;
-    background-origin: content-box;
-    -moz-background-origin: content;
-    -moz-background-origin: content-box;
-    -webkit-background-origin: content-box;
+.openerp img.ui-datepicker-trigger, .openerp img.ui-datepicker-trigger {
+    margin-left: -20px;
+    vertical-align: middle;
+    cursor: pointer;
+    position: relative;
+    top: -1px;
 }
+
 /* http://www.quirksmode.org/dom/inputfile.html
  * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
  */
@@ -987,6 +1023,10 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */
 .openerp .closed-sidebar .toggle-sidebar {
     border-left: none;
 }
+.openerp li.oe_sidebar_print {
+    padding-left: 20px;
+    background: 1px 3px url(../img/icons/gtk-print.png) no-repeat;
+}
 
 .openerp.kitten-mode-activated .main_table {
     background: url(http://placekitten.com/g/1500/800) repeat;
diff --git a/addons/base/static/src/css/data_export.css b/addons/base/static/src/css/data_export.css
new file mode 100644
index 00000000000..7b4b9707b39
--- /dev/null
+++ b/addons/base/static/src/css/data_export.css
@@ -0,0 +1,85 @@
+.openerp .oe_export_row tr{
+    background-color: #FFFFFF;
+    font-size: 0.8em;
+    height: 22px;
+}
+
+.openerp tr.ui-selected td {
+    background-color: #CCCCCC;
+}
+
+.openerp .oe_export_requiredfield {
+    background-color: #D2D2FF;
+}
+
+.openerp .oe_export_readonlyfield{
+    background-color: #999999;
+}
+
+.openerp .oe_export_row:hover{
+    background-color: #F3F3F3;
+}
+
+.openerp .oe_export_fields_selector_export {
+    width: 100%;
+    height: 400px;
+}
+
+.openerp .oe_export_fields_selector_left {
+    width: 50%;
+}
+
+.openerp div#left_field_panel {
+    overflow: scroll;
+    width: 100%;
+    height: 400px;
+    border: solid #999999 1px;
+}
+
+.openerp .oe_export_fields_selector_center {
+    width: 102px;
+}
+
+.openerp .oe_export_fields_selector_right {
+    width: 45%;
+    height: 400px;
+}
+
+.openerp .oe_export_fields_selector_export select{
+    width: 100%;
+    height: 100%;
+}
+
+.openerp .oe_export_tree_header{
+    border: 0.5px solid #E3E3E3;
+    text-align: left;
+    white-space: nowrap;
+    padding: 4px 5px;
+    background: url(/base/static/src/img/header.gif);
+}
+
+
+.openerp table.tree_grid{
+    border: 1px solid #E3E3E3;
+    text-align: left;
+    white-space: nowrap;
+    background-color:#E3E3E3;
+    border-collapse: collapse;
+    width: 100%;
+}
+
+.openerp table.tree_grid a:hover {
+    color: blue;
+    border: none;
+}
+
+.openerp table.tree_grid a {
+    color: #5F5C5C;
+    border: none;
+    display: block;
+}
+
+.openerp .oe_export_button_export {
+	border: 1px solid #006;
+	background-color: #F3F3F3;
+}