summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2013-04-05 17:21:31 +0200
committerThibault Delavallée <tde@openerp.com>2013-04-05 17:21:31 +0200
commitaaed0ccd43b4697e35c9362fe18796685102d9ce (patch)
tree31a3e7c20f8e649bb1f412ac2444245bcd0076a2 /addons/web/static/src
parent1fe0a9afe9cf2fc9d245069e4700b0b1dcdd4c51 (diff)
parent6bdd041c61d7c77d6f3f556cec63cd280fe63ac8 (diff)
[MERGE] Alias Visibility and Salesteams View. Improve the display of alias in form views and in empty list help messages. Improve the use, visibility and display of salesteams.
Add support for 'no result' help message in kanban views. Add css for empty list in kanban views + generic display of mail aliases. bzr revid: tde@openerp.com-20130405152131-4auticfaj24wbpqx
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/css/base.css5
-rw-r--r--addons/web/static/src/css/base.sass5
-rw-r--r--addons/web/static/src/js/views.js4
3 files changed, 12 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ee3f96a53dd..a6fd8da472c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2105,6 +2105,9 @@
.openerp .oe_form_invisible {
display: none !important;
}
+.openerp .oe_form_editable .oe_read_only {
+ display: none !important;
+}
.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
display: none !important;
}
@@ -2401,6 +2404,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;
@@ -2415,6 +2419,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;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 37de16e5c9b..b79580d8225 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1681,6 +1681,9 @@ $sheet-padding: 16px
@include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset))
.oe_form_invisible
display: none !important
+ .oe_form_editable
+ .oe_read_only
+ display: none !important
.oe_form_readonly
.oe_edit_only, .oe_form_field:empty
display: none !important
@@ -1901,6 +1904,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
@@ -1909,6 +1913,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 5df048d8b7a..1143bdfc2af 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1364,7 +1364,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 {
@@ -1452,7 +1452,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;
- }
+ },
});
/**