Merge branch 'server-trunk'

Conflicts:
	addons/mass_mailing/controllers/main.py

2 files changed, 0 insertions, 58 deletions

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>