diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py index 0c0c106e8f3..90d852b47f6 100644 --- a/addons/website/__openerp__.py +++ b/addons/website/__openerp__.py @@ -19,7 +19,6 @@ OpenERP Website CMS 'security/ir.model.access.csv', 'security/ir_ui_view.xml', 'views/website_templates.xml', - 'views/website.backend.xml', 'views/website_views.xml', 'views/snippets.xml', 'views/res_config.xml', diff --git a/addons/website/static/src/css/website.backend.css b/addons/website/static/src/css/website.backend.css deleted file mode 100644 index 927b3907d6f..00000000000 --- a/addons/website/static/src/css/website.backend.css +++ /dev/null @@ -1,6 +0,0 @@ -.oe_button_box .oe_stat_button .o_stat_info:not(.published) > .o_stat_text.oe_publish { - display: none; -} -.oe_button_box .oe_stat_button .o_stat_info.published > .o_stat_text.oe_unpublish { - display: none; -} \ No newline at end of file diff --git a/addons/website/static/src/js/website.backend.js b/addons/website/static/src/js/website.backend.js index f877c0e90fc..7a3b6a6e580 100644 --- a/addons/website/static/src/js/website.backend.js +++ b/addons/website/static/src/js/website.backend.js @@ -3,15 +3,28 @@ odoo.define('website.backend', function (require) { var core = require('web.core'); var form_common = require('web.form_common'); -var form_widgets = require('web.form_widgets'); // required to guarantee that - // the overrride of fieldtexthtml works +var form_widgets = require('web.form_widgets'); // required to guarantee + // that the overrride of fieldtexthtml works +var _t = core._t; var WidgetWebsiteButton = form_common.AbstractField.extend({ template: 'WidgetWebsiteButton', render_value: function() { - this._super(); - this.$el.toggleClass("published", this.get_value() === true); - if (this.node.attrs.class) { + this._super.apply(this, arguments); + + var $value = this.$('.o_value'); + + if(this.get_value() === true) { + $value.html(_t('Published')) + .removeClass('text-danger') + .addClass('text-success'); + } else { + $value.html(_t('Not Published')) + .removeClass('text-success') + .addClass('text-danger'); + } + + if(this.node.attrs.class) { this.$el.addClass(this.node.attrs.class); } }, diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml index 76194c11534..b1e060fd6c5 100644 --- a/addons/website/static/src/xml/website.backend.xml +++ b/addons/website/static/src/xml/website.backend.xml @@ -1,10 +1,7 @@ -
- Not Published - Published + On Website
-
diff --git a/addons/website/views/website.backend.xml b/addons/website/views/website.backend.xml deleted file mode 100644 index 1e10a49dfa7..00000000000 --- a/addons/website/views/website.backend.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 752e8bb00e0..ee843f0f948 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -26,7 +26,6 @@