Merge lp:~openerp-dev/openerp-web/7.0-res-users-infobox-fme into lp:openerp-web/7.0

[Fabien Meghazi (OpenERP)]

Improve res.users form view in auth_signup

[lp:~openerp-dev/openerp-web/7.0-res-users-infobox-fme]

3844. By Fabien Meghazi (OpenERP) on 2013-03-14

[IMP] Improved box_info box_warning css

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-03-11 21:23:53 +0000
+++ addons/web/static/src/css/base.css	2013-03-14 22:28:22 +0000
@@ -355,6 +355,12 @@
   float: right;
   margin-left: 8px;
 }
+.openerp .oe_text_center {
+  text-align: center;
+}
+.openerp .oe_text_left {
+  text-align: left;
+}
 .openerp .oe_text_right {
   text-align: right;
 }
@@ -2228,6 +2234,26 @@
 .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
   font-weight: normal;
 }
+.openerp .oe_form .oe_form_box_info {
+  background: #ffee99;
+  border-bottom: 1px solid #ccbb66;
+  padding: 4px;
+}
+.openerp .oe_form .oe_form_box_info > p {
+  margin: auto;
+}
+.openerp .oe_form .oe_form_box_warning {
+  background: #bd362f;
+  border-bottom: 1px solid #990000;
+  padding: 4px;
+}
+.openerp .oe_form .oe_form_box_warning * {
+  color: white;
+  text-shadow: none;
+}
+.openerp .oe_form .oe_form_box_warning > p {
+  margin: auto;
+}
 .openerp .oe_form .oe_form_button {
   margin: 2px;
 }

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-03-11 21:23:53 +0000
+++ addons/web/static/src/css/base.sass	2013-03-14 22:28:22 +0000
@@ -370,6 +370,10 @@
     .oe_right
         float: right
         margin-left: 8px
+    .oe_text_center
+        text-align: center
+    .oe_text_left
+        text-align: left
     .oe_text_right
         text-align: right
     .oe_clear
@@ -1760,7 +1764,21 @@
                 padding: 2px 11px 2px 0px !important
             label.oe_form_label_help
                 font-weight: normal
-
+        .oe_form_box_info
+            background: #fe9
+            border-bottom: 1px solid #cb6
+            padding: 4px
+            > p
+                margin: auto
+        .oe_form_box_warning
+            background: #bd362f
+            border-bottom: 1px solid #900
+            padding: 4px
+            *
+                color: white
+                text-shadow: none
+            > p
+                margin: auto
     // }}}
     // FormView.group {{{
     .oe_form

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-03-14 13:51:41 +0000
+++ addons/web/static/src/js/view_form.js	2013-03-14 22:28:22 +0000
@@ -2357,7 +2357,8 @@
             if (!s) {
                 tmp = "http://" + this.get('value');
             }
-            this.$el.find('a').attr('href', tmp).text(this.get('value') ? tmp : '');
+            var text = this.get('value') ? this.node.attrs.text || tmp : '';
+            this.$el.find('a').attr('href', tmp).text(text);
         }
     },
     on_button_clicked: function() {