odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] website editor: shop tour and media editor for field image 

bzr revid: chm@openerp.com-20140331133340-vj67s9hlptum0h19
This commit is contained in:
chm@openerp.com 2014-03-31 15:33:40 +02:00
parent e81c205b18
commit e0d33ad3c5
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/website/static/src/js/website.editor.js
View File

@ -1366,6 +1366,10 @@
this.$('[href="#editor-media-icon"]').tab('show');
}
if ($(this.media.$).parent().data("oe-field") === "image") {
this.$('[href="#editor-media-video"], [href="#editor-media-icon"]').addClass('hidden');
}
return this._super();
},
save: function () {

9
addons/website/static/src/js/website.snippets.editor.js
View File

@ -1494,6 +1494,15 @@
new website.editor.MediaDialog(self, self.element).appendTo(document.body);
});
},
onFocus : function () {
var self = this;
if (this.$target.parent().data("oe-field") === "image") {
this.$overlay.addClass("hidden");
self.element = new CKEDITOR.dom.element(self.$target[0]);
new website.editor.MediaDialog(self, self.element).appendTo(document.body);
self.BuildingBlock.make_active(false);
}
},
});

30
addons/website_sale/static/src/js/website.tour.shop.js
View File

@ -66,39 +66,23 @@
},
{
waitNot: '.product_price .oe_currency_value:containsExact(1.00)',
element: '#wrap img.img:first',
element: '#wrap img.product_detail_img',
placement: 'top',
title: _t("Update image"),
content: _t("Click here to set an image describing your product."),
},
{
element: 'button.hover-edition-button:visible',
element: 'img[alt=ipad]',
placement: 'top',
title: _t("Update image"),
content: _t("Click here to set an image describing your product."),
},
{
wait: 500,
element: '.well a.pull-right',
placement: 'bottom',
title: _t("Select an Image"),
content: _t("Let's select an existing image."),
popover: { fixed: true },
content: _t("Let's select an ipad image."),
},
{
element: 'img[alt=imac]',
placement: 'bottom',
title: _t("Select an Image"),
content: _t("Let's select an imac image."),
popover: { fixed: true },
},
{
waitNot: 'img[alt=imac]',
waitFor: '.media_selected img[alt=ipad]',
element: '.modal-content button.save',
placement: 'bottom',
title: _t("Select this Image"),
content: _t("Click to add the image to the product decsription."),
popover: { fixed: true },
placement: 'top',
title: _t("Save this Image"),
content: _t("Click on save to add the image to the product decsription."),
},
{
waitNot: '.modal-content:visible',