# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1269214054 -3600
# Node ID f25c56d48bdb2483c478e80939d3fbe0239fcd0f
# Parent  6138769c9ca221ba6b6d3f91041556e543dd6a72
Added support in the new event action for explicit time zones, simplifying the
interface so that times are handled collectively (start plus end times), with
time zone/regime information applying only individually where UTC offsets are
concerned.
Made various end time and date fields take information from the start fields by
default.
Fixed the action's HTML before the link details in the table.
Added location information to the example template.
Updated the release notes.

diff -r 6138769c9ca2 -r f25c56d48bdb README.txt
--- a/README.txt	Wed Mar 17 01:36:28 2010 +0100
+++ b/README.txt	Mon Mar 22 00:27:34 2010 +0100
@@ -213,6 +213,7 @@
     replace the link information provided by the RSS and iCalendar summaries.
   * Fixed the production of the summaries when pages with no available edit
     log information are to be included.
+  * Added support for event times and time zone/regime information.
 
 New in EventAggregator 0.5 (Changes since EventAggregator 0.4)
 --------------------------------------------------------------
diff -r 6138769c9ca2 -r f25c56d48bdb actions/EventAggregatorNewEvent.py
--- a/actions/EventAggregatorNewEvent.py	Wed Mar 17 01:36:28 2010 +0100
+++ b/actions/EventAggregatorNewEvent.py	Mon Mar 22 00:27:34 2010 +0100
@@ -15,6 +15,11 @@
 from MoinMoin.PageEditor import PageEditor
 import EventAggregatorSupport
 
+try:
+    import pytz
+except ImportError:
+    pytz = None
+
 Dependencies = ['pages']
 
 # Action class and supporting functions.
@@ -41,9 +46,18 @@
         request = self.request
         form = request.form
 
-        # Handle advanced and basic forms.
+        # Handle advanced and basic forms, and enable/disable certain fields.
 
         show_advanced = form.get("advanced") and not form.get("basic")
+        show_end_date = form.get("end-day") and not form.get("hide-end-date") or form.get("show-end-date")
+        show_times = (form.get("start-hour") or form.get("end-hour")) and not form.get("hide-times") or form.get("show-times")
+
+        show_zone_regime = form.get("regime") and not form.get("show-offsets") and \
+            not form.get("hide-zone") or form.get("show-regime")
+        show_zone_offsets = form.get("start-offset") and not form.get("show-regime") and \
+            not form.get("hide-zone") or form.get("show-offsets")
+
+        show_zones = show_zone_regime or show_zone_offsets
 
         # Prepare the category list.
 
@@ -79,45 +93,13 @@
                     del topics[i]
                     break
 
-        # Initialise hour and minute lists.
-
-        start_hour_list = []
-        start_hour_list.append('<option value=""></option>')
-        start_minute_list = []
-        start_minute_list.append('<option value=""></option>')
-        end_hour_list = []
-        end_hour_list.append('<option value=""></option>')
-        end_minute_list = []
-        end_minute_list.append('<option value=""></option>')
-
-        start_hour = self._get_input(form, "start-hour")
-        end_hour = self._get_input(form, "end-hour")
-        start_minute = self._get_input(form, "start-minute")
-        end_minute = self._get_input(form, "end-minute")
-
-        # Prepare hour and minute lists, selecting specified values.
-
-        for hour in range(0, 24):
-            selected = self._get_selected(hour, start_hour)
-            start_hour_list.append('<option value="%02d" %s>%02d</option>' % (hour, selected, hour))
-            selected = self._get_selected(hour, end_hour)
-            end_hour_list.append('<option value="%02d" %s>%02d</option>' % (hour, selected, hour))
-
-        for minute in range(0, 60):
-            selected = self._get_selected(minute, start_minute)
-            start_minute_list.append('<option value="%02d" %s>%02d</option>' % (minute, selected, minute))
-            selected = self._get_selected(minute, end_minute)
-            end_minute_list.append('<option value="%02d" %s>%02d</option>' % (minute, selected, minute))
-
         # Initialise month lists.
 
         start_month_list = []
-        start_month_list.append('<option value=""></option>')
         end_month_list = []
-        end_month_list.append('<option value=""></option>')
 
-        start_month = self._get_input(form, "start-month", 0)
-        end_month = self._get_input(form, "end-month", 0)
+        start_month = self._get_input(form, "start-month", EventAggregatorSupport.getCurrentMonth())
+        end_month = self._get_input(form, "end-month", start_month)
 
         # Prepare month lists, selecting specified months.
 
@@ -128,6 +110,20 @@
             selected = self._get_selected(month, end_month)
             end_month_list.append('<option value="%02d" %s>%s</option>' % (month, selected, month_label))
 
+        # Initialise regime lists.
+
+        regime_list = []
+        regime_list.append('<option value=""></option>')
+
+        regime = form.get("regime", [None])[0]
+
+        # Prepare regime lists, selecting specified regimes.
+
+        if pytz is not None:
+            for pytz_regime in pytz.common_timezones:
+                selected = self._get_selected(pytz_regime, regime)
+                regime_list.append('<option value="%s" %s>%s</option>' % (pytz_regime, selected, pytz_regime))
+
         # Permitting configuration of the template name.
 
         template_default = getattr(request.cfg, "event_aggregator_new_event_template", "EventTemplate")
@@ -138,24 +134,38 @@
             "category_list"         : "\n".join(category_list),
 
             "start_month_list"      : "\n".join(start_month_list),
-            "start_hour_list"       : "\n".join(start_hour_list),
-            "start_minute_list"     : "\n".join(start_minute_list),
+            "end_month_list"        : "\n".join(end_month_list),
+
+            "regime_list"           : "\n".join(regime_list),
+            "use_regime_label"      : _("Using local time"),
 
-            "end_month_list"        : "\n".join(end_month_list),
-            "end_hour_list"         : "\n".join(end_hour_list),
-            "end_minute_list"       : "\n".join(end_minute_list),
+            "show_end_date_label"   : _("Specify end date"),
+            "hide_end_date_label"   : _("End event on same day"),
+
+            "show_times_label"      : _("Specify times"),
+            "hide_times_label"      : _("No start and end times"),
+
+            "show_offsets_label"    : _("Specify UTC offsets"),
+            "show_regime_label"     : _("Specify location"),
+            "hide_zone_label"       : _("Make times apply everywhere"),
 
             "start_label"           : _("Start date (day, month, year)"),
             "start_day_default"     : form.get("start-day", [""])[0],
             "start_year_default"    : form.get("start-year", [""])[0] or EventAggregatorSupport.getCurrentYear(),
             "start_time_label"      : _("Start time (hour, minute, second)"),
+            "start_hour_default"    : form.get("start-hour", [""])[0],
+            "start_minute_default"  : form.get("start-minute", [""])[0],
             "start_second_default"  : form.get("start-second", [""])[0],
+            "start_offset_default"  : form.get("start-offset", [""])[0],
 
             "end_label"             : _("End date (day, month, year) - if different"),
-            "end_day_default"       : form.get("end-day", [""])[0],
-            "end_year_default"      : form.get("end-year", [""])[0],
+            "end_day_default"       : form.get("end-day", [""])[0] or form.get("start-day", [""])[0],
+            "end_year_default"      : form.get("end-year", [""])[0] or form.get("start-year", [""])[0],
             "end_time_label"        : _("End time (hour, minute, second)"),
+            "end_hour_default"      : form.get("end-hour", [""])[0],
+            "end_minute_default"    : form.get("end-minute", [""])[0],
             "end_second_default"    : form.get("end-second", [""])[0],
+            "end_offset_default"    : form.get("end-offset", [""])[0] or form.get("start-offset", [""])[0],
 
             "title_label"           : _("Event title/summary"),
             "title_default"         : form.get("title", [""])[0],
@@ -176,7 +186,7 @@
             "parent_default"        : form.get("parent", [""])[0],
 
             "advanced_label"        : _("Show advanced options"),
-            "basic_label"           : _("Show basic options"),
+            "basic_label"           : _("Hide advanced options"),
             }
 
         # Prepare the output HTML.
@@ -185,35 +195,28 @@
 <table>
     <tr>
         <td class="label"><label>%(title_label)s</label></td>
-        <td>
+        <td colspan="2">
             <input name="title" type="text" size="40" value="%(title_default)s" />
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(start_label)s</label></td>
-        <td>
+        <td colspan="2" style="white-space: nowrap">
             <input name="start-day" type="text" value="%(start_day_default)s" size="2" />
             <select name="start-month">
                 %(start_month_list)s
             </select>
             <input name="start-year" type="text" value="%(start_year_default)s" size="4" />
         </td>
-    </tr>
-    <tr>
-        <td class="label"><label>%(start_time_label)s</label></td>
-        <td>
-            <select name="start-hour">
-                %(start_hour_list)s
-            </select>
-            <select name="start-minute">
-                %(start_minute_list)s
-            </select>
-            <input name="start-second" type="text" value="%(start_second_default)s" size="2" />
-        </td>
-    </tr>
+    </tr>''' % d
+
+        # End date controls.
+
+        if show_end_date:
+            html += '''
     <tr>
         <td class="label"><label>%(end_label)s</label></td>
-        <td>
+        <td colspan="2" style="white-space: nowrap">
             <input name="end-day" type="text" value="%(end_day_default)s" size="2" />
             <select name="end-month">
                 %(end_month_list)s
@@ -222,33 +225,156 @@
         </td>
     </tr>
     <tr>
-        <td class="label"><label>%(end_time_label)s</label></td>
+        <td class="label">
+            <input name="hide-end-date" type="submit" value="%(hide_end_date_label)s" />
+        </td>
+    </tr>''' % d
+        else:
+            html += '''
+    <tr>
+        <td class="label">
+            <input name="show-end-date" type="submit" value="%(show_end_date_label)s" />
+        </td>
+    </tr>''' % d
+
+        # Generic time information.
+
+        if show_times:
+
+            # Start time controls.
+
+            html += '''
+    <tr>
+        <td class="label"><label>%(start_time_label)s</label></td>
+        <td style="white-space: nowrap">
+            <input name="start-hour" type="text" value="%(start_hour_default)s" size="2" maxlength="2" />
+            <input name="start-minute" type="text" value="%(start_minute_default)s" size="2" maxlength="2" />
+            <input name="start-second" type="text" value="%(start_second_default)s" size="2" maxlength="2" />
+        </td>''' % d
+
+            # Offset information displayed.
+
+            if show_zone_offsets:
+                html += '''
         <td>
-            <select name="end-hour">
-                %(end_hour_list)s
+            UTC <input name="start-offset" type="text" value="%(start_offset_default)s" size="6" maxlength="6" />
+        </td>''' % d
+
+            # Regime information displayed.
+
+            elif show_zone_regime:
+                html += '''
+        <td>
+            %(use_regime_label)s
+        </td>''' % d
+
+            html += '''
+    </tr>'''
+
+            # End time controls.
+
+            html += '''
+    <tr>
+        <td class="label"><label>%(end_time_label)s</label></td>
+        <td style="white-space: nowrap">
+            <input name="end-hour" type="text" value="%(end_hour_default)s" size="2" maxlength="2" />
+            <input name="end-minute" type="text" value="%(end_minute_default)s" size="2" maxlength="2" />
+            <input name="end-second" type="text" value="%(end_second_default)s" size="2" maxlength="2" />
+        </td>''' % d
+
+            # Offset information displayed.
+
+            if show_zone_offsets:
+                html += '''
+        <td>
+            UTC <input name="end-offset" type="text" value="%(end_offset_default)s" size="6" maxlength="6" />
+        </td>''' % d
+
+            # Regime information displayed.
+
+            elif show_zone_regime:
+                html += '''
+        <td>
+            <select name="regime">
+                %(regime_list)s
             </select>
-            <select name="end-minute">
-                %(end_minute_list)s
-            </select>
-            <input name="end-second" type="text" value="%(end_second_default)s" size="2" />
-        </td>
+        </td>''' % d
+
+            # Controls for removing times.
+
+            html += '''
     </tr>
     <tr>
+        <td class="label">
+            <input name="hide-times" type="submit" value="%(hide_times_label)s" />
+        </td>
+        <td></td>''' % d
+
+            # Time zone controls.
+
+            if show_zones:
+
+                # Offset information displayed.
+
+                if show_zone_offsets:
+                    html += '''
+        <td>
+            <input name="show-regime" type="submit" value="%(show_regime_label)s" />''' % d
+
+                # Regime information displayed.
+
+                elif show_zone_regime:
+                    html += '''
+        <td>
+            <input name="show-offsets" type="submit" value="%(show_offsets_label)s" />''' % d
+
+                # To remove zone information.
+
+                html += '''
+            <input name="hide-zone" type="submit" value="%(hide_zone_label)s" />
+        </td>''' % d
+
+            # No time zone information shown.
+
+            else:
+                html += '''
+        <td>
+            <input name="show-regime" type="submit" value="%(show_regime_label)s" />
+            <input name="show-offsets" type="submit" value="%(show_offsets_label)s" />
+        </td>''' % d
+
+            html += '''
+    </tr>'''
+
+        # Controls for adding times.
+
+        else:
+            html += '''
+    <tr>
+        <td class="label">
+            <input name="show-times" type="submit" value="%(show_times_label)s" />
+        </td>
+    </tr>''' % d
+
+
+        # Various basic controls.
+
+        html += '''
+    <tr>
         <td class="label"><label>%(description_label)s</label></td>
-        <td>
+        <td colspan="2">
             <input name="description" type="text" size="40" value="%(description_default)s" />
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(location_label)s</label></td>
-        <td>
+        <td colspan="2">
             <input name="location" type="text" size="40" value="%(location_default)s" />
         </td>
     </tr>
     <tr>
-    <tr>
         <td class="label"><label>%(link_label)s</label></td>
-        <td>
+        <td colspan="2">
             <input name="link" type="text" size="40" value="%(link_default)s" />
         </td>
     </tr>''' % d
@@ -261,7 +387,7 @@
             html += '''
     <tr>
         <td class="label"><label>%(topics_label)s</label></td>
-        <td>
+        <td colspan="2">
             <input name="topics" type="text" size="20" value="%(topic)s" />
             <input name="remove-topic-%(topic_number)s" type="submit" value="%(remove_topic_label)s" />
         </td>
@@ -270,7 +396,7 @@
         html += '''
     <tr>
         <td></td>
-        <td>
+        <td colspan="2">
             <input name="add-topic" type="submit" value="%(add_topic_label)s" />
         </td>
     </tr>''' % d
@@ -281,14 +407,14 @@
             html += '''
     <tr>
         <td></td>
-        <td>
+        <td colspan="2">
             <input name="basic" type="submit" value="%(basic_label)s" />
             <input name="advanced" type="hidden" value="true" />
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(category_label)s</label></td>
-        <td class="content">
+        <td colspan="2" class="content">
             <select multiple="multiple" name="category">
                 %(category_list)s
             </select>
@@ -296,19 +422,19 @@
     </tr>
     <tr>
         <td class="label"><label>%(template_label)s</label></td>
-        <td>
+        <td colspan="2">
             <input name="template" type="text" size="40" value="%(template_default)s" />
         </td>
     </tr>
     <tr>
         <td class="label"><label>%(parent_label)s</label></td>
-        <td>
+        <td colspan="2">
             <input name="parent" type="text" size="40" value="%(parent_default)s" />
         </td>
     </tr>
     <tr>
         <td></td>
-        <td class="buttons">
+        <td colspan="2" class="buttons">
             %(buttons_html)s
         </td>
     </tr>
@@ -317,7 +443,7 @@
             html += '''
     <tr>
         <td></td>
-        <td>
+        <td colspan="2">
             <input name="advanced" type="submit" value="%(advanced_label)s" />
             %(category_list)s
             <input name="parent" type="hidden" value="%(parent_default)s" />
@@ -326,7 +452,7 @@
     </tr>
     <tr>
         <td></td>
-        <td class="buttons">
+        <td colspan="2" class="buttons">
             %(buttons_html)s
         </td>
     </tr>
@@ -377,8 +503,12 @@
         link = form.get("link", [None])[0]
         topics = form.get("topics", [])
 
-        start_zone = form.get("start-zone", [None])[0]
-        end_zone = form.get("end-zone", [None])[0]
+        regime = form.get("regime", [None])[0]
+        start_offset = form.get("start-offset", [None])[0]
+        end_offset = form.get("end-offset", [None])[0]
+
+        start_zone = regime or start_offset
+        end_zone = regime or end_offset
 
         # Validate certain fields.
 
diff -r 6138769c9ca2 -r f25c56d48bdb pages/EventTemplate
--- a/pages/EventTemplate	Wed Mar 17 01:36:28 2010 +0100
+++ b/pages/EventTemplate	Mon Mar 22 00:27:34 2010 +0100
@@ -3,6 +3,7 @@
  Topics:: topics
  Description:: a brief description of the event for the RSS feed
  Link:: a link to a Web site for the event
+ Location:: the event location
 ## Summary:: summary/title
 ##           To choose a title or summary different to the page name, or to
 ##           provide a specific form of the page name, uncomment the above entry