# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1265226854 -3600
# Node ID 155ceab3c1222ec40a2f72f4b60f008c00aa71ef
# Parent  0436824aa4a06a336772d6467adfb41f0501ea9c
Introduced basic and advanced modes to the new event action.

diff -r 0436824aa4a0 -r 155ceab3c122 README.txt
--- a/README.txt	Wed Feb 03 20:52:46 2010 +0100
+++ b/README.txt	Wed Feb 03 20:54:14 2010 +0100
@@ -163,6 +163,7 @@
   * Added support for multiple events on a single event page.
   * Introduced EventPage and Event abstractions in order to better support new
     features.
+  * Introduced basic and advanced modes to the EventAggregatorNewEvent action.
 
 New in EventAggregator 0.4 (Changes since EventAggregator 0.3)
 --------------------------------------------------------------
diff -r 0436824aa4a0 -r 155ceab3c122 actions/EventAggregatorNewEvent.py
--- a/actions/EventAggregatorNewEvent.py	Wed Feb 03 20:52:46 2010 +0100
+++ b/actions/EventAggregatorNewEvent.py	Wed Feb 03 20:54:14 2010 +0100
@@ -39,6 +39,12 @@
         request = self.request
         form = request.form
 
+        # Handle advanced and basic forms.
+
+        show_advanced = form.get("advanced") and not form.get("basic")
+
+        # Prepare the category list.
+
         category_list = []
         category_pagenames = form.get("category", [])
 
@@ -48,7 +54,16 @@
                 request):
 
             selected = self._get_selected_for_list(category_pagename, category_pagenames)
-            category_list.append('<option value="%s" %s>%s</option>' % (category_pagename, selected, category_name))
+
+            # In the advanced view, populate a menu.
+
+            if show_advanced:
+                category_list.append('<option value="%s" %s>%s</option>' % (category_pagename, selected, category_name))
+
+            # In the basic view, use hidden fields.
+
+            elif selected:
+                category_list.append('<input value="%s" name="category" type="hidden" />' % category_pagename)
 
         # Initialise month lists.
 
@@ -93,9 +108,13 @@
             "template_default"      : form.get("template", [""])[0] or template_default,
             "parent_label"          : _("Parent page"),
             "parent_default"        : form.get("parent", [""])[0],
+            "advanced_label"        : _("Show advanced options"),
+            "basic_label"           : _("Show basic options"),
             }
 
-        return '''
+        # Prepare the output HTML.
+
+        html = '''
 <table>
     <tr>
         <td class="label"><label>%(title_label)s</label></td>
@@ -104,14 +123,6 @@
         </td>
     </tr>
     <tr>
-        <td class="label"><label>%(category_label)s</label></td>
-        <td class="content">
-            <select multiple="multiple" name="category">
-                %(category_list)s
-            </select>
-        </td>
-    </tr>
-    <tr>
         <td class="label"><label>%(start_label)s</label></td>
         <td>
             <input name="start-day" type="text" value="%(start_day_default)s" size="2" />
@@ -136,6 +147,24 @@
         <td>
             <input name="description" type="text" size="40" value="%(description_default)s" />
         </td>
+    </tr>''' % d
+
+        if show_advanced:
+            html += '''
+    <tr>
+        <td></td>
+        <td>
+            <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">
+            <select multiple="multiple" name="category">
+                %(category_list)s
+            </select>
+        </td>
     </tr>
     <tr>
         <td class="label"><label>%(template_label)s</label></td>
@@ -155,8 +184,27 @@
             %(buttons_html)s
         </td>
     </tr>
-</table>
-''' % d
+</table>''' % d
+        else:
+            html += '''
+    <tr>
+        <td></td>
+        <td>
+            <input name="advanced" type="submit" value="%(advanced_label)s" />
+            %(category_list)s
+            <input name="parent" type="hidden" value="%(parent_default)s" />
+            <input name="template" type="hidden" value="%(template_default)s" />
+        </td>
+    </tr>
+    <tr>
+        <td></td>
+        <td class="buttons">
+            %(buttons_html)s
+        </td>
+    </tr>
+</table>''' % d
+
+        return html
 
     def do_action(self):