ICAL: add conflict handling

diff --git a/webcit/static/t/ical/attachment/display.html b/webcit/static/t/ical/attachment/display.html
index 24f506759ad9c78a3e4d4ad659692cd5127d0f6c..8f7fba401ef212056c0c88e5a3404da3ea69f987 100644 (file)
--- 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">
 <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")>
 
 <?--("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?")>
 <?--("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 (file)
index 0000000..47fb42a
--- /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>