From 4070b9222d65b265fc67b54c5af095cdadbfaef9 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 7 Feb 2014 09:59:45 -0500 Subject: [PATCH] Rework HTML of appointment notifications Needed to simplify the HTML so it displays properly in Outlook. Fixes #2233 --- NEWS | 1 + .../Appointments/SOGoAptMailDeletion.wox | 56 +++++------ .../Appointments/SOGoAptMailICalReply.wox | 27 +++--- .../Appointments/SOGoAptMailInvitation.wox | 58 +++++------ .../Appointments/SOGoAptMailReceipt.wox | 96 ++++++++++++------- .../Appointments/SOGoAptMailUpdate.wox | 49 ++++------ 6 files changed, 154 insertions(+), 133 deletions(-) diff --git a/NEWS b/NEWS index 53b7aa909..a2f77a2df 100644 --- a/NEWS +++ b/NEWS @@ -41,6 +41,7 @@ Bug fixes - encode HTML entities when forwarding an HTML message inline in plain text composition mode (#2411) - encode HTML entities in JSON data returned by Calendar module (#2598) - fixed handling of ACLs on shared calendars with multiple groups (#1854) + - fixed HTML formatting of appointment notifications for Outlook (#2233) 2.1.1b (2013-12-04) ------------------- diff --git a/UI/Templates/Appointments/SOGoAptMailDeletion.wox b/UI/Templates/Appointments/SOGoAptMailDeletion.wox index aea834b62..544be59bd 100644 --- a/UI/Templates/Appointments/SOGoAptMailDeletion.wox +++ b/UI/Templates/Appointments/SOGoAptMailDeletion.wox @@ -8,37 +8,39 @@ -
-

-

- -
-
-
-
-
+ + +

+ + + + + + + + - -
-
-
+ + + + - -
-
-
-
-
+ + + + + + + + diff --git a/UI/Templates/Appointments/SOGoAptMailICalReply.wox b/UI/Templates/Appointments/SOGoAptMailICalReply.wox index fb8e01b75..6b1e28499 100644 --- a/UI/Templates/Appointments/SOGoAptMailICalReply.wox +++ b/UI/Templates/Appointments/SOGoAptMailICalReply.wox @@ -8,23 +8,20 @@ -
-

- -
-
-
-
-
+ + + + + + + + + +

diff --git a/UI/Templates/Appointments/SOGoAptMailInvitation.wox b/UI/Templates/Appointments/SOGoAptMailInvitation.wox index 8efa43197..1abc71423 100644 --- a/UI/Templates/Appointments/SOGoAptMailInvitation.wox +++ b/UI/Templates/Appointments/SOGoAptMailInvitation.wox @@ -8,37 +8,41 @@ -
-

-

- -
-
-
-
-
+ + +

+ + + + + + + + - -
-
-
+ + + + - -
-
-
-
-
+ + + + + + + + diff --git a/UI/Templates/Appointments/SOGoAptMailReceipt.wox b/UI/Templates/Appointments/SOGoAptMailReceipt.wox index 4ff295e9a..fc9f701d7 100644 --- a/UI/Templates/Appointments/SOGoAptMailReceipt.wox +++ b/UI/Templates/Appointments/SOGoAptMailReceipt.wox @@ -9,48 +9,72 @@ -
-

- -
-
-
-
-
-
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + -
- -
- -
+
+ + + + + + + + - -
- -
+ + + + + + + + + + - -
- -
+ + + + + + + + + + - - +

diff --git a/UI/Templates/Appointments/SOGoAptMailUpdate.wox b/UI/Templates/Appointments/SOGoAptMailUpdate.wox index 54ef9a5c6..f47f6afe5 100644 --- a/UI/Templates/Appointments/SOGoAptMailUpdate.wox +++ b/UI/Templates/Appointments/SOGoAptMailUpdate.wox @@ -8,38 +8,31 @@ -
- -

-

- -
-
-
-
- -
+ + + + + + + + +
-
+ > + + + - - -
-
-
-
- + + + + +

\ No newline at end of file