Skip to content
Snippets Groups Projects
Commit 1142a56b authored by qsm-odoo's avatar qsm-odoo
Browse files

[FIX] website_mass_mailing: restore missing image files + snippets ref 

Commit 9676ceec removed/replaced image files in mass_mailing
module but two of them were still used by website_mass_mailing.

This commits adds these two images in website_mass_mailing module and
use a more standard convention to define associated snippets and
link them in the snippet panel. Also lint JS files.
parent b460d77d
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 66 additions and 86 deletions
addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_form.png 0 → 100644
+ 0
− 0
View file @ 1142a56b
addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_form.png

4.08 KiB

addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_popup.png 0 → 100644
+ 0
− 0
View file @ 1142a56b
addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_popup.png

5.84 KiB

addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js
+ 15
− 16
View file @ 1142a56b
......@@ -51,17 +51,17 @@ options.registry.newsletter_popup = mass_mailing_common.extend({
var self = this;
if (type !== "click") return;
return this._super(type, value).then(function (mailing_list_id) {
ajax.jsonRpc('/web/dataset/call', 'call', {
model: 'mail.mass_mailing.list',
method: 'read',
args: [[parseInt(mailing_list_id)], ['popup_content'], base.get_context()],
}).then(function (data) {
self.$target.find(".o_popup_content_dev").empty();
if (data && data[0].popup_content) {
$(data[0].popup_content).appendTo(self.$target.find(".o_popup_content_dev"));
}
});
ajax.jsonRpc('/web/dataset/call', 'call', {
model: 'mail.mass_mailing.list',
method: 'read',
args: [[parseInt(mailing_list_id)], ['popup_content'], base.get_context()],
}).then(function (data) {
self.$target.find(".o_popup_content_dev").empty();
if (data && data[0].popup_content) {
$(data[0].popup_content).appendTo(self.$target.find(".o_popup_content_dev"));
}
});
});
},
});
......@@ -84,9 +84,11 @@ web_editor.Class.include({
ajax.jsonRpc('/web/dataset/call', 'call', {
model: 'mail.mass_mailing.list',
method: 'write',
args: [parseInt(newsletter_id),
{'popup_content':content},
base.get_context()],
args: [
parseInt(newsletter_id),
{'popup_content':content},
base.get_context()
],
});
}
return this._super();
......@@ -97,7 +99,4 @@ web_editor.Class.include({
$('.modal-backdrop').css("z-index", "0");
},
});
});
addons/website_mass_mailing/static/src/js/website_mass_mailing.js
+ 10
− 12
View file @ 1142a56b
......@@ -4,8 +4,7 @@ odoo.define('mass_mailing.website_integration', function (require) {
var ajax = require('web.ajax');
var utils = require('web.utils');
var animation = require('web_editor.snippets.animation');
var website = require('website.website');
require('web_editor.base');
animation.registry.subscribe = animation.Class.extend({
selector: ".js_subscribe",
......@@ -102,9 +101,11 @@ animation.registry.newsletter_popup = animation.Class.extend({
self.$target.find('#o_newsletter_popup').modal('hide');
$(document).off('mouseleave');
if (self.redirect_url) {
if (_.contains(self.redirect_url.split('/'), window.location.host) || self.redirect_url.indexOf('/')== 0) {
if (_.contains(self.redirect_url.split('/'), window.location.host) || self.redirect_url.indexOf('/') === 0) {
window.location.href = self.redirect_url;
} else { window.open(self.redirect_url, '_blank'); }
} else {
window.open(self.redirect_url, '_blank');
}
}
});
},
......@@ -119,17 +120,15 @@ animation.registry.newsletter_popup = animation.Class.extend({
}
}
});
});
odoo.define('mass_mailing.unsubscribe', function (require) {
var ajax = require('web.ajax');
require('web_editor.base'); // wait for implicit dependencies to load
var ajax = require('web.ajax');
require('web_editor.base'); // wait for implicit dependencies to load
if(!$('.o_unsubscribe_form').length) {
return $.Deferred().reject("DOM doesn't contain '.o_unsubscribe_form'");
}
if (!$('.o_unsubscribe_form').length) {
return $.Deferred().reject("DOM doesn't contain '.o_unsubscribe_form'");
}
$('#unsubscribe_form').on('submit', function(e) {
e.preventDefault();
......@@ -155,5 +154,4 @@ if(!$('.o_unsubscribe_form').length) {
$('.alert-info').html('You changes has not been saved, try again later.').removeClass('alert-info').addClass('alert-warning');
});
});
});
addons/website_mass_mailing/views/snippets_templates.xml
+ 41
− 58
View file @ 1142a56b
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="mailing_list_subscribe" inherit_id="website.snippets" name="Subscribe to Newsletter">
<xpath expr="//div[@id='snippet_content']/div[@class='o_panel_body']" position="inside">
<div>
<div class="oe_snippet_thumbnail">
<img class="oe_snippet_thumbnail_img" src="/mass_mailing/static/src/img/blocks/button_newsletter.png"/>
<span class="oe_snippet_thumbnail_title">Newsletter</span>
</div>
<div class="oe_snippet_body input-group js_subscribe"
data-list-id="0">
<input
type="email"
name="email"
class="js_subscribe_email form-control"
placeholder="your email..."/>
<span class="input-group-btn">
<a href="#" class="btn btn-primary js_subscribe_btn">Subscribe</a>
<a href="#" class="btn btn-success js_subscribed_btn hidden" disabled="disabled">Thanks</a>
</span>
<div class="alert alert-success hidden">Thanks for your subscription!</div>
</div>
</div>
<template id="snippets" inherit_id="website.snippets">
<xpath expr="//div[@id='snippet_feature']/div[@class='o_panel_body']" position="inside">
<t groups="website_mass_mailing.group_website_popup_on_exit">
<t t-snippet="website_mass_mailing.s_newsletter_subscribe_popup" t-thumbnail="/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_popup.png"/>
</t>
</xpath>
<xpath expr="//div[@id='snippet_options']" position="inside">
<div data-js='mailing_list_subscribe'
data-selector=".js_subscribe"
data-drop-near="p, h1, h2, h3, blockquote, .well, .panel">
<li data-select_mailing_list=""><a>Change Newsletter</a></li>
</div>
<xpath expr="//div[@id='snippet_content']/div[@class='o_panel_body']" position="inside">
<t t-snippet="website_mass_mailing.s_newsletter_subscribe_form" t-thumbnail="/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_form.png"/>
</xpath>
</template>
<template id="website_popup_snippet" name="popup snippet" inherit_id="website.snippets">
<xpath expr="//div[@id='snippet_feature']/div[@class='o_panel_body']" position="inside">
<div groups="website_mass_mailing.group_website_popup_on_exit">
<div class="oe_snippet_thumbnail">
<img class="oe_snippet_thumbnail_img" src="/mass_mailing/static/src/img/blocks/bounce.png" />
<span class="oe_snippet_thumbnail_title">Newsletter Popup</span>
</div>
<template id="s_newsletter_subscribe_form" name="Newsletter">
<div class="oe_snippet_body input-group js_subscribe" data-list-id="0">
<input type="email" name="email" class="js_subscribe_email form-control" placeholder="your email..."/>
<span class="input-group-btn">
<a href="#" class="btn btn-primary js_subscribe_btn">Subscribe</a>
<a href="#" class="btn btn-success js_subscribed_btn hidden" disabled="disabled">Thanks</a>
</span>
<div class="alert alert-success hidden">Thanks for your subscription!</div>
</div>
</template>
<div class="o_newsletter_popup" data-list-id="0">
<div class="alert alert-warning alert-dismissible fade in css_non_editable_mode_hidden o_not_editable" role="alert">
<strong>Newsletter Popup!</strong> The newsletter popup snippet effect is active on this page. Click <a id="edit_dialog" href="#">Here To Edit Dialog Content</a>
</div>
<div class="modal modal-dialog modal-md fade fade-custom" id="o_newsletter_popup" tabindex="-1" role="dialog">
<div class="modal-content o_popup_modal_content">
<a href="#" class="o_popup_btn_close o_not_editable" data-dismiss="modal">&amp;times;</a>
<template id="s_newsletter_subscribe_popup" name="Newsletter Popup">
<div class="o_newsletter_popup" data-list-id="0">
<div class="alert alert-warning alert-dismissible fade in css_non_editable_mode_hidden o_not_editable" role="alert">
<strong>Newsletter Popup!</strong> The newsletter popup snippet effect is active on this page. Click <a id="edit_dialog" href="#">Here To Edit Dialog Content</a>
</div>
<div class="modal modal-dialog modal-md fade fade-custom" id="o_newsletter_popup" tabindex="-1" role="dialog">
<div class="modal-content o_popup_modal_content">
<a href="#" class="o_popup_btn_close o_not_editable" data-dismiss="modal">&amp;times;</a>
<div class="o_popup_modal_body text-center">
<div class="o_popup_content_dev" data-oe-placeholder="Type Here ..."/>
<div class="input-group o_not_editable o_popup_animated o_popup_bounce_del500ms o_popup_bounce_small" >
<input type="email" name="email" class="popup_subscribe_email form-control" placeholder="your email..." autofocus="autofocus"/>
<span class="input-group-btn">
<a href="#" class="btn btn-success popup_subscribe_btn">Subscribe</a>
</span>
</div>
</div>
<div class="o_popup_modal_body text-center">
<div class="o_popup_content_dev" data-oe-placeholder="Type Here ..."/>
<div class="input-group o_not_editable o_popup_animated o_popup_bounce_del500ms o_popup_bounce_small" >
<input type="email" name="email" class="popup_subscribe_email form-control" placeholder="your email..." autofocus="autofocus"/>
<span class="input-group-btn">
<a href="#" class="btn btn-success popup_subscribe_btn">Subscribe</a>
</span>
</div>
</div>
</div>
</div>
</xpath>
</div>
</template>
<template id="website_popup_options" name="Popup Options" inherit_id="website.snippet_options">
<template id="newsletter_subscribe_options" name="Newsletter Subscribe Options" inherit_id="website.snippet_options">
<xpath expr="//div" position="after">
<div data-js='mailing_list_subscribe'
data-selector=".js_subscribe"
data-drop-near="p, h1, h2, h3, blockquote, .well, .panel">
<li data-select_mailing_list=""><a href="#">Change Newsletter</a></li>
</div>
<div data-js='newsletter_popup'
data-selector=".o_newsletter_popup"
data-drop-in=".oe_structure, [data-oe-type=html]">
<li data-select_mailing_list=""><a>Change Newsletter</a></li>
<li data-select_mailing_list=""><a href="#">Change Newsletter</a></li>
</div>
</xpath>
</template>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment