Browse Source

Merge pull request #106 from Tecnativa/8.0-website_mail_snippet_fixed-fix_clean_before_saving

[8.0][FIX][website_mail_snippet_fixed] Clean before saving.
pull/85/head
Rafael Blasco 8 years ago
committed by GitHub
parent
commit
f2b2cab2ce
  1. 9
      website_mail_snippet_fixed/__openerp__.py
  2. 26
      website_mail_snippet_fixed/static/src/js/fixed_560px.js
  3. 16
      website_mail_snippet_fixed/views/assets.xml
  4. 8
      website_mail_snippet_fixed/views/templates.xml

9
website_mail_snippet_fixed/__openerp__.py

@ -4,10 +4,12 @@
{ {
"name": "Fixed-Width Layout Snippets for Writing Emails", "name": "Fixed-Width Layout Snippets for Writing Emails",
"summary": "560px width extra building blocks", "summary": "560px width extra building blocks",
"version": "8.0.1.0.0",
"version": "8.0.1.0.1",
"category": "Marketing", "category": "Marketing",
"website": "http://www.antiun.com",
"author": "Antiun Ingeniería S.L., Odoo Community Association (OCA)",
"website": "https://www.tecnativa.com",
"author": "Antiun Ingeniería S.L., "
"Tecnativa, "
"Odoo Community Association (OCA)",
"license": "AGPL-3", "license": "AGPL-3",
"application": False, "application": False,
"installable": True, "installable": True,
@ -18,6 +20,7 @@
"website_mail_snippet_vertical_resize_base", "website_mail_snippet_vertical_resize_base",
], ],
"data": [ "data": [
"views/assets.xml",
"views/templates.xml", "views/templates.xml",
"views/snippet_1_col.xml", "views/snippet_1_col.xml",
"views/snippet_2_cols.xml", "views/snippet_2_cols.xml",

26
website_mail_snippet_fixed/static/src/js/fixed_560px.js

@ -0,0 +1,26 @@
/* Copyright 2016 Jairo Llopis <jairo.llopis@tecnativa.com>
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
(function ($) {
"use strict";
openerp.website.snippet.options.fixed_560px =
openerp.website.snippet.Option.extend({
// Remove attributes added by Odoo at drop time, to avoid him to try
// to overwrite the snippet view itself instead of just replacing the
// email/template body.
clean_for_save: function () {
this._super();
var bad_attrs = [
"data-oe-field",
"data-oe-id",
"data-oe-model",
"data-oe-source-id",
"data-oe-xpath",
"data-original-title",
];
for (var n in bad_attrs) {
var att = bad_attrs[n];
this.$target.find("[" + att + "]").removeAttr(att);
}
},
});
})(jQuery);

16
website_mail_snippet_fixed/views/assets.xml

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2016 Jairo Llopis <jairo.llopis@tecnativa.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<openerp>
<data>
<template id="assets_editor" inherit_id="website.assets_editor">
<xpath expr=".">
<script type="text/javascript"
src="/website_mail_snippet_fixed/static/src/js/fixed_560px.js"/>
</xpath>
</template>
</data>
</openerp>

8
website_mail_snippet_fixed/views/templates.xml

@ -21,6 +21,12 @@
<t t-call="website_mail_snippet_fixed.560px_section"/> <t t-call="website_mail_snippet_fixed.560px_section"/>
</div> </div>
</xpath> </xpath>
<xpath expr="//*[@id='snippet_options']" position="inside">
<div
data-snippet-option-id='fixed_560px'
data-selector=".fixed_560px"/>
</xpath>
</template> </template>
<template id="560px_section"/> <template id="560px_section"/>
@ -37,7 +43,7 @@
class="oe_snippet_thumbnail_title"/> class="oe_snippet_thumbnail_title"/>
</div> </div>
<div <div
class="oe_snippet_body"
class="oe_snippet_body fixed_560px"
style="padding:0px; width:100%; background-color:#ececec; color:rgb(0,0,0); line-height:20px; font-family:Arial,sans-serif; font-size:9pt"> style="padding:0px; width:100%; background-color:#ececec; color:rgb(0,0,0); line-height:20px; font-family:Arial,sans-serif; font-size:9pt">
<table <table
style="width: 560px; border-collapse: collapse; background: inherit; color: inherit; background: #FFFFFF" style="width: 560px; border-collapse: collapse; background: inherit; color: inherit; background: #FFFFFF"

Loading…
Cancel
Save