1.1 --- a/imipweb/event.py Sat Oct 24 19:45:43 2015 +0200
1.2 +++ b/imipweb/event.py Sat Oct 24 22:19:17 2015 +0200
1.3 @@ -216,7 +216,7 @@
1.4 page.table(class_="object", cellspacing=5, cellpadding=5)
1.5 page.thead()
1.6 page.tr()
1.7 - page.th("Event", class_="mainheading", colspan=2)
1.8 + page.th("Event", class_="mainheading", colspan=3)
1.9 page.tr.close()
1.10 page.thead.close()
1.11 page.tbody()
1.12 @@ -262,7 +262,7 @@
1.13 # Replaced occurrences link to their replacements.
1.14
1.15 if replaced:
1.16 - page.td(class_="objectvalue %s replaced" % field, rowspan=2)
1.17 + page.td(class_="objectvalue %s replaced" % field, rowspan=2, colspan=2)
1.18 page.a("First occurrence replaced by a separate event", href=self.link_to(self.uid, replaced))
1.19 page.td.close()
1.20
1.21 @@ -271,7 +271,7 @@
1.22 # NOTE: reinstating the occurrence.
1.23
1.24 elif excluded:
1.25 - page.td(class_="objectvalue %s excluded" % field, rowspan=2)
1.26 + page.td(class_="objectvalue %s excluded" % field, rowspan=2, colspan=2)
1.27 page.add("First occurrence excluded")
1.28 page.td.close()
1.29
1.30 @@ -281,7 +281,7 @@
1.31
1.32 if name == "DTEND":
1.33 page.tr()
1.34 - page.td()
1.35 + page.td(colspan=2)
1.36 self.control("recur-add", "submit", "add", id="recur-add", class_="add")
1.37 page.label("Add a recurrence", for_="recur-add", class_="add")
1.38 page.td.close()
1.39 @@ -292,7 +292,7 @@
1.40 elif name == "SUMMARY":
1.41 value = args.get("summary", [self.obj.get_value(name)])[0]
1.42
1.43 - page.td(class_="objectvalue summary")
1.44 + page.td(class_="objectvalue summary", colspan=2)
1.45 if self.is_organiser():
1.46 self.control("summary", "text", value, size=80)
1.47 else:
1.48 @@ -322,7 +322,7 @@
1.49 if not first:
1.50 page.tr()
1.51
1.52 - page.td()
1.53 + page.td(colspan=2)
1.54 self.control("add", "submit", "add", id="add", class_="add")
1.55 page.label("Add attendee", for_="add", class_="add")
1.56 page.td.close()
1.57 @@ -339,7 +339,7 @@
1.58 else:
1.59 first = False
1.60
1.61 - page.td(class_="objectvalue %s" % field)
1.62 + page.td(class_="objectvalue %s" % field, colspan=2)
1.63 if name == "ORGANIZER":
1.64 page.add(get_verbose_address(value, attr))
1.65 else:
1.66 @@ -399,6 +399,9 @@
1.67 else:
1.68 page.span(dict(self.partstat_items).get(partstat, ""), class_="partstat")
1.69
1.70 + page.td.close()
1.71 + page.td()
1.72 +
1.73 # Permit organisers to remove attendees.
1.74
1.75 if self.can_remove_attendee(attendee_uri) or self.is_organiser():