From 52a7476bb17d044f52a815d7202ae9027ec3cd94 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 25 Jun 2012 21:52:25 +0200 Subject: [PATCH] [ADD] Added oe_highlight_on_dirty bzr revid: fme@openerp.com-20120625195225-ehts5hyuscmpxeyy --- addons/web/static/src/css/base.css | 36 +++++++++++++-------------- addons/web/static/src/css/base.sass | 16 ++++++------ addons/web/static/src/js/view_form.js | 9 +++---- addons/web/static/src/xml/base.xml | 2 +- 4 files changed, 30 insertions(+), 33 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 351a3366651..c461a54f5b1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -261,6 +261,24 @@ -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } +.openerp .oe_form_dirty .oe_highlight_on_dirty { + color: white; + background: #dc5f59; + background-color: #dc5f59; + background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); + background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); + background-image: -moz-linear-gradient(top, #dc5f59, #b33630); + background-image: -ms-linear-gradient(top, #dc5f59, #b33630); + background-image: -o-linear-gradient(top, #dc5f59, #b33630); + background-image: linear-gradient(to bottom, #dc5f59, #b33630); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + font-weight: bold; +} +.openerp .oe_form_dirty .oe_highlight_on_dirty:hover { + background: #ed6f6a; +} .openerp .oe_title { width: 55%; } @@ -1508,24 +1526,6 @@ background-color: #ff6666 !important; border: 1px solid #dd0000 !important; } -.openerp .oe_form_button_save_dirty { - color: white; - background: #dc5f59; - background-color: #dc5f59; - background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); - background-image: -moz-linear-gradient(top, #dc5f59, #b33630); - background-image: -ms-linear-gradient(top, #dc5f59, #b33630); - background-image: -o-linear-gradient(top, #dc5f59, #b33630); - background-image: linear-gradient(to bottom, #dc5f59, #b33630); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; - font-weight: bold; -} -.openerp .oe_form_button_save_dirty:hover { - background: #ed6f6a; -} .openerp .oe_form_editable .oe_highlight { color: #404040; background: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2ce5cf5a8d5..bcea93cc9ee 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -232,6 +232,14 @@ $colour4: #8a89ba @include vertical-gradient(#DF6B66, #BF3A33) //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_form_dirty .oe_highlight_on_dirty + color: white + background: #dc5f59 + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) + font-weight: bold + &:hover + background: #ED6F6A .oe_title width: 55% .oe_title:after @@ -1205,14 +1213,6 @@ $colour4: #8a89ba input, select, textarea background-color: #F66 !important border: 1px solid #D00 !important - .oe_form_button_save_dirty - color: white - background: #dc5f59 - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - font-weight: bold - &:hover - background: #ED6F6A .oe_form_editable .oe_highlight color: #404040 diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c6295ea7298..8f8122c4438 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -247,13 +247,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } if (this.$buttons) { this.$buttons.show(); - this.$buttons.find('.oe_form_button_save').removeClass('oe_form_button_save_dirty'); } if (this.$pager) { this.$pager.show(); } this.$element.show().css('visibility', 'hidden'); - this.$element.removeClass('oe_form_dirty'); + this.$element.add(this.$buttons).removeClass('oe_form_dirty'); return this.has_been_loaded.pipe(function() { var result; if (self.dataset.index === null) { @@ -329,16 +328,14 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (record.id) { self.do_push_state({id:record.id}); } - self.$element.removeClass('oe_form_dirty'); - self.$buttons.find('.oe_form_button_save').removeClass('oe_form_button_save_dirty'); + self.$element.add(self.$buttons).removeClass('oe_form_dirty'); }); }, on_form_changed: function() { this.trigger("view_content_has_changed"); }, do_notify_change: function() { - this.$element.addClass('oe_form_dirty'); - this.$buttons.find('.oe_form_button_save').addClass('oe_form_button_save_dirty'); + this.$element.add(this.$buttons).addClass('oe_form_dirty'); }, on_pager_action: function(action) { if (this.can_be_discarded()) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e709f56b801..c0463260405 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -684,7 +684,7 @@ - or Discard + or Discard