1.1 --- a/htdocs/styles.css Tue Apr 07 00:36:47 2015 +0200
1.2 +++ b/htdocs/styles.css Tue Apr 07 00:38:22 2015 +0200
1.3 @@ -106,6 +106,7 @@
1.4 font-weight: bold;
1.5 }
1.6
1.7 +table.recurrence .replaced,
1.8 table.conflicts .replaced {
1.9 text-decoration: line-through;
1.10 }
1.11 @@ -230,6 +231,12 @@
1.12 float: right;
1.13 }
1.14
1.15 +p label.add,
1.16 +p label.remove,
1.17 +p label.removed {
1.18 + float: none;
1.19 +}
1.20 +
1.21 .dt.disabled label,
1.22 .dt.enabled label,
1.23 label.add,
2.1 --- a/imipweb/event.py Tue Apr 07 00:36:47 2015 +0200
2.2 +++ b/imipweb/event.py Tue Apr 07 00:38:22 2015 +0200
2.3 @@ -808,7 +808,7 @@
2.4 # Show any conflicts with periods of actual attendance.
2.5
2.6 for p in have_conflict(freebusy, periods, True):
2.7 - if (p.uid != uid or p.recurrenceid != recurrenceid) and p.transp != "ORG":
2.8 + if (p.uid != uid or (recurrenceid and p.recurrenceid) and p.recurrenceid != recurrenceid) and p.transp != "ORG":
2.9 conflicts.append(p)
2.10
2.11 conflicts.sort()