include the popcal in Date field editing and search fields by default

Author: Richard Jones

CHANGES.txt

@@ -9,6 +9,8 @@ Feature:
   id is specified in the Subject
 - added StringHTMLProperty wrapped() method to wrap long lines in issue
   display
+- include the popcal in Date field editing and search fields by default
+
 
 Fixed:
 - Verbose option for import and export (sf bug 1505645)

doc/customizing.txt

@@ -2,7 +2,7 @@
 Customising Roundup
 ===================
 
-:Version: $Revision: 1.199 $
+:Version: $Revision: 1.200 $
 
 .. This document borrows from the ZopeBook section on ZPT. The original is at:
    http://www.zope.org/Documentation/Books/ZopeBook/current/ZPT.stx
@@ -2051,6 +2051,10 @@ field       render an appropriate form edit field for the property - for
               format string argument as supplied to the ``pretty`` method
               below.
 
+            popcal (Date properties only)
+              Include the Javascript-based popup calendar for date
+              selection. Defaults to on.
+
 stext       only on String properties - render the value of the property
             as StructuredText (requires the StructureText module to be
             installed separately)

roundup/cgi/templating.py

@@ -1513,11 +1513,14 @@ def now(self, str_interval=None):
         return DateHTMLProperty(self._client, self._classname, self._nodeid,
             self._prop, self._formname, ret)
 
-    def field(self, size=30, default=None, format=_marker):
+    def field(self, size=30, default=None, format=_marker, popcal=True):
         '''Render a form edit field for the property
 
         If not editable, just display the value via plain().
 
+        If "popcal" then include the Javascript calendar editor.
+        Default=yes.
+
         The format string is a standard python strftime format string.
         '''
         if not self.is_edit_ok():
@@ -1566,7 +1569,10 @@ def field(self, size=30, default=None, format=_marker):
                 value = value.pretty(format)
 
         value = cgi.escape(str(value), 1)
-        return self.input(name=self._formname, value=value, size=size)
+        s = self.input(name=self._formname, value=value, size=size)
+        if popcal:
+            s += self.popcal()
+        return s
 
     def reldate(self, pretty=1):
         ''' Render the interval between the date and now.

templates/classic/html/issue.search.html

@@ -14,6 +14,7 @@
    group_on python:request.group[1] or 'priority';
 
    search_input templates/page/macros/search_input;
+   search_date templates/page/macros/search_date;
    column_input templates/page/macros/column_input;
    sort_input templates/page/macros/sort_input;
    group_input templates/page/macros/group_input;
@@ -64,7 +65,7 @@
 
 <tr tal:define="name string:creation">
   <th i18n:translate="">Creation Date:</th>
-  <td metal:use-macro="search_input"></td>
+  <td metal:use-macro="search_date"></td>
   <td metal:use-macro="column_input"></td>
   <td metal:use-macro="sort_input"></td>
   <td metal:use-macro="group_input"></td>
@@ -86,7 +87,7 @@
 
 <tr tal:define="name string:activity">
   <th i18n:translate="">Activity:</th>
-  <td metal:use-macro="search_input"></td>
+  <td metal:use-macro="search_date"></td>
   <td metal:use-macro="column_input"></td>
   <td metal:use-macro="sort_input"></td>
   <td>&nbsp;</td>

templates/classic/html/page.html

@@ -164,6 +164,12 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
                          name name">
 </td>
 
+<td metal:define-macro="search_date">
+  <input tal:attributes="value python:request.form.getvalue(name) or nothing;
+                         name name">
+  <a class="classhelp" tal:attributes="href python:'''javascript:help_window('issue?@template=calendar&property=%s&form=itemSynopsis', 300, 200)'''%name">(cal)</a>
+</td>
+
 <td metal:define-macro="search_popup">
   <!--
     context needs to specify the popup "columns" as a comma-separated