[MERGE] from trunk
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
This commit is contained in:
commit
74a6bde093
|
@ -3,9 +3,8 @@
|
|||
|
||||
var website = openerp.website;
|
||||
var _t = openerp._t;
|
||||
website.is_editable = true;
|
||||
website.is_editable_button = true;
|
||||
|
||||
|
||||
website.EditorBar.include({
|
||||
start: function() {
|
||||
var res = this._super();
|
||||
|
@ -56,4 +55,4 @@
|
|||
}
|
||||
}),
|
||||
});
|
||||
})();
|
||||
})();
|
||||
|
|
|
@ -3,7 +3,9 @@
|
|||
|
||||
var website = {};
|
||||
openerp.website = website;
|
||||
openerp.website.translatable = !!$('html').data('translatable');
|
||||
|
||||
website.translatable = !!$('html').data('translatable');
|
||||
website.is_editable = !!$('html').data('editable');
|
||||
|
||||
/* ----------------------------------------------------
|
||||
Helpers
|
||||
|
@ -244,11 +246,13 @@
|
|||
return def;
|
||||
});
|
||||
};
|
||||
website.add_template_file('/website/static/src/xml/website.xml');
|
||||
|
||||
if (website.is_editable) {
|
||||
website.add_template_file('/website/static/src/xml/website.xml');
|
||||
}
|
||||
|
||||
website.dom_ready = $.Deferred();
|
||||
$(document).ready(function () {
|
||||
website.is_editable = website.is_editable || $('html').data('editable');
|
||||
website.is_editable_button= website.is_editable_button || $('html').data('editable');
|
||||
website.dom_ready.resolve();
|
||||
// fix for ie
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
var _t = openerp._t;
|
||||
website.add_template_file('/website_blog/static/src/xml/website_blog.xml');
|
||||
|
||||
website.is_editable = true;
|
||||
website.EditorBar.include({
|
||||
start: function() {
|
||||
website.is_editable_button = website.is_editable_button || !!$("#wrap.js_blog").size();
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
var _t = openerp._t;
|
||||
website.add_template_file('/website_event/static/src/xml/website_event.xml');
|
||||
|
||||
website.is_editable = true;
|
||||
website.EditorBar.include({
|
||||
start: function() {
|
||||
website.is_editable_button = website.is_editable_button || !!$("#wrap.js_event").size();
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
var _t = openerp._t;
|
||||
website.add_template_file('/website_forum/static/src/xml/website_forum.xml');
|
||||
|
||||
website.is_editable = true;
|
||||
website.EditorBar.include({
|
||||
start: function() {
|
||||
website.is_editable_button = website.is_editable_button || !!$("#wrap").size();
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
var website = openerp.website;
|
||||
website.add_template_file('/website_hr_recruitment/static/src/xml/website_hr_recruitment.xml');
|
||||
|
||||
website.is_editable = true;
|
||||
website.EditorBar.include({
|
||||
start: function() {
|
||||
website.is_editable_button = website.is_editable_button || !!$("#wrap.js_hr_recruitment").size();
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
var _t = openerp._t;
|
||||
website.add_template_file('/website_sale/static/src/xml/website_sale.xml');
|
||||
|
||||
website.is_editable = true;
|
||||
website.EditorBar.include({
|
||||
start: function() {
|
||||
website.is_editable_button = website.is_editable_button || !!$("#wrap.js_sale").size();
|
||||
|
|
Loading…
Reference in New Issue