diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-03-21 14:40:41 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-03-21 14:40:41 +0100 |
| commit | 6d52a622627770c5685532ed964c148eae859f8f (patch) | |
| tree | 1b72a65ac78aa7c5ddac51a0e80317c38a2b37fb /addons/web/static/src | |
| parent | 185b405b967c3c36dd7f8e249ea51fb9bba91378 (diff) | |
| parent | dc709078ffbaf06158e6c1d9d12e54e00bb044c3 (diff) | |
[IMP] code cleaning for get_empty_list_help
bzr revid: chm@openerp.com-20130321134041-o7iz55qlufx33qo4
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 9 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 7 | ||||
| -rw-r--r-- | addons/web/static/src/js/views.js | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index be0bb19748c..96b8a23a705 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2108,6 +2108,9 @@ .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { display: none !important; } +.openerp .oe_form_editable .oe_read_only { + display: none !important; +} .openerp .oe_form_readonly .oe_form .oe_form_field_date { width: auto; } @@ -2379,6 +2382,7 @@ background: white; min-width: 60px; color: #1f1f1f; + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; } .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] { background: #e5e5e5 !important; @@ -2393,6 +2397,7 @@ -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; + color: #4C4C4C; } .openerp .oe_form textarea.oe_inline[disabled] { border-left: 8px solid #eeeeee; @@ -3262,6 +3267,10 @@ div.ui-widget-overlay { clear: both; text-align: center; } +.openerp .oe_kanban_grouped { + position: relative; + z-index: 1; +} .openerp_ie.oe_kanban_grouped .oe_kanban_show_more .oe_button { width: 100%; padding: 3px 12px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e2c047f11e1..1e70d09e0fd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1607,6 +1607,9 @@ $sheet-padding: 16px // }}} + .oe_kanban_grouped + position: relative + z-index: 1 // Views Common {{{ .oe_view_nocontent padding: 15px @@ -1667,6 +1670,8 @@ $sheet-padding: 16px .oe_form_readonly .oe_edit_only, .oe_form_field:empty display: none !important + .oe_read_only + display: none !important .oe_form .oe_form_field_date width: auto // Sheet and padding @@ -1884,6 +1889,7 @@ $sheet-padding: 16px background: white min-width: 60px color: #1f1f1f + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled] background: #E5E5E5 !important color: #666 @@ -1892,6 +1898,7 @@ $sheet-padding: 16px padding-left: 8px @include box-shadow(none) @include radius(0px) + color: #4C4C4C textarea.oe_inline[disabled] border-left: 8px solid #eee .oe_form_field_url button img diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index befbc7fe793..757519c0f2f 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1371,7 +1371,7 @@ instance.web.View = instance.web.Widget.extend({ } else if (action_data.type=="action") { return this.rpc('/web/action/load', { action_id: action_data.name, - context: instance.web.pyeval.eval('context', context), + context: _.extend({'active_model': dataset.model, 'active_ids': dataset.ids, 'active_id': record_id}, instance.web.pyeval.eval('context', context)), do_not_eval: true }).then(handler); } else { @@ -1459,7 +1459,7 @@ instance.web.View = instance.web.Widget.extend({ is_action_enabled: function(action) { var attrs = this.fields_view.arch.attrs; return (action in attrs) ? JSON.parse(attrs[action]) : true; - } + }, }); /** |
