Merge branch 'server-trunk'

Conflicts:
	addons/mass_mailing/controllers/main.py

8 files changed, 4 insertions, 166 deletions

diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index e0a8ab041fe..e96cc910920 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -48,8 +48,6 @@ professional emails and reuse templates in a few clicks.
         'views/res_config.xml',
         'views/res_partner.xml',
         'views/email_template.xml',
-        'views/website_mass_mailing.xml',
-        'views/snippets.xml',
         'security/ir.model.access.csv',
         'views/mass_mailing.xml',
     ],
diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml
index 7137bfcf29b..6bd1df79a72 100644
--- a/addons/mass_mailing/data/mass_mailing_data.xml
+++ b/addons/mass_mailing/data/mass_mailing_data.xml
@@ -33,10 +33,5 @@
             <field name="sequence">30</field>
         </record>
 
-        <!-- Create mailing lists -->
-        <record id="mass_mail_list_1" model="mail.mass_mailing.list">
-            <field name="name">Newsletter</field>
-        </record>
-
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index d5a84419f93..569feec9c88 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -9,7 +9,7 @@
         </record>
 
         <!-- Create mailing lists -->
-        <record id="mass_mail_list_2" model="mail.mass_mailing.list">
+        <record id="mass_mail_list_1" model="mail.mass_mailing.list">
             <field name="name">Imported Contacts</field>
         </record>
 
@@ -17,17 +17,17 @@
         <record id="mass_mail_contact_1" model="mail.mass_mailing.contact">
             <field name="name">Aristide Antario</field>
             <field name="email">aa@example.com</field>
-            <field name="list_id" ref="mass_mailing.mass_mail_list_2"/>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
         </record>
         <record id="mass_mail_contact_2" model="mail.mass_mailing.contact">
             <field name="name">Beverly Bridge</field>
             <field name="email">bb@example.com</field>
-            <field name="list_id" ref="mass_mailing.mass_mail_list_2"/>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
         </record>
         <record id="mass_mail_contact_3" model="mail.mass_mailing.contact">
             <field name="name">Carol Cartridge</field>
             <field name="email">cc@example.com</field>
-            <field name="list_id" ref="mass_mailing.mass_mail_list_2"/>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
             <field name="opt_out" eval="True"/>
         </record>
 
diff --git a/addons/mass_mailing/static/src/img/blocks/button_newsletter.png b/addons/mass_mailing/static/src/img/blocks/button_newsletter.png
deleted file mode 100644
index 46a63ef9b00..00000000000
--- a/addons/mass_mailing/static/src/img/blocks/button_newsletter.png
+++ /dev/null
diff --git a/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js b/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js
deleted file mode 100644
index 4caba1d29b5..00000000000
--- a/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(function () {
-    'use strict';
-
-    var website = openerp.website;
-    var _t = openerp._t;
-
-    website.snippet.options.mailing_list_subscribe = website.snippet.Option.extend({
-        on_prompt: function () {
-            var self = this;
-            return website.prompt({
-                id: "editor_new_mailing_list_subscribe_button",
-                window_title: _t("Add a Newsletter Subscribe Button"),
-                select: _t("Newsletter"),
-                init: function (field) {
-                    return website.session.model('mail.mass_mailing.list')
-                            .call('name_search', ['', []], { context: website.get_context() });
-                },
-            }).then(function (mailing_list_id) {
-                self.$target.attr("data-list-id", mailing_list_id);
-            });
-        },
-        drop_and_build_snippet: function() {
-            var self = this;
-            this._super();
-            this.on_prompt().fail(function () {
-                self.editor.on_remove();
-            });
-        },
-        start : function () {
-            var self = this;
-            this.$el.find(".js_mailing_list").on("click", _.bind(this.on_prompt, this));
-            this._super();
-        },
-        clean_for_save: function () {
-            this.$target.addClass("hidden");
-        },
-    });
-})();
-
-
diff --git a/addons/mass_mailing/static/src/js/website_mass_mailing.js b/addons/mass_mailing/static/src/js/website_mass_mailing.js
deleted file mode 100644
index 5776fadfb3f..00000000000
--- a/addons/mass_mailing/static/src/js/website_mass_mailing.js
+++ /dev/null
@@ -1,57 +0,0 @@
-(function () {
-    'use strict';
-
-    var website = openerp.website;
-
-    website.snippet.animationRegistry.subscribe = website.snippet.Animation.extend({
-        selector: ".js_subscribe",
-        start: function (editable_mode) {
-            var self = this;
-
-            // set value and display button
-            self.$target.find("input").removeClass("hidden");
-            openerp.jsonRpc('/website_mass_mailing/is_subscriber', 'call', {
-                list_id: this.$target.data('list-id'),
-            }).always(function (data) {
-                self.$target.find('input.js_subscribe_email')
-                    .val(data.email ? data.email : "")
-                    .attr("disabled", data.is_subscriber && data.email.length ? "disabled" : false);
-                self.$target.attr("data-subscribe", data.is_subscriber ? 'on' : 'off');
-                self.$target.find('a.js_subscribe_btn')
-                    .val(data.email ? data.email : "")
-                    .attr("disabled", data.is_subscriber && data.email.length ? "disabled" : false);
-                self.$target.removeClass("hidden");
-            });
-
-            // not if editable mode to allow designer to edit alert field
-            if (!editable_mode) {
-                $('.js_subscribe > .alert').addClass("hidden");
-                $('.js_subscribe > .input-group-btn.hidden').removeClass("hidden");
-                this.$target.find('.js_subscribe_btn').on('click', function (event) {
-                    event.preventDefault();
-                    self.on_click();
-                });
-            }
-        },
-        on_click: function () {
-            var self = this;
-            var $email = this.$target.find(".js_subscribe_email:visible");
-
-            if ($email.length && !$email.val().match(/.+@.+/)) {
-                this.$target.addClass('has-error');
-                return false;
-            }
-            this.$target.removeClass('has-error');
-
-            openerp.jsonRpc('/website_mass_mailing/subscribe', 'call', {
-                'list_id': this.$target.data('list-id'),
-                'email': $email.length ? $email.val() : false,
-            }).then(function (subscribe) {
-                self.$target.find(".js_subscribe_email, .input-group-btn").addClass("hidden");
-                self.$target.find(".alert").removeClass("hidden");
-                self.$target.find('input.js_subscribe_email').attr("disabled", subscribe ? "disabled" : false);
-                self.$target.attr("data-subscribe", subscribe ? 'on' : 'off');
-            });
-        },
-    });
-})();
diff --git a/addons/mass_mailing/views/snippets.xml b/addons/mass_mailing/views/snippets.xml
deleted file mode 100644
index cefe2e7bdfd..00000000000
--- a/addons/mass_mailing/views/snippets.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-<template id="mailing_list_subscribe" inherit_id="website.snippets" name="Subscribe to Newsletter">
-
-    <xpath expr="//div[@id='snippet_content']" 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>
-                </span>
-                <div class="alert alert-success hidden">Thanks for your subscription!</div>
-            </div>
-
-        </div>
-    </xpath>
-
-    <xpath expr="//div[@id='snippet_options']" position="inside">
-        <div data-snippet-option-id='mailing_list_subscribe'
-            data-selector=".js_subscribe"
-            data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
-           >
-            <li>
-                <a href="#" class="button js_mailing_list">Change Newsletter</a>
-            </li>
-        </div>
-    </xpath>
-
-</template>
-
-</data>
-</openerp>
diff --git a/addons/mass_mailing/views/website_mass_mailing.xml b/addons/mass_mailing/views/website_mass_mailing.xml
deleted file mode 100644
index bc55f61400c..00000000000
--- a/addons/mass_mailing/views/website_mass_mailing.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-<template id="head" inherit_id="website.layout" name="Mail customization">
-    <xpath expr="//head" position="inside">
-        <script type="text/javascript" src="/mass_mailing/static/src/js/website_mass_mailing.editor.js" groups="base.group_website_publisher"></script>
-        <script type="text/javascript" src="/mass_mailing/static/src/js/website_mass_mailing.js"></script>
-        <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
-    </xpath>
-</template>
-
-</data>
-</openerp>