tagging

ssThis line, and those below, will be ignored-- A https://svn.plone.org/svn/collective/collective.z3cform.datetimewidget/tags/1.0.3 svn path=/collective.z3cform.datetimewidget/tags/1.0.3/; revision=229722
collective · Jan 3, 2011 · e1ca7cc · e1ca7cc
2 parents 50966d1 + 0509553
commit e1ca7cc
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 59 deletions.
diff --git a/HISTORY.txt b/HISTORY.txt
@@ -1,17 +1,19 @@
 Changelog
 =========
 
-1.0.3 (unreleased)
+1.0.3 (2011-01-03)
 ------------------
 
-* Should use None for tal:attributes (Chameleon compatibility)
-  [rossp]
+ * Should use None for tal:attributes (Chameleon compatibility)
+   [rossp]
+ * Added options for calendar (via jquery.tools.dateinput)
+   [garbas]
 
 1.0.2 (2010-07-20)
 ------------------
 
-* Fix invalid XML (Chameleon compatibility)
-  [wichert]
+ * Fix invalid XML (Chameleon compatibility)
+   [wichert]
 
 1.0.1 (2010-06-30)
 ------------------

diff --git a/buildout.cfg b/buildout.cfg
@@ -1,17 +1,9 @@
 [buildout]
-develop = .
-parts = test coverage docs
-unzip = true
+extends =
+    http://svn.plone.org/svn/collective/buildout/plonetest/test-4.x.cfg
+    http://good-py.appspot.com/release/plone.app.z3cform/0.5.0-1
+package-name = collective.z3cform.datetimewidget
+package-extras = [test]
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = collective.z3cform.datetimewidget [test]
-
-[coverage]
-recipe = zc.recipe.testrunner
-eggs = ${test:eggs}
-defaults = ['--coverage', '../../coverage']
-
-[docs]
-recipe = collective.recipe.sphinxbuilder
-source = collective.z3cform.datetimewidget:docs
+[versions]
+collective.z3cform.datetimewidget =
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '1.0.3dev'
+version = '1.0.3'
 
 setup(name='collective.z3cform.datetimewidget',
       version=version,

diff --git a/src/collective/z3cform/datetimewidget/templates/datetime_input.pt b/src/collective/z3cform/datetimewidget/templates/datetime_input.pt
@@ -81,7 +81,16 @@
                        onblur view/onblur;
                        onchange view/onchange;
                        readonly view/readonly;
-                       onselect view/onselect;" /> &nbsp;
+                       onselect view/onselect;" />
+
+<a tal:condition="view/show_jquerytools_dateinput"
+   tal:replace="structure view/show_jquerytools_dateinput_js" />
+
+<a tal:condition="view/show_today_link"
+   tal:replace="structure view/show_today_link_js" />
+
+&nbsp;
+
 <input type="text" id="" name="" class="" title="" lang="" disabled=""
        readonly="" alt="" tabindex="" accesskey="" size="2" maxlength="2"
        tal:attributes="id string:${view/id}-hour;
@@ -159,16 +168,10 @@
                         onchange view/onchange;">
     <option tal:attributes="selected python:not view.is_pm() and 'selected' or None"
             value="AM" selected="">AM</option>
-    <option tal:attributes="selected python:view.is_pm() and 'selected' or ''"
+    <option tal:attributes="selected python:view.is_pm() and 'selected' or None"
             value="PM" selected="">PM</option>
 </select>
 <input name="field-empty-marker" type="hidden" value="1"
        tal:attributes="name string:${view/name}-empty-marker" />
 
-<a tal:condition="view/show_calendar"
-   tal:replace="structure view/show_calendar_js" />
-
-<a tal:condition="view/show_today_link"
-   tal:replace="structure view/show_today_link_js" />
-
 </tal:root>
diff --git a/src/collective/z3cform/datetimewidget/templates/monthyear_input.pt b/src/collective/z3cform/datetimewidget/templates/monthyear_input.pt
@@ -85,8 +85,8 @@
 <input name="field-empty-marker" type="hidden" value="1"
        tal:attributes="name string:${view/name}-empty-marker" />
 
-<a tal:condition="view/show_calendar"
-   tal:replace="structure view/show_calendar_js" />
+<a tal:condition="view/show_jquerytools_dateinput"
+   tal:replace="structure view/show_jquerytools_dateinput_js" />
 
 <a tal:condition="view/show_today_link"
    tal:replace="structure view/show_today_link_js" />

diff --git a/src/collective/z3cform/datetimewidget/tests.py b/src/collective/z3cform/datetimewidget/tests.py
@@ -20,15 +20,13 @@
 #############################################################################
 __docformat__ = "reStructuredText"
 
+import doctest
 import unittest
 from zope.app.testing import setup
-from zope.testing import doctest
 from z3c.form.testing import TestRequest
-from z3c.form.interfaces import IFieldWidget, DISPLAY_MODE
-from z3c.form import interfaces
+from z3c.form.interfaces import IFieldWidget
 
 from Testing import ZopeTestCase as ztc
-import datetime
 from StringIO import StringIO
 import z3c.form
 import zope.schema
@@ -85,7 +83,7 @@ def test_suite():
             'converter.txt',
             'issues.txt',
             test_class=WidgetTestCase,
-            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE |
+            optionflags=
                         doctest.NORMALIZE_WHITESPACE |
                         doctest.ELLIPSIS |
                         doctest.REPORT_UDIFF,

diff --git a/src/collective/z3cform/datetimewidget/widget_date.txt b/src/collective/z3cform/datetimewidget/widget_date.txt
@@ -110,15 +110,9 @@ inserting current date into the fields.
          accesskey="" size="4" maxlength="4" value="2007" />
   <input name="bar-empty-marker" type="hidden" value="1" />
   <BLANKLINE>
-              <a href="#" onclick="return fooshowtodaylink()">Today</a>
-              <script type="text/javascript">
-                  var fooshowtodaylink = function() {
-                      document.getElementById('foo-day').value = ...;
-                      document.getElementById('foo-month').value = ...;
-                      document.getElementById('foo-year').value = ...;
-                      return false;
-                  }</script>
   <BLANKLINE>
+  <BLANKLINE>
+  <a href="#" onclick="document.getElementById('foo-day').value = 3;document.getElementById('foo-month').value = 1;document.getElementById('foo-year').value = 2011;return false;">Today</a>
 
 
 Translations
@@ -130,21 +124,20 @@ check if translations are working
   >>> widget.update()
   >>> widget.show_today_link = True
   >>> print widget.render()
-  <input...
-  ...
-      <option value="1">januar</option>
-      <option value="2">februar</option>
-      <option value="3">marec</option>
-      <option value="4" selected="selected">april</option>
-      <option value="5">maj</option>
-      <option value="6">junij</option>
-      <option value="7">julij</option>
-      <option value="8">avgust</option>
-      <option value="9">september</option>
-      <option value="10">oktober</option>
-      <option value="11">november</option>
-      <option value="12">december</option>
+  <input... 
   ...
-              <a href="#" onclick="return fooshowtodaylink()">Danes</a>
+      <option ...>januar</option>
+      <option ...>februar</option>
+      <option ...>marec</option>
+      <option ...>april</option>
+      <option ...>maj</option>
+      <option ...>junij</option>
+      <option ...>julij</option>
+      <option ...>avgust</option>
+      <option ...>september</option>
+      <option ...>oktober</option>
+      <option ...>november</option>
+      <option ...>december</option>
   ...
+  <a ...>Danes</a>