diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml index e13edaf6312..47568f6ab31 100644 --- a/addons/calendar/calendar_data.xml +++ b/addons/calendar/calendar_data.xml @@ -103,122 +103,114 @@ - - - ${object.event_id.name} - - - -
-
- ${object.event_id.name} -
-
- Dear ${object.cn} ,

${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.

-
-
- - - - + +
-
${object.event_id.get_interval(object.event_id.start, 'dayname')}
-
- ${object.event_id.get_interval(object.event_id.start,'day')} -
-
${object.event_id.get_interval(object.event_id.start, 'month')}
-
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
- 		- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
- % if object.event_id.location: -
- Where -
- % endif - 		- % if object.event_id.location: -
- : ${object.event_id.location} - (View Map) - -
- % endif -
- % if object.event_id.description : -
- What -
- % endif - 		- % if object.event_id.description : -
- : ${object.event_id.description} -
- % endif -
- % if not object.event_id.allday and object.event_id.duration: -
- Duration -
- % endif - 		- % if not object.event_id.allday and object.event_id.duration: -
- : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} -
- % endif -
-
- Attendees + +
+
+ ${object.event_id.name} +
+
+ Dear ${object.cn} ,

${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.

+
+
+ + + + - -
+
${object.event_id.get_interval(object.event_id.start, 'dayname')}
+
+ ${object.event_id.get_interval(object.event_id.start,'day')} +
+
${object.event_id.get_interval(object.event_id.start, 'month')}
+
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
+ 		+ + + - - -
+ % if object.event_id.location: +
+ Where
- 		- : - % for attendee in object.event_id.attendee_ids: -
- % if attendee.cn != object.cn: - ${attendee.cn} - % else: - You - % endif - % endfor -
-
-
-
- Accept - Decline - View -
-
- - + % endif +
+ % if object.event_id.location: +
+ : ${object.event_id.location} + (View Map) + +
+ % endif +
+ % if object.event_id.description : +
+ What +
+ % endif + 		+ % if object.event_id.description : +
+ : ${object.event_id.description} +
+ % endif +
+ % if not object.event_id.allday and object.event_id.duration: +
+ Duration +
+ % endif + 		+ % if not object.event_id.allday and object.event_id.duration: +
+ : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} +
+ % endif +
+
+ Attendees +
+ 		+ : + % for attendee in object.event_id.attendee_ids: +
+ % if attendee.cn != object.cn: + ${attendee.cn} + % else: + You + % endif + % endfor +
+
+
+
+ Accept + Decline + View +
+
]]> @@ -234,124 +226,116 @@ - - - ${object.event_id.name} - - - -
-
- ${object.event_id.name} -
-
- Dear ${object.cn} ,
-

The date of the meeting has been changed...
- The meeting created by ${object.event_id.user_id.partner_id.name} is now scheduled for : ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.

-
-
- - - - + +
-
${object.event_id.get_interval(object.event_id.start, 'dayname')}
-
- ${object.event_id.get_interval(object.event_id.start,'day')} -
-
${object.event_id.get_interval(object.event_id.start, 'month')}
-
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
- 		- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
- % if object.event_id.location: -
- Where -
- % endif - 		- % if object.event_id.location: -
- : ${object.event_id.location} - (View Map) - -
- % endif -
- % if object.event_id.description : -
- What -
- % endif - 		- % if object.event_id.description : -
- : ${object.event_id.description} -
- % endif -
- % if not object.event_id.allday and object.event_id.duration: -
- Duration -
- % endif - 		- % if not object.event_id.allday and object.event_id.duration: -
- : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} -
- % endif -
-
- Attendees + +
+
+ ${object.event_id.name} +
+
+ Dear ${object.cn} ,
+

The date of the meeting has been changed...
+ The meeting created by ${object.event_id.user_id.partner_id.name} is now scheduled for : ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.

+
+
+ + + + - -
+
${object.event_id.get_interval(object.event_id.start, 'dayname')}
+
+ ${object.event_id.get_interval(object.event_id.start,'day')} +
+
${object.event_id.get_interval(object.event_id.start, 'month')}
+
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
+ 		+ + + - - -
+ % if object.event_id.location: +
+ Where
- 		- : - % for attendee in object.event_id.attendee_ids: -
- % if attendee.cn != object.cn: - ${attendee.cn} - % else: - You - % endif - % endfor -
-
-
-
- Accept - Decline - View -
-
- - + % endif +
+ % if object.event_id.location: +
+ : ${object.event_id.location} + (View Map) + +
+ % endif +
+ % if object.event_id.description : +
+ What +
+ % endif + 		+ % if object.event_id.description : +
+ : ${object.event_id.description} +
+ % endif +
+ % if not object.event_id.allday and object.event_id.duration: +
+ Duration +
+ % endif + 		+ % if not object.event_id.allday and object.event_id.duration: +
+ : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} +
+ % endif +
+
+ Attendees +
+ 		+ : + % for attendee in object.event_id.attendee_ids: +
+ % if attendee.cn != object.cn: + ${attendee.cn} + % else: + You + % endif + % endfor +
+
+
+
+ Accept + Decline + View +
+
]]> @@ -367,118 +351,110 @@ - - - ${object.event_id.name} - - - -
-
- ${object.event_id.name} -
-
- Dear ${object.cn} ,
-

That is a reminder for the event below :

-
-
- - - - + +
-
${object.event_id.get_interval(object.event_id.start, 'dayname')}
-
- ${object.event_id.get_interval(object.event_id.start,'day')} -
-
${object.event_id.get_interval(object.event_id.start, 'month')}
-
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
- 		- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
- % if object.event_id.location: -
- Where -
- % endif - 		- % if object.event_id.location: -
- : ${object.event_id.location} - (View Map) - -
- % endif -
- % if object.event_id.description : -
- What -
- % endif - 		- % if object.event_id.description : -
- : ${object.event_id.description} -
- % endif -
- % if not object.event_id.allday and object.event_id.duration: -
- Duration -
- % endif - 		- % if not object.event_id.allday and object.event_id.duration: -
- : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} -
- % endif -
-
- Attendees + +
+
+ ${object.event_id.name} +
+
+ Dear ${object.cn} ,
+

That is a reminder for the event below :

+
+
+ + + + - -
+
${object.event_id.get_interval(object.event_id.start, 'dayname')}
+
+ ${object.event_id.get_interval(object.event_id.start,'day')} +
+
${object.event_id.get_interval(object.event_id.start, 'month')}
+
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
+ 		+ + + - - -
+ % if object.event_id.location: +
+ Where
- 		- : - % for attendee in object.event_id.attendee_ids: -
- % if attendee.cn != object.cn: - ${attendee.cn} - % else: - You - % endif - % endfor -
-
-
-
- - + % endif +
+ % if object.event_id.location: +
+ : ${object.event_id.location} + (View Map) + +
+ % endif +
+ % if object.event_id.description : +
+ What +
+ % endif + 		+ % if object.event_id.description : +
+ : ${object.event_id.description} +
+ % endif +
+ % if not object.event_id.allday and object.event_id.duration: +
+ Duration +
+ % endif + 		+ % if not object.event_id.allday and object.event_id.duration: +
+ : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} +
+ % endif +
+
+ Attendees +
+ 		+ : + % for attendee in object.event_id.attendee_ids: +
+ % if attendee.cn != object.cn: + ${attendee.cn} + % else: + You + % endif + % endfor +
+
+
+
]]> diff --git a/addons/mass_mailing/views/snippets.xml b/addons/mass_mailing/views/snippets.xml index 7ed0739daa2..46a63b1db93 100644 --- a/addons/mass_mailing/views/snippets.xml +++ b/addons/mass_mailing/views/snippets.xml @@ -31,7 +31,7 @@
+ data-drop-near="p, h1, h2, h3, blockquote, .well, .panel">
  • Change Newsletter
    •  diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index 116f55713ec..eeb8261217c 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -550,12 +550,17 @@ $zones.remove(); } while (count > 0); - // Cleaning up zones placed between floating or inline elements. We do not like these kind of zones. + // Cleaning consecutive zone and up zones placed between floating or inline elements. We do not like these kind of zones. var $zones = self.$wrapwrap.find('.oe_drop_zone:not(.oe_vertical)'); $zones.each(function (){ var zone = $(this); var prev = zone.prev(); var next = zone.next(); + // remove consecutive zone + if (!zone.hasClass('.oe_vertical') && (prev.is('.oe_drop_zone:not(.oe_vertical)') || next.is('.oe_drop_zone:not(.oe_vertical)'))) { + zone.remove(); + return; + } var float_prev = prev.css('float') || 'none'; var float_next = next.css('float') || 'none'; var disp_prev = prev.css('display') || null; diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index 5d596b16dc5..c88c1e0f21a 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -391,8 +391,8 @@
    diff --git a/addons/website_mail/static/src/js/website_email_designer.js b/addons/website_mail/static/src/js/website_email_designer.js index 1ea39ae657c..264fe33288e 100644 --- a/addons/website_mail/static/src/js/website_email_designer.js +++ b/addons/website_mail/static/src/js/website_email_designer.js @@ -1,26 +1,25 @@ -(function () { +$(function () { 'use strict'; - var website = openerp.website; - - website.snippet.BuildingBlock.include({ - _get_snippet_url: function () { - return '/website_mail/snippets'; - } - }); - - // Copy the template to the body of the email - $(document).ready(function () { - $('.js_template_set').click(function(ev) { - $('#email_designer').show(); - $('#email_template').hide(); - $(".js_content", $(this).parent()).children().clone().appendTo('#email_body'); - $(".js_content", $(this).parent()).children().clone().appendTo('#email_body_html'); - $('#email_body').addClass('oe_dirty'); - $('#email_body_html').addClass('oe_dirty'); - - openerp.website.editor_bar.edit(); - event.preventDefault(); + if ($("#email_designer").length) { + openerp.website.snippet.BuildingBlock.include({ + _get_snippet_url: function () { + return '/website_mail/snippets'; + } }); - }); -})(); + // Copy the template to the body of the email + $(document).ready(function () { + $('.js_template_set').click(function(ev) { + $('#email_designer').show(); + $('#email_template').hide(); + $(".js_content", $(this).parent()).children().clone().appendTo('#email_body'); + $(".js_content", $(this).parent()).children().clone().appendTo('#email_body_html'); + $('#email_body').addClass('oe_dirty'); + $('#email_body_html').addClass('oe_dirty'); + + openerp.website.editor_bar.edit(); + event.preventDefault(); + }); + }); + } +}); diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml index 12892f50434..567117f8a0f 100644 --- a/addons/website_mail/views/snippets.xml +++ b/addons/website_mail/views/snippets.xml @@ -10,7 +10,7 @@
    -
    +
    @@ -259,7 +259,7 @@
    -
    +
    @@ -483,8 +483,8 @@ diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml index 31df858d50b..1a0969d54f7 100644 --- a/addons/website_mail/views/website_email_designer.xml +++ b/addons/website_mail/views/website_email_designer.xml @@ -2,12 +2,15 @@ + +