diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 36d26d10741..1a7e30b5a84 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -386,8 +386,11 @@ visibility: hidden; } .openerp .oe_button_box { - width: 200px; - text-align: center; + width: 38%; + text-align: right; +} +.openerp .oe_button_box button { + margin: 4px; } .openerp .oe_avatar { margin: 0 16px 0 0; @@ -536,7 +539,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #888888; + color: #404040; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -545,7 +548,8 @@ .openerp .oe_dropdown_menu { display: none; position: absolute; - top: 32px; + top: 26px; + left: 0; z-index: 1; border: 1px solid #afafb6; background: white; @@ -1857,7 +1861,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 120px; + min-width: 110px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; @@ -1929,9 +1933,10 @@ } .openerp .oe_form .oe_form_field_char input, .openerp .oe_form .oe_form_field_url input, +.openerp .oe_form .oe_form_field_email input, .openerp .oe_form .oe_form_field_text textarea, .openerp .oe_form .oe_form_field_selection select { - width: inherit; + width: 100%; } .openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea { width: 500px; @@ -2001,15 +2006,6 @@ -webkit-border-radius: 0px; border-radius: 0px; } -.openerp .oe_form .oe_form_field_many2one input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_url input { - border-right: none; - -webkit-border-top-right-radius: 0px; - -webkit-border-bottom-right-radius: 0px; - -moz-border-radius-topright: 0px; - -moz-border-radius-bottomright: 0px; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; -} .openerp .oe_form .oe_form_field_url button img { vertical-align: top; } @@ -2073,10 +2069,19 @@ right: 5px; top: 3px; } -.openerp .oe_form .oe_form_field_with_button input { - width: 100%; +.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button { + display: none; } -.openerp .oe_form .oe_form_field_with_button > .oe_button { +.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input { + border-right: none; + -webkit-border-top-right-radius: 0px; + -webkit-border-bottom-right-radius: 0px; + -moz-border-radius-topright: 0px; + -moz-border-radius-bottomright: 0px; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; +} +.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button { float: right; -moz-border-radius: 0; -webkit-border-radius: 0; @@ -2084,6 +2089,9 @@ border-bottom-left-radius: 0px; height: 22px; } +.openerp .oe_form .oe_form_field_with_button input { + width: 100%; +} .openerp .oe_form .oe_form_field_with_button > div { position: relative; overflow: hidden; @@ -2138,8 +2146,8 @@ } .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button { position: absolute; - top: 3px; - right: 2px; + top: 1px; + right: 0px; } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; @@ -2353,3 +2361,9 @@ .kitten-mode-activated > * { opacity: 0.7; } + +div.ui-widget-overlay { + background: black; + filter: alpha(opacity=30); + opacity: 0.3; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2ba3b79c411..559125aa3c3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -330,8 +330,10 @@ $sheet-max-width: 860px clear: both visibility: hidden .oe_button_box - width: 200px - text-align: center + width: 38% + text-align: right + button + margin: 4px .oe_avatar margin: 0 16px 0 0 img @@ -432,14 +434,15 @@ $sheet-max-width: 860px position: relative cursor: pointer .oe_dropdown_toggle - color: #888 + color: #404040 font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block .oe_dropdown_menu display: none position: absolute - top: 32px + top: 26px + left: 0 z-index: 1 border: 1px solid #afafb6 background: white @@ -1449,7 +1452,7 @@ $sheet-max-width: 860px label line-height: 18px display: block - min-width: 120px + min-width: 110px td.oe_form_group_cell + .oe_form_group_cell padding-left: 6px .oe_form_group @@ -1512,9 +1515,10 @@ $sheet-max-width: 860px width: 100% .oe_form_field_char input, .oe_form_field_url input, + .oe_form_field_email input, .oe_form_field_text textarea, .oe_form_field_selection select - width: inherit + width: 100% .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea width: 500px .oe_form_field_float input @@ -1560,14 +1564,6 @@ $sheet-max-width: 860px padding-left: 8px @include box-shadow(none) @include radius(0px) - .oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url input - border-right: none - -webkit-border-top-right-radius: 0px - -webkit-border-bottom-right-radius: 0px - -moz-border-radius-topright: 0px - -moz-border-radius-bottomright: 0px - border-top-right-radius: 0px - border-bottom-right-radius: 0px .oe_form_field_url button img vertical-align: top .oe_form_field_date, @@ -1618,14 +1614,25 @@ $sheet-max-width: 860px filter: alpha(opacity=50) right: 5px top: 3px - .oe_form_field_with_button + .oe_form_field_with_button.oe_no_button > .oe_button + display: none + .oe_form_field_with_button:not(.oe_no_button) input - width: 100% + border-right: none + -webkit-border-top-right-radius: 0px + -webkit-border-bottom-right-radius: 0px + -moz-border-radius-topright: 0px + -moz-border-radius-bottomright: 0px + border-top-right-radius: 0px + border-bottom-right-radius: 0px > .oe_button float: right @include radius(0) border-bottom-left-radius: 0px height: 22px + .oe_form_field_with_button + input + width: 100% > div position: relative overflow: hidden @@ -1680,8 +1687,8 @@ $sheet-max-width: 860px position: relative span.oe_m2o_drop_down_button position: absolute - top: 3px - right: 2px + top: 1px + right: 0px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager @@ -1855,5 +1862,8 @@ $sheet-max-width: 860px opacity: 0.70 // }}} +div.ui-widget-overlay + background: black + @include opacity(0.3) // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c82bf528491..e38cffcfffd 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2667,11 +2667,12 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc }); // some behavior for input - this.$input.keyup(function() { + this.$input.keydown(function() { if (self.current_display !== self.$input.val()) { self.current_display = self.$input.val(); if (self.$input.val() === "") { self.set({value: false}); + self.floating = false; } else { self.floating = true; } diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 98df8a0af0d..6586807264d 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -146,7 +146,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ this.dialog.dialog_title = action.name; this.dialog_viewmanager = new instance.web.ViewManagerAction(this.dialog, action); this.dialog_viewmanager.appendTo(this.dialog.$element); - this.dialog_viewmanager.$element.addClass("oe_view_manager_" + action.target); + this.dialog_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current')); this.dialog.open(); } else { this.dialog_stop(); @@ -159,7 +159,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ this.inner_action = action; this.inner_viewmanager = new instance.web.ViewManagerAction(this, action); this.inner_viewmanager.appendTo(this.$element); - this.inner_viewmanager.$element.addClass("oe_view_manager_" + action.target); + this.inner_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current')); } }, ir_actions_act_window_close: function (action, on_closed) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 29a7a61aa30..a8d7a061a81 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -863,7 +863,7 @@ - + - +
@@ -893,14 +893,9 @@ this.removeClass('oe_form_field_email').addClass('oe_form_field_url'); - - - -
+
@@ -982,7 +977,7 @@ - +
@@ -994,7 +989,7 @@
- + - + -