Commit Graph
218 Commits
Author SHA1 Message Date
Nicolas Lempereur 1faa4a74aa Revert "[FIX] mass_mailing: revert typo forward port ed0233f"
This reverts commit 75d9674d4 and revert well 551719a81e which wass done
on mail.mass_mailing instead of mail.template (on which it should not be
done).
2017-04-27 08:34:33 +02:00
Nicolas Lempereur 75d9674d45 [FIX] mass_mailing: revert typo forward port ed0233f
This commit revert the change of 551719a8 forward ported in ed0233f.

The file and feature modified is not present after saas-11.
2017-04-27 08:15:37 +02:00
Christophe Simonis ed0233fb8a [MERGE] forward port branch saas-11 up to 3d35aef5b0 2017-04-26 20:07:32 +02:00
Christophe Simonis 3d35aef5b0 [MERGE] forward port branch 9.0 up to 283b648c18 2017-04-26 19:46:46 +02:00
Nicolas Lempereur 551719a81e [FIX] mass_mailing: mail template not in english
Mass mailing `mail templates` when selected in a mass mailing are
always used in the english version.

But when another language is involved the edition of mass mailing
`templates` had a number of issue. For example saving the edited english
would only modify the user current language.

These issues are cause because the widget with snippets used for mass
mailing templates edition is not compatible.

Several fixes were proposed, what was choosen finally was to use the
correct widget with the following behavior changes:

- the snippets are not showed anymore in mass mailing templates,
- the current language can be edited and is saved rightly,

The shortcoming this give mass mailing templates can be partly
compensated by:

- editing the template back (if someone want the old behavior),
- duplicating mass mailings which keep the snippets and translations,
- doing a customization to improve the situation

closes #16255
fixes #16165
opw-726746 opw-727232

note: this fix is only needed for 9.0 and saas-11.
2017-04-26 18:37:53 +02:00
qsm-odoo dff12736db [FIX] mass_mailing: remove mail template menu
Mass Mailing campain cannot use Mail Templates anymore (the user now
has to duplicate a previous Mass Mailing if he wants to start a new
one with a mail body which looks like the old one).

So this menu became useless and confused the users. Mail Templates are
a technical feature which is used by other module to send automatic
emails and these can be edited through debug mode in the Settings app.

Resolve #14148.
2016-11-22 10:32:51 +01:00
stefanorigano 23c6c37c8d [FIX] mass_mailing: vertical alignments & multiline text
* vertical alignment: Keep ‘vertical-align: top’ as default, but
define ‘middle’ exceptions for header and footer snippets.

* ‘comparison_table’: multiline text.
Remove inline style for inner <p/> elements and define default padding
for parent <td/> instead. This will allow to create multiple line of
text keeping a coherent margin between each <td/>.
A css set of rules triggering any kind of elements allow to use
multiline text for any kind of tag (p, h1, etc..)

* Footer snippets padding, minor
2016-11-07 17:08:18 +01:00
qsm-odoo b460d77d3b [FIX] mass_mailing: typo in form view message 2016-09-30 18:07:14 +02:00
qsm-odoo cc54a2e6ff [FIX] (website_)mass_mailing: remove website dependency (once and for all?)
mass_mailing snippets contained links to "/page/contactus", url which
only exists if website is installed. Also, t-if="website" which were
in snippets were unclean.

Now, the website_mass_mailing module which was already there to install
website snippet and which was already in auto-install with website and
mass_mailing is also in charge of extending mass_mailing features. It
extends the snippets to add the parts which were marked with t-if
website and add the links to "/page/contactus".
2016-09-30 18:07:14 +02:00
qsm-odoo 984afdf120 [FIX] mass_mailing, web_editor: set up correct iframe communication
Previous commit tried to handle iframe assets in a more standard way
but instead broke the order followed to install iframe communication.

While waiting for a more clean way to handle iframe assets and
communication, revert to old set up.
2016-09-30 12:19:46 +02:00
qsm-odoo 8320a9aaf5 [IMP] mass_mailing: only keep one theme in community module
Only keep default theme in community module and replace old enterprise
ones with new ones.
2016-09-30 12:19:39 +02:00
qsm-odoo bee594e582 [IMP] mass_mailing: exclude one class for colorpicker option instead of snippet list 2016-09-23 11:16:16 +02:00
stefanorigano 194f13beaf [FIX] mass_mailing: refactore o_mail_block_footer_tag_line snippet
* Remove the ability to change bg-color (colours are applied to
children elements)
* Fix a layout issue in theme_resto
2016-09-23 11:16:16 +02:00
stefanorigano 59d4ae5c0c [FIX] mass_mailing: rename "Comparison Table" snippet to "Comparison"
Remove the word "Table" so that the name fits in one line
2016-09-23 11:16:16 +02:00
stefanorigano 0e7527ed56 [FIX] mass_mailing: allow editing properly footer copyright
- ability to edit copyrights (change year, etc.) without removing ©
- 2016 in copyrights, not 2014
2016-09-23 11:16:16 +02:00
stefanorigano 5a93f9a7b7 [FIX] mass_mailing: refactore "Discount Coupon" snippet
* Rename it to "Promo Code"
* Several text changes
* Add a CTA
2016-09-23 11:16:16 +02:00
stefanorigano 66a0f18a21 [FIX] mass_mailing: add link in o_mail_block_header_logo snippet 2016-09-23 11:16:16 +02:00
stefanorigano 5ffe7dcafb [FIX] mass_mailing: editable social links
* Move social links out of tables so that they will not trigger at
td data-selectors
* Use o_mail_no_resize class to specify that the td container is not
resizable (otherwise oe_handles will overlap the icons)
* Adapt email templates
2016-09-23 11:16:16 +02:00
qsm-odoo 3f5a27e286 [FIX] mass_mailing: properly manage td/th elements
Refactore width-x snippet option and create another option to handle
cloning and removing td elements properly.

* on_focus: the handle to resize are now hidden when the td/th is alone
on its row

* on_clone: when cloning a td element which is alone on its row, it is
instead cloned in a new row. If not, empty td are added on the whole
column to maintain table integrity.

* on_remove: handle removing td in complex table
2016-09-23 11:16:16 +02:00
Christophe Matthieu ab06013e30 [FIX] mass_mailing: can't change color button snippet when edit mass mailing 2016-09-21 16:14:49 +02:00
stefanorigano 1fa0990a9a [FIX] mass_mailing: replace title of snippet menu in mass_mailing
The snippet menu title is only visible when choosing a theme for the
first time, so "Select a template" is better than "Add blocks".
2016-09-21 13:16:59 +02:00
qsm-odoo a430c81b79 [IMP] mass_mailing: review theme style location and convention
* Use the theme class selector as root for the less file
-> Allow to style the editor as applied to the body
-> Split in editor/color/layout/snippets

* Create an assets to contain all mm themes so that the compilation is
made by the odoo system, and allow minification and variable sharing
between themes
-> Remove css files

* Reformat the LESS files content
2016-09-20 13:52:29 +02:00
qsm-odoo edb58e6beb [IMP] mass_mailing: automatically include the o_mail_wrapper element 2016-09-20 13:52:29 +02:00
qsm-odoo a0cfc0e88b [FIX] mass_mailing: remove website dependency 2016-09-20 13:52:29 +02:00
qsm-odoo 9749b93250 [IMP] website, web_editor, mass_mailing: move margin and size options
website -> web_editor so that they are available for mass_mailing.

To allow setting margins on td elements:

As the above mentionned option allows to control the mt and mb classes
on the mass mailing items, the problem is that we would ideally want it
to be functionnal on td element as they are the main part of a mail.
As they don't support margins, there were many options to fix the
problem:
- Add more JS to place the mt and mb classes on children of td element
- Place the option on children of td element and not td element itself
but in that case, the width control of td would imply a lot of parent
option hierarchy, or the width control had also to be adapted to control
children
- Control padding instead of margin. This forces to add lots of
css rules like pt4 pt8, ... (or td.mt4, td.mt8, ...).

The last solution has been chosen. Padding is more supported than
margins in mail client anyway and the css rules will be isolated in
the mail editor anyway. Using td.mt4 instead of pt4 had the advantage
to not require any JS modification.
2016-09-20 13:52:29 +02:00
stefanorigano 4f93d5c687 [IMP] mass_mailing, web_editor: improve themes/snippets/templates 2016-09-20 13:52:29 +02:00
qsm-odoo e3635494ea [IMP] mass_mailing: add default layout for mail themes
When there is no content in the mail, the user is now forced to choose
a theme. Once the choice is made, the theme introduces default content
(series of snippet to simplify user edition).

The default images are also changed when the theme is switched. To do
that, JS code was implemented so that on theme switch, all the images
are changed to check for images in the static theme folder or use a
theme related xml_id.

+ Refactore theme data management.
2016-09-20 13:52:29 +02:00
qsm-odoo 54b22541b6 [IMP] mass_mailing: use standard background colorpicker 2016-09-05 17:07:31 +01:00
qsm-odoo 61e48b09fb [REF] mass_mailing: convert templates to themes and clean code
* Remove mass mailing template switching system (lemon, airmail, ...)
and replace it with a theme selector which only toggle a different
class on the body.
* Lint JS files.
* Change the way the editor is overridden by mass_mailing in a more
odoo way (put the JS in assets and check on runtime if it must be
applied.

+ fix editor style
+ remove useless code
+ remove odoo template
2016-09-05 17:07:31 +01:00
qsm-odoo 71b8bc7570 [IMP] mass_mailing: correctly define snippets toolbar template
* Split snippets into templates and use the t-snippet directive
* Correctly handle snippet thumbnails thanks to t-thumbnail and not
with custom css
2016-09-05 17:02:00 +01:00
Csaba Fazekas 9676ceec02 [REF] mass_mailing: change/add snippets/themes layout/design
* Airmail/Lemon/Tech template/Odoo template
* Add bg color option
* Clean snippets
2016-09-05 17:01:50 +01:00
Christophe Matthieu 1501b30c53 [REF] mass_mailing: change theme/template selection and add new snippets
* remove theme/template selection screen for mass_mailing
* allow to use different layout on edition
* add new snippets
2016-09-05 17:00:45 +01:00
Simon Lejeune 03aae0d3d5 [FIX] mass_mailing, website_mass_mailing: "group_website_popup_on_exit" group
This group was defined in the mass_mailing module but is only working when
you install website_mass_mailing. What this group does is allowing to insert
a newsletter snippet in the page, thus it has nothing to do in the mass_mailing
module which doesn't depend on website. Also, the snippet itself was already
defined in website_mass_mailing.

Moved all the things to website_mass_mailing.
2016-08-26 15:18:36 +02:00
qsm-odoo b4cfe36b05 [IMP] *: replace snippet sections menu by a title
* web_editor, website, mass_mailing

This menu allowed to scroll to the snippets sections by clicking on
their corresponding icons. It was useless as the sections are not
taking a lot of height. This also appeared buggy as clicking on the
last icon highlighted only the second one as this second one was still
the first section visible on the screen when the last section was
fully visible.

This also added fours buttons to the interface which contains already a
lot of them. Now this is replaced by a title "Add blocks" which makes
the editor cleaner and also improved the performance to enter the edit
mode.
2016-08-19 17:44:28 +02:00
Fabien Pinckaers 0a48884c18 [IMP] mass_mailing: better form view for mass mail 2016-08-10 13:59:52 -07:00
Christophe Simonis 1fca5e01cb [MERGE] forward port branch saas-10 up to 156dee2 2016-07-14 18:17:30 +02:00
Christophe Simonis 156dee2aec [MERGE] forward port branch 9.0 up to fd9eb2e 2016-07-14 17:17:54 +02:00
Denis Ledoux 8d2d741db3 [FIX] mass_mailing: do not inherit a view on a string attribute
A string attribute value can be translated,
and therefore the inherit broken if the term is indeed
translated.

This was the case for this term "Tracked link" in the Dutch
language, the "Tracked link" term of the inherited view has
been translated, and the inherit was therefore broken as
it couldn't find the given node in the base view due to the
fact this term was translated.

opw-683128
2016-07-14 12:25:02 +02:00
Christophe Matthieu 025263d3bf Revert "[FIX] web_editor: test jinja content to load editor in codeview"
This reverts commit f38f8930f0.

Revert for internal choice. Odoo want to use qweb in template and remove jinja support on next version.
If users want to use jinja they can change the view to use text widget instead of html widget.
2016-06-23 11:45:17 +02:00
Christophe Matthieu f38f8930f0 [FIX] web_editor: test jinja content to load editor in codeview
The preview change the content because the browser try to fix the dom.
If a user use jinja and activate the preview, the jinja code is (re)moved by the browser and broke the template.
2016-06-22 14:26:42 +02:00
Keyur Gajjar 1467689edf [MOV] mass_mailing: splitted the following files + new api
1. Splitted data/mass_mailing_data.xml to security/mass_mailing_security.xml for res_groups data.
2. Splitted views/mass_mailing_views to
    - views/link_tracker_views.xml
    - views/mass_mailing_stats_views.xml
    - views/mass_mailing_template.xml
2016-06-17 11:23:12 +02:00
Keyur Gajjar 1c1b049898 [MOV] mass_mailing: directory restructuring according to new api 2016-06-17 11:23:12 +02:00
Jainik Patel 47e9e6918e [IMP] mass_mailing: 'A/B Testing percentage' field hidden if no Campaigns
When you install Mass Mailing,and go to the Options tab of the mailing,
there is an A/B Testing percentage field.
It is useless if Mass Mailing campaigns is not activated.
2016-05-13 10:59:41 +02:00
Foram Shah d2728c0006 [IMP] account,crm,project...: Remove 'Create and Edit' from tags
List of impacted models:
-account.account
-calendar.event
-crm.lead
-fleet.vehicle
-hr.applicant
-hr.employee
-mail.mass_mailing.campaign
-note.note
-project.task
-res.partner

Add a menuitem in the Configurations for these models, visible in debug mode
2016-04-11 11:10:48 +02:00
Virbhadrasinh Gohil c3ed7bf425 [ADD] mass_mailing: Add help action in mail template when no record found. 2016-03-18 11:44:08 +01:00
Srushti Patel 24972234b9 [IMP] : added More information links to promote enterprise features in the following Modules
-accounting, project, crm, mass_mailling, stock, point_of_sale, website, website_sale, sale
2016-03-18 08:43:53 +01:00
rpi f2a805b286 [IMP] mass_mailing: Move access rights from employee to mass mailing user. 2016-03-11 13:36:44 +01:00
Yannick Tivisse 90981ec730 [IMP] Administration access right on Configuration->Settings menuitems 2016-03-07 15:53:29 +01:00
Yannick Tivisse fdb3ad7082 [REM] Remove the group 'base.group_configuration'
This additional administration group was formerly used to hide
the configuration menuitems for the common users.

Being manager should be enough to access these items
2016-03-07 15:53:29 +01:00
Kinjal Mehta 58c4619918 [IMP] mass_mailing: no create link.tracker
Indeed UTMs should be created from the front end, via promote.

Also fixed some mismatch in tracker views by correctlin setting the view_id in
mass_mailing and classic utm view.
2016-03-04 16:12:37 +01:00