# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1428359902 -7200
# Node ID 0b9b4ce2d4c5d19a471ed1a93a33d7e723773dc2
# Parent  644d9bf74b9bee8098a1ec9d76dedeb7cc8ddec1
Fixed conflict detection between parent events and modified recurrences.
Fixed the presentation of replaced periods; added styling for add/remove
controls in paragraphs.

diff -r 644d9bf74b9b -r 0b9b4ce2d4c5 htdocs/styles.css
--- a/htdocs/styles.css	Tue Apr 07 00:36:47 2015 +0200
+++ b/htdocs/styles.css	Tue Apr 07 00:38:22 2015 +0200
@@ -106,6 +106,7 @@
     font-weight: bold;
 }
 
+table.recurrence .replaced,
 table.conflicts .replaced {
     text-decoration: line-through;
 }
@@ -230,6 +231,12 @@
     float: right;
 }
 
+p label.add,
+p label.remove,
+p label.removed {
+    float: none;
+}
+
 .dt.disabled label,
 .dt.enabled label,
 label.add,
diff -r 644d9bf74b9b -r 0b9b4ce2d4c5 imipweb/event.py
--- a/imipweb/event.py	Tue Apr 07 00:36:47 2015 +0200
+++ b/imipweb/event.py	Tue Apr 07 00:38:22 2015 +0200
@@ -808,7 +808,7 @@
             # Show any conflicts with periods of actual attendance.
 
             for p in have_conflict(freebusy, periods, True):
-                if (p.uid != uid or p.recurrenceid != recurrenceid) and p.transp != "ORG":
+                if (p.uid != uid or (recurrenceid and p.recurrenceid) and p.recurrenceid != recurrenceid) and p.transp != "ORG":
                     conflicts.append(p)
 
         conflicts.sort()