From b7f1665b64318cee1b14d13f7e9fdb6a323189a4 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 4 Nov 2012 14:24:22 +0100
Subject: [PATCH] ICAL: add conflict handling

---
 webcit/static/t/ical/attachment/display.html          | 3 +--
 webcit/static/t/ical/attachment/display_conflict.html | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 webcit/static/t/ical/attachment/display_conflict.html

diff --git a/webcit/static/t/ical/attachment/display.html b/webcit/static/t/ical/attachment/display.html
index 24f506759..8f7fba401 100644
--- a/webcit/static/t/ical/attachment/display.html
+++ b/webcit/static/t/ical/attachment/display.html
@@ -1,4 +1,3 @@
-
 <div class="mimepart">
 
 <div id="rsvp<?BSTR("divname")>_title">
@@ -48,7 +47,7 @@
 
 <?--("If this is a REQUEST, display conflicts and buttons")>
 <?!("COND:ICAL:METHOD", 110, #"ICAL_METHOD_REQUEST")>
-<?ICAL:SERV:CHECK:CONFLICT()>
+<?ITERATE("ICAL:CONFLICT", ="ical_attachment_display_conflict")>
 <?--("Display the Accept/Decline buttons")>
 <p id="rsvp<?BSTR("divname")>_question">
 <?_("How would you like to respond to this invitation?")>
diff --git a/webcit/static/t/ical/attachment/display_conflict.html b/webcit/static/t/ical/attachment/display_conflict.html
new file mode 100644
index 000000000..47fb42aed
--- /dev/null
+++ b/webcit/static/t/ical/attachment/display_conflict.html
@@ -0,0 +1,7 @@
+<dt>
+<??("ICAL:CONFLICT:IS:UPDATE", 30)><?_("Update:"  )><??("X", 30)>
+<??("ICAL:CONFLICT:IS:UPDATE", 40)><?_("CONFLICT:")><??("X", 40)>
+</dt><dd>
+<??("ICAL:CONFLICT:IS:UPDATE", 10)><?_("This is an update of"          )> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><??("X", 10)>
+<?!("ICAL:CONFLICT:IS:UPDATE", 20)><?_("This event would conflict with")> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><?!("X", 20)>
+</dd>
-- 
2.30.2