From 2b5cf63ed78114d959ca647f4956422b28a0c77e Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 2 Jul 2013 19:16:14 +0200 Subject: [PATCH] m bzr revid: al@openerp.com-20130702171614-opy0xy7l1h3r330u --- addons/website/static/src/js/website.js | 7 +++-- addons/website/static/src/xml/website.xml | 37 ++++++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 73943f10171..85c1a9c5f9f 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -3,13 +3,17 @@ openerp.website = function(instance) { instance.website.EditorBar = instance.web.Widget.extend({ template: 'Website.EditorBar', events: { + 'click button[data-action=edit]': 'edit', 'click button[data-action=save]': 'save', 'click button[data-action=cancel]': 'cancel', }, container: 'body', start: function() { var self = this; - var r = this._super.apply(this, arguments); + return this._super.apply(this, arguments); + }, + edit: function () { + var self = this; Aloha.ready(function() { Aloha.jQuery('[data-oe-model]').aloha(); //.attr('contentEditable', 'true').addClass('oe_editable'); self.$('button').prop('disabled', true); @@ -23,7 +27,6 @@ instance.website.EditorBar = instance.web.Widget.extend({ } }); }); - return r; }, save: function () { var self = this; diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index a58e21de44c..5f68cba48d6 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -3,10 +3,45 @@ --> + + OK + + + + +
    -
  • OpenERP Website Editor
  • +
  • YESSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS OpenERP Website Editor
  • +