[Merge] Merge with trunk.

bzr revid: mdi@tinyerp.com-20121126044751-82pvr9yxn0y5qfrs

2 files changed, 65 insertions, 50 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6b30a4768a0..9b99258a3a7 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -30,7 +30,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */
+   */ */
 }
 .openerp.openerp_webclient_container {
   height: 100%;
@@ -1180,7 +1180,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightgrey;
+  border: 1px solid lightGray;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1205,7 +1205,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightgrey;
+  border-top: 1px solid lightGray;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -1438,15 +1438,15 @@
 .openerp .oe_list_pager {
   line-height: 26px;
 }
-.openerp .oe_list_pager .oe_pager_value {
+.openerp .oe_pager_value {
   float: left;
   margin-right: 8px;
 }
-.openerp .oe_list_pager ul.oe_pager_group {
+.openerp ul.oe_pager_group {
   padding: 0;
   margin: 0;
 }
-.openerp .oe_list_pager .oe_pager_group {
+.openerp .oe_pager_group {
   float: left;
   height: 24px;
   line-height: 24px;
@@ -1457,7 +1457,7 @@
   -webkit-border-radius: 5px;
   border-radius: 5px;
 }
-.openerp .oe_list_pager .oe_pager_group li {
+.openerp .oe_pager_group li {
   height: 24px;
   line-height: 24px;
   padding: 0;
@@ -1466,23 +1466,23 @@
   float: left;
   border-right: 1px solid #ababab;
 }
-.openerp .oe_list_pager .oe_pager_group li:last-child {
+.openerp .oe_pager_group li:last-child {
   border: none;
 }
-.openerp .oe_list_pager .oe_pager_group a {
+.openerp .oe_pager_group a {
   color: #4c4c4c;
   padding: 0 8px;
 }
-.openerp .oe_list_pager .oe_pager_group a:hover {
+.openerp .oe_pager_group a:hover {
   text-decoration: none;
 }
-.openerp .oe_list_pager .oe_pager_group .active {
+.openerp .oe_pager_group .active {
   background: #999999;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
 }
-.openerp .oe_list_pager .oe_pager_group .active a {
+.openerp .oe_pager_group .active a {
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
@@ -1912,14 +1912,22 @@
   max-width: 700px;
 }
 .openerp .oe_view_nocontent .oe_view_nocontent_create {
-  background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0;
   margin-top: 0;
   padding-top: 35px;
-  min-height: 28px;
   color: #4c4c4c;
 }
+.openerp .oe_view_nocontent .oe_view_nocontent_create:before {
+  content: "";
+  display: inline-block;
+  position: absolute;
+  width: 70px;
+  height: 80px;
+  margin-left: -70px;
+  margin-top: -50px;
+  background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 0px 0px;
+}
 .openerp .oe_view_nocontent > p {
-  padding-left: 95px;
+  padding-left: 78px;
 }
 .openerp .oe_view_nocontent .oe_empty_custom_dashboard {
   background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0;
@@ -2134,7 +2142,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkgreen;
+  color: darkGreen;
   vertical-align: top;
   position: relative;
   top: -4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 442c9d5e026..2bc13dc26c9 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1164,41 +1164,41 @@ $sheet-padding: 16px
     // List pager {{{
     .oe_list_pager
         line-height: 26px
-        .oe_pager_value
-            float: left
-            margin-right: 8px
-        ul.oe_pager_group
+    .oe_pager_value
+        float: left
+        margin-right: 8px
+    ul.oe_pager_group
+        padding: 0
+        margin: 0
+    .oe_pager_group
+        float: left
+        height: 24px
+        line-height: 24px
+        display: inline-block
+        border: 1px solid #ababab
+        cursor: pointer
+        @include radius(5px)
+        li
+            height: 24px
+            line-height: 24px
             padding: 0
             margin: 0
-        .oe_pager_group
+            list-style-type: none
             float: left
-            height: 24px
-            line-height: 24px
-            display: inline-block
-            border: 1px solid #ababab
-            cursor: pointer
-            @include radius(5px)
-            li
-                height: 24px
-                line-height: 24px
-                padding: 0
-                margin: 0
-                list-style-type: none
-                float: left
-                border-right: 1px solid #ababab
-                &:last-child
-                    border: none
+            border-right: 1px solid #ababab
+            &:last-child
+                border: none
+        a
+            color: #4c4c4c
+            padding: 0 8px
+            &:hover
+                text-decoration: none
+        .active
+            background: #999
+            @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
             a
-                color: #4c4c4c
-                padding: 0 8px
-                &:hover
-                    text-decoration: none
-            .active
-                background: #999
-                @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
-                a
-                    color: #fff
-                    text-shadow: 0 1px 2px rgba(0,0,0,0.4)
+                color: #fff
+                text-shadow: 0 1px 2px rgba(0,0,0,0.4)
     .oe_list_pager.oe_list_pager_single_page .oe_pager_group
         display: none
     // }}}
@@ -1536,13 +1536,20 @@ $sheet-padding: 16px
         font-size: 125%
         max-width: 700px
         .oe_view_nocontent_create
-            background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 7px 0
             margin-top: 0
             padding-top: 35px
-            min-height: 28px
             color: #4c4c4c
+            &:before
+                content: ""
+                display: inline-block
+                position: absolute
+                width: 70px
+                height: 80px
+                margin-left: -70px
+                margin-top: -50px
+                background: transparent url(/web/static/src/img/view_empty_arrow.png) no-repeat 0px 0px
         > p
-            padding-left: 95px
+            padding-left: 78px
         .oe_empty_custom_dashboard
             background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0
             margin-top: -15px