From 9178dcd3f618dc770736778ee010b0e44190b6af Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 17 Sep 2014 13:22:44 +0200
Subject: [PATCH] [FIX] website_mail & calendar: demo data break the layout of
 mail design

---
 addons/calendar/calendar_data.xml | 662 ++++++++++++++----------------
 1 file changed, 319 insertions(+), 343 deletions(-)

diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml
index e13edaf6312c..47568f6ab31b 100644
--- a/addons/calendar/calendar_data.xml
+++ b/addons/calendar/calendar_data.xml
@@ -103,122 +103,114 @@
             <field name="auto_delete" eval="True"/>
             
             <field name="body_html"><![CDATA[
-                <html>
-                    <head>
-                        <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-                        <title>${object.event_id.name}</title>
-                        <style> 
-                            span.oe_mail_footer_access {
-                                display:block;    
-                                text-align:center;
-                                color:grey;                                
-                            }
-                        </style>
-                    </head>
-                    <body>
-                        <div style="border-radius: 2px; max-width: 1200px; height: auto;margin-left: auto;margin-right: auto;background-color:#f9f9f9;">
-                            <div style="height:auto;text-align: center;font-size : 30px;color: #8A89BA;">
-                                <strong>${object.event_id.name}</strong>
-                            </div>
-                            <div style="height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px">
-                                <strong style="margin-left:12px">Dear ${object.cn}</strong> ,<br/><p style="margin-left:12px">${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}.</p> 
-                            </div>
-                            <div style="height: auto;margin-left:12px;margin-top:30px;">
-                                <table>
-                                    <tr>
-                                        <td>
-                                            <div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>
-                                            <div style="font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;">
-                                                ${object.event_id.get_interval(object.event_id.start,'day')}
-                                            </div>
-                                            <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>
-                                            <div style="border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>
-                                        </td>
-                                        <td>
-                                            <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
-                                                    <tr>
-                                                        <td style="vertical-align:top;">
-                                                            % if object.event_id.location:
-                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    Where
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                        <td  style="vertical-align:top;">
-                                                            % if object.event_id.location:
-                                                                <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
-                                                                    : ${object.event_id.location}
-                                                                    <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
-                                                                        </span>
-                                                                </div>
-                                                            % endif
-                                                        </td>                                                        
-                                                    </tr> 
-                                                                                                
-                                                    <tr>
-                                                        <td style="vertical-align:top;">
-                                                            % if object.event_id.description :
-                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    What
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                        <td style="vertical-align:text-top;">
-                                                            % if object.event_id.description :
-                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    : ${object.event_id.description}
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                    </tr>
-                                                                                                
-                                                    <tr>
-                                                        <td style="vertical-align:top;">
-                                                            % if not object.event_id.allday and object.event_id.duration:
-                                                                <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    Duration
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                        <td colspan="3" style="vertical-align:text-top;">
-                                                            % if not object.event_id.allday and object.event_id.duration:
-                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                    </tr>                                                
-                                                <tr style=" height: 30px;">
-                                                    <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                        <div>
-                                                            Attendees
+                <style> 
+                    span.oe_mail_footer_access {
+                        display:block;    
+                        text-align:center;
+                        color:grey;                                
+                    }
+                </style>
+                <div style="border-radius: 2px; max-width: 1200px; height: auto;margin-left: auto;margin-right: auto;background-color:#f9f9f9;">
+                    <div style="height:auto;text-align: center;font-size : 30px;color: #8A89BA;">
+                        <strong>${object.event_id.name}</strong>
+                    </div>
+                    <div style="height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px">
+                        <strong style="margin-left:12px">Dear ${object.cn}</strong> ,<br/><p style="margin-left:12px">${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}.</p> 
+                    </div>
+                    <div style="height: auto;margin-left:12px;margin-top:30px;">
+                        <table>
+                            <tr>
+                                <td>
+                                    <div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>
+                                    <div style="font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;">
+                                        ${object.event_id.get_interval(object.event_id.start,'day')}
+                                    </div>
+                                    <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>
+                                    <div style="border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>
+                                </td>
+                                <td>
+                                    <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
+                                            <tr>
+                                                <td style="vertical-align:top;">
+                                                    % if object.event_id.location:
+                                                        <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            Where
                                                         </div>
-                                                    </td>
-                                                    <td colspan="3">
-                                                       : 
-                                                        % for attendee in object.event_id.attendee_ids:
-                                                            <div style="display:inline-block; border-radius: 50%; width:10px; height:10px;background:${'color' in ctx and ctx['color'][attendee.state] or 'white'};"></div>
-                                                            % if attendee.cn != object.cn:
-                                                                <span style="margin-left:5px">${attendee.cn}</span>
-                                                            % else:
-                                                                <span style="margin-left:5px">You</span>
-                                                            % endif
-                                                        % endfor
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                            <div style="height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;">
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">Accept</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">Decline</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">View</a>
-                            </div> 
-                        </div>
-                    </body>
-                </html>
+                                                    % endif
+                                                </td>
+                                                <td  style="vertical-align:top;">
+                                                    % if object.event_id.location:
+                                                        <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
+                                                            : ${object.event_id.location}
+                                                            <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
+                                                                </span>
+                                                        </div>
+                                                    % endif
+                                                </td>                                                        
+                                            </tr> 
+                                                                                        
+                                            <tr>
+                                                <td style="vertical-align:top;">
+                                                    % if object.event_id.description :
+                                                        <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            What
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                                <td style="vertical-align:text-top;">
+                                                    % if object.event_id.description :
+                                                        <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            : ${object.event_id.description}
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                            </tr>
+                                                                                        
+                                            <tr>
+                                                <td style="vertical-align:top;">
+                                                    % if not object.event_id.allday and object.event_id.duration:
+                                                        <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            Duration
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                                <td colspan="3" style="vertical-align:text-top;">
+                                                    % if not object.event_id.allday and object.event_id.duration:
+                                                        <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                            </tr>                                                
+                                        <tr style=" height: 30px;">
+                                            <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                <div>
+                                                    Attendees
+                                                </div>
+                                            </td>
+                                            <td colspan="3">
+                                               : 
+                                                % for attendee in object.event_id.attendee_ids:
+                                                    <div style="display:inline-block; border-radius: 50%; width:10px; height:10px;background:${'color' in ctx and ctx['color'][attendee.state] or 'white'};"></div>
+                                                    % if attendee.cn != object.cn:
+                                                        <span style="margin-left:5px">${attendee.cn}</span>
+                                                    % else:
+                                                        <span style="margin-left:5px">You</span>
+                                                    % endif
+                                                % endfor
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div style="height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;">
+                            <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">Accept</a>
+                            <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">Decline</a>
+                            <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">View</a>
+                    </div> 
+                </div>
                 ]]>
                 </field>
         </record>
@@ -234,124 +226,116 @@
             <field name="auto_delete" eval="True"/>
             
             <field name="body_html"><![CDATA[ 
-                <html>
-                    <head>
-                        <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-                        <title>${object.event_id.name}</title>
-                        <style>
-                            span.oe_mail_footer_access {
-                                display:block;    
-                                text-align:center;
-                                color:grey;                                
-                            }
-                        </style>
-                    </head>
-                    <body>
-                        <div style="border-radius: 2px; max-width: 1200px; height: auto;margin-left: auto;margin-right: auto;background-color:#f9f9f9;">
-                            <div style="height:auto;text-align: center;font-size : 30px;color: #8A89BA;">
-                                <strong>${object.event_id.name}</strong>
-                            </div>
-                            <div style="height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px">
-                                <strong style="margin-left:12px">Dear ${object.cn}</strong> ,<br/>
-                                <p style="margin-left:12px">The date of the meeting has been changed...<br/>
-                                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)}.</p>
-                            </div>
-                            <div style="height: auto;margin-left:12px;margin-top:30px;">
-                                <table>
-                                    <tr>                                        
-                                        <td>
-                                            <div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>
-                                            <div style="font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;">
-                                                ${object.event_id.get_interval(object.event_id.start,'day')}
-                                            </div>
-                                            <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>
-                                            <div style="border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>
-                                        </td>
-                                        <td>
-                                            <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
-                                                    <tr>
-                                                        <td style="vertical-align:top;">
-                                                            % if object.event_id.location:
-                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    Where
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                        <td  style="vertical-align:top;">
-                                                            % if object.event_id.location:
-                                                                <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
-                                                                    : ${object.event_id.location}
-                                                                    <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
-                                                                        </span>
-                                                                </div>
-                                                            % endif
-                                                        </td>                                                        
-                                                    </tr> 
-                                                                                                
-                                                    <tr>
-                                                        <td style="vertical-align:top;">
-                                                            % if object.event_id.description :
-                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    What
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                        <td style="vertical-align:text-top;">
-                                                            % if object.event_id.description :
-                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    : ${object.event_id.description}
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                    </tr>
-                                                                                                
-                                                    <tr>
-                                                        <td style="vertical-align:top;">
-                                                            % if not object.event_id.allday and object.event_id.duration:
-                                                                <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    Duration
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                        <td colspan="3" style="vertical-align:text-top;">
-                                                            % if not object.event_id.allday and object.event_id.duration:
-                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                    </tr>                                                
-                                                <tr style=" height: 30px;">
-                                                    <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                        <div>
-                                                            Attendees
+                <style>
+                    span.oe_mail_footer_access {
+                        display:block;    
+                        text-align:center;
+                        color:grey;                                
+                    }
+                </style>
+                <div style="border-radius: 2px; max-width: 1200px; height: auto;margin-left: auto;margin-right: auto;background-color:#f9f9f9;">
+                    <div style="height:auto;text-align: center;font-size : 30px;color: #8A89BA;">
+                        <strong>${object.event_id.name}</strong>
+                    </div>
+                    <div style="height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px">
+                        <strong style="margin-left:12px">Dear ${object.cn}</strong> ,<br/>
+                        <p style="margin-left:12px">The date of the meeting has been changed...<br/>
+                        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)}.</p>
+                    </div>
+                    <div style="height: auto;margin-left:12px;margin-top:30px;">
+                        <table>
+                            <tr>                                        
+                                <td>
+                                    <div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>
+                                    <div style="font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;">
+                                        ${object.event_id.get_interval(object.event_id.start,'day')}
+                                    </div>
+                                    <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>
+                                    <div style="border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>
+                                </td>
+                                <td>
+                                    <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
+                                            <tr>
+                                                <td style="vertical-align:top;">
+                                                    % if object.event_id.location:
+                                                        <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            Where
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                                <td  style="vertical-align:top;">
+                                                    % if object.event_id.location:
+                                                        <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
+                                                            : ${object.event_id.location}
+                                                            <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
+                                                                </span>
+                                                        </div>
+                                                    % endif
+                                                </td>                                                        
+                                            </tr> 
+                                                                                        
+                                            <tr>
+                                                <td style="vertical-align:top;">
+                                                    % if object.event_id.description :
+                                                        <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            What
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                                <td style="vertical-align:text-top;">
+                                                    % if object.event_id.description :
+                                                        <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            : ${object.event_id.description}
                                                         </div>
-                                                    </td>
-                                                    <td colspan="3">
-                                                       : 
-                                                        % for attendee in object.event_id.attendee_ids:
-                                                            <div style="display:inline-block; border-radius: 50%; width:10px; height:10px;background:${'color' in ctx and ctx['color'][attendee.state] or 'white'};"></div>
-                                                            % if attendee.cn != object.cn:
-                                                                <span style="margin-left:5px">${attendee.cn}</span>
-                                                            % else:
-                                                                <span style="margin-left:5px">You</span>
-                                                            % endif
-                                                        % endfor
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                </table>                                      
-                            </div>
-                            <div style="height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;">
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">Accept</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">Decline</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">View</a>
-                            </div>                             
-                        </div>
-                    </body>
-                </html>
+                                                    % endif
+                                                </td>
+                                            </tr>
+                                                                                        
+                                            <tr>
+                                                <td style="vertical-align:top;">
+                                                    % if not object.event_id.allday and object.event_id.duration:
+                                                        <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            Duration
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                                <td colspan="3" style="vertical-align:text-top;">
+                                                    % if not object.event_id.allday and object.event_id.duration:
+                                                        <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                            </tr>                                                
+                                        <tr style=" height: 30px;">
+                                            <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                <div>
+                                                    Attendees
+                                                </div>
+                                            </td>
+                                            <td colspan="3">
+                                               : 
+                                                % for attendee in object.event_id.attendee_ids:
+                                                    <div style="display:inline-block; border-radius: 50%; width:10px; height:10px;background:${'color' in ctx and ctx['color'][attendee.state] or 'white'};"></div>
+                                                    % if attendee.cn != object.cn:
+                                                        <span style="margin-left:5px">${attendee.cn}</span>
+                                                    % else:
+                                                        <span style="margin-left:5px">You</span>
+                                                    % endif
+                                                % endfor
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>                                      
+                    </div>
+                    <div style="height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;">
+                            <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">Accept</a>
+                            <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">Decline</a>
+                            <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}">View</a>
+                    </div>                             
+                </div>
                 ]]>
                 </field>
         </record>
@@ -367,118 +351,110 @@
             <field name="auto_delete" eval="True"/>
             
             <field name="body_html"><![CDATA[
-                <html>
-                    <head>
-                        <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-                        <title>${object.event_id.name}</title>
-                        <style>
-                            span.oe_mail_footer_access {
-                                display:block;    
-                                text-align:center;
-                                color:grey;                                
-                            }
-                        </style>
-                    </head>
-                    <body>
-                        <div style="border-radius: 2px; max-width: 1200px; height: auto;margin-left: auto;margin-right: auto;background-color:#f9f9f9;">
-                            <div style="height:auto;text-align: center;font-size : 30px;color: #8A89BA;">
-                                <strong>${object.event_id.name}</strong>                                
-                            </div>
-                            <div style="height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px">
-                                <strong style="margin-left:12px">Dear ${object.cn}</strong> ,<br/>
-                                <p style="margin-left:12px">That is a reminder for the event below : </p>
-                            </div>
-                            <div style="height: auto;margin-left:12px;margin-top:30px;">
-                                <table>
-                                    <tr>
-                                        <td>
-                                            <div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>
-                                            <div style="font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;">
-                                                ${object.event_id.get_interval(object.event_id.start,'day')}
-                                            </div>
-                                            <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>
-                                            <div style="border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>
-                                        </td>
-                                        <td>
-                                            <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
-                                                    <tr>
-                                                        <td style="vertical-align:top;">
-                                                            % if object.event_id.location:
-                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    Where
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                        <td  style="vertical-align:top;">
-                                                            % if object.event_id.location:
-                                                                <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
-                                                                    : ${object.event_id.location}
-                                                                    <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
-                                                                        </span>
-                                                                </div>
-                                                            % endif
-                                                        </td>                                                        
-                                                    </tr> 
-                                                                                                
-                                                    <tr>
-                                                        <td style="vertical-align:top;">
-                                                            % if object.event_id.description :
-                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    What
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                        <td style="vertical-align:text-top;">
-                                                            % if object.event_id.description :
-                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    : ${object.event_id.description}
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                    </tr>
-                                                                                                
-                                                    <tr>
-                                                        <td style="vertical-align:top;">
-                                                            % if not object.event_id.allday and object.event_id.duration:
-                                                                <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    Duration
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                        <td colspan="3" style="vertical-align:text-top;">
-                                                            % if not object.event_id.allday and object.event_id.duration:
-                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                    : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
-                                                                </div>
-                                                            % endif
-                                                        </td>
-                                                    </tr>                                                
-                                                <tr style=" height: 30px;">
-                                                    <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                        <div>
-                                                            Attendees
+                <style>
+                    span.oe_mail_footer_access {
+                        display:block;    
+                        text-align:center;
+                        color:grey;                                
+                    }
+                </style>
+                <div style="border-radius: 2px; max-width: 1200px; height: auto;margin-left: auto;margin-right: auto;background-color:#f9f9f9;">
+                    <div style="height:auto;text-align: center;font-size : 30px;color: #8A89BA;">
+                        <strong>${object.event_id.name}</strong>                                
+                    </div>
+                    <div style="height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px">
+                        <strong style="margin-left:12px">Dear ${object.cn}</strong> ,<br/>
+                        <p style="margin-left:12px">That is a reminder for the event below : </p>
+                    </div>
+                    <div style="height: auto;margin-left:12px;margin-top:30px;">
+                        <table>
+                            <tr>
+                                <td>
+                                    <div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>
+                                    <div style="font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;">
+                                        ${object.event_id.get_interval(object.event_id.start,'day')}
+                                    </div>
+                                    <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>
+                                    <div style="border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>
+                                </td>
+                                <td>
+                                    <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
+                                            <tr>
+                                                <td style="vertical-align:top;">
+                                                    % if object.event_id.location:
+                                                        <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            Where
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                                <td  style="vertical-align:top;">
+                                                    % if object.event_id.location:
+                                                        <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
+                                                            : ${object.event_id.location}
+                                                            <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
+                                                                </span>
+                                                        </div>
+                                                    % endif
+                                                </td>                                                        
+                                            </tr> 
+                                                                                        
+                                            <tr>
+                                                <td style="vertical-align:top;">
+                                                    % if object.event_id.description :
+                                                        <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            What
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                                <td style="vertical-align:text-top;">
+                                                    % if object.event_id.description :
+                                                        <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            : ${object.event_id.description}
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                            </tr>
+                                                                                        
+                                            <tr>
+                                                <td style="vertical-align:top;">
+                                                    % if not object.event_id.allday and object.event_id.duration:
+                                                        <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            Duration
+                                                        </div>
+                                                    % endif
+                                                </td>
+                                                <td colspan="3" style="vertical-align:text-top;">
+                                                    % if not object.event_id.allday and object.event_id.duration:
+                                                        <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                            : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
                                                         </div>
-                                                    </td>
-                                                    <td colspan="3">
-                                                       : 
-                                                        % for attendee in object.event_id.attendee_ids:
-                                                            <div style="display:inline-block; border-radius: 50%; width:10px; height:10px;background:${'color' in ctx and ctx['color'][attendee.state] or 'white'};"></div>
-                                                            % if attendee.cn != object.cn:
-                                                                <span style="margin-left:5px">${attendee.cn}</span>
-                                                            % else:
-                                                                <span style="margin-left:5px">You</span>
-                                                            % endif
-                                                        % endfor
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>            
-                        </div>
-                    </body>
-                </html>
+                                                    % endif
+                                                </td>
+                                            </tr>                                                
+                                        <tr style=" height: 30px;">
+                                            <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                <div>
+                                                    Attendees
+                                                </div>
+                                            </td>
+                                            <td colspan="3">
+                                               : 
+                                                % for attendee in object.event_id.attendee_ids:
+                                                    <div style="display:inline-block; border-radius: 50%; width:10px; height:10px;background:${'color' in ctx and ctx['color'][attendee.state] or 'white'};"></div>
+                                                    % if attendee.cn != object.cn:
+                                                        <span style="margin-left:5px">${attendee.cn}</span>
+                                                    % else:
+                                                        <span style="margin-left:5px">You</span>
+                                                    % endif
+                                                % endfor
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>            
+                </div>
                 ]]>
                 </field>
         </record>
-- 
GitLab