# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1445717957 -7200
# Node ID 8b4665be51eada3eb50469c003b96ae3018eda5d
# Parent  a6b95075ee829d5346d2f47dad7b5856c7486ba9
Improved the event table layout, making a separate column for actions, and
giving the participation status right alignment.

diff -r a6b95075ee82 -r 8b4665be51ea htdocs/styles.css
--- a/htdocs/styles.css	Sat Oct 24 19:45:43 2015 +0200
+++ b/htdocs/styles.css	Sat Oct 24 22:19:17 2015 +0200
@@ -125,6 +125,7 @@
 }
 
 .partstat {
+    float: right;
     margin-left: 1em;
     background-color: #eee;
 }
diff -r a6b95075ee82 -r 8b4665be51ea imipweb/event.py
--- a/imipweb/event.py	Sat Oct 24 19:45:43 2015 +0200
+++ b/imipweb/event.py	Sat Oct 24 22:19:17 2015 +0200
@@ -216,7 +216,7 @@
         page.table(class_="object", cellspacing=5, cellpadding=5)
         page.thead()
         page.tr()
-        page.th("Event", class_="mainheading", colspan=2)
+        page.th("Event", class_="mainheading", colspan=3)
         page.tr.close()
         page.thead.close()
         page.tbody()
@@ -262,7 +262,7 @@
                     # Replaced occurrences link to their replacements.
 
                     if replaced:
-                        page.td(class_="objectvalue %s replaced" % field, rowspan=2)
+                        page.td(class_="objectvalue %s replaced" % field, rowspan=2, colspan=2)
                         page.a("First occurrence replaced by a separate event", href=self.link_to(self.uid, replaced))
                         page.td.close()
 
@@ -271,7 +271,7 @@
                     # NOTE: reinstating the occurrence.
 
                     elif excluded:
-                        page.td(class_="objectvalue %s excluded" % field, rowspan=2)
+                        page.td(class_="objectvalue %s excluded" % field, rowspan=2, colspan=2)
                         page.add("First occurrence excluded")
                         page.td.close()
 
@@ -281,7 +281,7 @@
 
                 if name == "DTEND":
                     page.tr()
-                    page.td()
+                    page.td(colspan=2)
                     self.control("recur-add", "submit", "add", id="recur-add", class_="add")
                     page.label("Add a recurrence", for_="recur-add", class_="add")
                     page.td.close()
@@ -292,7 +292,7 @@
             elif name == "SUMMARY":
                 value = args.get("summary", [self.obj.get_value(name)])[0]
 
-                page.td(class_="objectvalue summary")
+                page.td(class_="objectvalue summary", colspan=2)
                 if self.is_organiser():
                     self.control("summary", "text", value, size=80)
                 else:
@@ -322,7 +322,7 @@
                 if not first:
                     page.tr()
 
-                page.td()
+                page.td(colspan=2)
                 self.control("add", "submit", "add", id="add", class_="add")
                 page.label("Add attendee", for_="add", class_="add")
                 page.td.close()
@@ -339,7 +339,7 @@
                     else:
                         first = False
 
-                    page.td(class_="objectvalue %s" % field)
+                    page.td(class_="objectvalue %s" % field, colspan=2)
                     if name == "ORGANIZER":
                         page.add(get_verbose_address(value, attr))
                     else:
@@ -399,6 +399,9 @@
         else:
             page.span(dict(self.partstat_items).get(partstat, ""), class_="partstat")
 
+        page.td.close()
+        page.td()
+
         # Permit organisers to remove attendees.
 
         if self.can_remove_attendee(attendee_uri) or self.is_organiser():