# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1445812192 -3600
# Node ID 842f578aba138b68b29ccf1c0eb3d5442656a213
# Parent  6abcbabbe3749e85f1a11e26e2ebe38e77dd662e
Reordered and slightly restyled the time navigation controls.

diff -r 6abcbabbe374 -r 842f578aba13 htdocs/styles.css
--- a/htdocs/styles.css	Sun Oct 25 23:23:49 2015 +0100
+++ b/htdocs/styles.css	Sun Oct 25 23:29:52 2015 +0100
@@ -324,6 +324,8 @@
 
 label.earlier,
 label.later,
+label.earlier-events,
+label.later-events,
 label.day,
 label.timepoint,
 label.newevent,
@@ -362,6 +364,8 @@
 
 label.earlier,
 label.later,
+label.earlier-events,
+label.later-events,
 .dt.disabled label,
 .dt.enabled label,
 .date.disabled label,
@@ -390,6 +394,8 @@
 
 label.earlier,
 label.later,
+label.earlier-events,
+label.later-events,
 label.hidebusy,
 label.showdays,
 label.reset {
@@ -404,6 +410,14 @@
     border-left: 1em solid #f85;
 }
 
+label.earlier-events {
+    border-left: 1em solid #d52;
+}
+
+label.later-events {
+    border-left: 1em solid #d52;
+}
+
 label.showdays {
     border-left: 1em solid #faa; /* th.participantheading background-color */
 }
diff -r 6abcbabbe374 -r 842f578aba13 imipweb/calendar.py
--- a/imipweb/calendar.py	Sun Oct 25 23:23:49 2015 +0100
+++ b/imipweb/calendar.py	Sun Oct 25 23:29:52 2015 +0100
@@ -322,9 +322,11 @@
         page.p(id_="time-navigation")
 
         if view_start:
+            page.input(name="start", type="hidden", value=format_datetime(view_start))
+
             if last_preceding:
                 preceding_start = last_preceding - duration
-                page.label("Show earlier events", for_="earlier-events", class_="earlier")
+                page.label("Show earlier events", for_="earlier-events", class_="earlier-events")
                 page.input(name="earlier-events", id_="earlier-events", type="submit")
                 page.input(name="earlier-events-start", type="hidden", value=format_datetime(preceding_start))
                 page.input(name="earlier-events-end", type="hidden", value=format_datetime(last_preceding))
@@ -335,22 +337,21 @@
             page.input(name="earlier-start", type="hidden", value=format_datetime(earlier_start))
             page.input(name="earlier-end", type="hidden", value=format_datetime(view_start))
 
-            page.input(name="start", type="hidden", value=format_datetime(view_start))
-
         if view_end:
-            if first_following:
-                following_end = first_following + duration
-                page.label("Show later events", for_="later-events", class_="later")
-                page.input(name="later-events", id_="later-events", type="submit")
-                page.input(name="later-events-start", type="hidden", value=format_datetime(first_following))
-                page.input(name="later-events-end", type="hidden", value=format_datetime(following_end))
+            page.input(name="end", type="hidden", value=format_datetime(view_end))
 
             later_end = view_end + duration
             page.label("Show later", for_="later", class_="later")
             page.input(name="later", id_="later", type="submit")
             page.input(name="later-start", type="hidden", value=format_datetime(view_end))
             page.input(name="later-end", type="hidden", value=format_datetime(later_end))
-            page.input(name="end", type="hidden", value=format_datetime(view_end))
+
+            if first_following:
+                following_end = first_following + duration
+                page.label("Show later events", for_="later-events", class_="later-events")
+                page.input(name="later-events", id_="later-events", type="submit")
+                page.input(name="later-events-start", type="hidden", value=format_datetime(first_following))
+                page.input(name="later-events-end", type="hidden", value=format_datetime(following_end))
 
         page.p.close()