# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1238348039 -7200
# Node ID b1eb7bf1655be6db6f5ba9de90ae37688d029068
# Parent  c74ce0a32ccf4334f4f0fe2a2da00270a48e7a0d
Moved month and day label generation into the support library.
Fixed the action field sizes (since the content CSS class tends to force input
elements to 100% width).

diff -r c74ce0a32ccf -r b1eb7bf1655b EventAggregatorSupport.py
--- a/EventAggregatorSupport.py	Sun Mar 29 19:19:09 2009 +0200
+++ b/EventAggregatorSupport.py	Sun Mar 29 19:33:59 2009 +0200
@@ -16,6 +16,12 @@
 
 __version__ = "0.1"
 
+# Date labels.
+
+month_labels = ["January", "February", "March", "April", "May", "June",
+    "July", "August", "September", "October", "November", "December"]
+weekday_labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
+
 # Regular expressions where MoinMoin does not provide the required support.
 
 category_regexp = None
@@ -523,4 +529,16 @@
 
     return page.split_title(force=1).replace("_", " ").replace("/", u" » ")
 
+def getMonthLabel(month):
+
+    "Return an unlocalised label for the given 'month'."
+
+    return month_labels[month - 1] # zero-based labels
+
+def getDayLabel(weekday):
+
+    "Return an unlocalised label for the given 'weekday'."
+
+    return weekday_labels[weekday]
+
 # vim: tabstop=4 expandtab shiftwidth=4
diff -r c74ce0a32ccf -r b1eb7bf1655b actions/EventAggregatorSummary.py
--- a/actions/EventAggregatorSummary.py	Sun Mar 29 19:19:09 2009 +0200
+++ b/actions/EventAggregatorSummary.py	Sun Mar 29 19:33:59 2009 +0200
@@ -56,13 +56,13 @@
     </tr>
     <tr>
         <td class="label"><label>%(start_label)s</label></td>
-        <td class="content">
+        <td>
             <input name="start" type="text" value="%(start_default)s" size="12" />
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(end_label)s</label></td>
-        <td class="content">
+        <td>
             <input name="end" type="text" value="%(end_default)s" size="12" />
         </td>
     </tr>
diff -r c74ce0a32ccf -r b1eb7bf1655b macros/EventAggregator.py
--- a/macros/EventAggregator.py	Sun Mar 29 19:19:09 2009 +0200
+++ b/macros/EventAggregator.py	Sun Mar 29 19:33:59 2009 +0200
@@ -19,11 +19,6 @@
 
 Dependencies = ['pages']
 
-# Date labels.
-
-month_labels = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
-weekday_labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
-
 # HTML-related functions.
 
 def getColour(s):
@@ -167,7 +162,7 @@
             # Either write a month heading or produce a link for navigable
             # calendars.
 
-            month_label = _(month_labels[month - 1]) # zero-based labels
+            month_label = _(EventAggregatorSupport.getMonthLabel(month))
 
             if calendar_name is not None:
 
@@ -230,7 +225,7 @@
 
             for weekday in range(0, 7):
                 output.append(fmt.table_cell(on=1, attrs={"class" : "event-weekday-heading"}))
-                output.append(fmt.text(_(weekday_labels[weekday])))
+                output.append(fmt.text(_(EventAggregatorSupport.getDayLabel(weekday))))
                 output.append(fmt.table_cell(on=0))
 
             output.append(fmt.table_row(on=0))
@@ -406,10 +401,12 @@
 
         elif mode == "list":
 
+            month_label = _(EventAggregatorSupport.getMonthLabel(month))
+
             output.append(fmt.listitem(on=1, attr={"class" : "event-listings-month"}))
             output.append(fmt.div(on=1, attr={"class" : "event-listings-month-heading"}))
             output.append(fmt.span(on=1))
-            output.append(fmt.text(_(month_labels[month - 1]))) # zero-based labels
+            output.append(fmt.text(month_label))
             output.append(fmt.span(on=0))
             output.append(fmt.text(" "))
             output.append(fmt.span(on=1))