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

[MERGE]with main branch 

bzr revid: jpr@tinyerp.com-20140415115018-d66hy1gjljty8i8x
This commit is contained in:
Jitendra Prajapati (OpenERP) 2014-04-15 17:20:18 +05:30
parent 3b1b426e0b 1c5ed2973e
commit 2d4197611e
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/product_email_template/views/email_template_view.xml
View File

@ -12,8 +12,7 @@
<field name="name" invisible="1"/>
<field name="model" invisible="1"/>
<h3 colspan="2">Body</h3>
<field name="body_html" nolabel="1" colspan="2"
placeholder="Rich-text/HTML content of the message (placeholders may be used here)"/>
<field name="body_html" nolabel="1" colspan="2" widget='text' />
<field name="attachment_ids" nolabel="1" colspan="2"
widget="many2many_binary"/>
</group>

16
addons/website/static/src/js/website.tour.banner.js
View File

@ -45,13 +45,23 @@
content: _t("Drag the Banner block and drop it in your page."),
popover: { fixed: true },
},
{
{
waitFor: '.oe_overlay_options .oe_options:visible',
element: '#wrap .carousel:first .carousel-caption > div',
element: '#wrap .carousel:first div.carousel-content',
placement: 'top',
title: _t("Customize banner's text"),
content: _t("Click in the text and start editing it."),
popover: { next: _t("Continue") },
sampleText: 'Here, a customized text',
},
{
waitNot: '#wrap .carousel:first div.carousel-content:has(h2:'+
'containsExact('+_t('Your Banner Title')+')):has(h3:'+
'containsExact('+_t('Click to customize this text')+'))',
element: '.oe_snippet_parent:visible',
placement: 'bottom',
title: _t("Get banner properties"),
content: _t("Select the parent container to get the global options of the banner."),
popover: { fixed: true },
},
{
element: '.oe_overlay_options .oe_options:visible',

31
addons/website/static/src/js/website.tour.js
View File

@ -422,7 +422,22 @@ website.Tour = openerp.Class.extend({
self.autoDragAndDropSnippet($element);
} else if (step.sampleText) {
} else if ($element.is(":visible")) {
$element.trigger($.Event("mouseenter", { srcElement: $element[0] }));
$element.trigger($.Event("mousedown", { srcElement: $element[0] }));
var evt = document.createEvent("MouseEvents");
evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
$element[0].dispatchEvent(evt);
// trigger after for step like: mouseenter, next step click on button display with mouseenter
setTimeout(function () {
$element.trigger($.Event("mouseup", { srcElement: $element[0] }));
$element.trigger($.Event("mouseleave", { srcElement: $element[0] }));
}, 1000);
}
if (step.sampleText) {
$element.trigger($.Event("keydown", { srcElement: $element }));
if ($element.is("input") ) {
@ -438,20 +453,6 @@ website.Tour = openerp.Class.extend({
$element.trigger($.Event("change", { srcElement: $element }));
}, self.defaultDelay<<1);
} else if ($element.is(":visible")) {
$element.trigger($.Event("mouseenter", { srcElement: $element[0] }));
$element.trigger($.Event("mousedown", { srcElement: $element[0] }));
var evt = document.createEvent("MouseEvents");
evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
$element[0].dispatchEvent(evt);
// trigger after for step like: mouseenter, next step click on button display with mouseenter
setTimeout(function () {
$element.trigger($.Event("mouseup", { srcElement: $element[0] }));
$element.trigger($.Event("mouseleave", { srcElement: $element[0] }));
}, 1000);
}
}
self.testtimer = setTimeout(autoStep, 100);