Changeset 5685

Timestamp:

11/16/08 16:24:18 (2 months ago)

Author:

carndt

Message:

Fix #1914 (Improper SPAN/DIV nesting in big widgets)

Files:

• branches/1.1/CHANGELOG.txt (modified) (1 diff)
• branches/1.1/turbogears/widgets/big_widgets.py (modified) (6 diffs)
• branches/1.1/turbogears/widgets/tests/test_widgets.py (modified) (1 diff)

branches/1.1/CHANGELOG.txt

@@ -39 +39 @@
-  templates (r5379, r5465, r5484).
-* 'testutil.TGTest.tearDown' stops CherryPy server as well (r5461).
+* The root element of the ``CalendarDatePicker``, ``AutoCompleteField`` and
+  ``AutoCompleteTextField`` widgets have been changed from ``DIV`` to ``SPAN``
+  to allow them to be used inside elements, which can not contain other
+  block-level elements (e.g. ``SPAN``). A ``class`` attribute is added to the
+  ``SPAN`` element, to allow it to be target by CSS rules easily (r5685)
-
-

branches/1.1/turbogears/widgets/big_widgets.py

@@ -22 +22 @@
-
-    template = """
-div xmlns:py="http://purl.org/kid/ns#
+span xmlns:py="http://purl.org/kid/ns#" class="${field_class}
-    <input type="text" id="${field_id}" class="${field_class}" name="${name}" value="${strdate}" py:attrs="attrs"/>
-    <input type="button" id="${field_id}_trigger" class="date_field_button" value="${button_text}"/>
@@ -33 +33 @@
-    });
-    </script>
-div
+span
-    """
-    params = ["attrs", "skin", "picker_shows_time", "button_text",
@@ -144 +144 @@
-
-    template = """
-div xmlns:py="http://purl.org/kid/ns#" id="${field_id
+span xmlns:py="http://purl.org/kid/ns#" id="${field_id}" class="${field_class
-    <script language="JavaScript" type="text/JavaScript">
-        AutoCompleteManager${field_id} = new AutoCompleteManager('${field_id}',
@@ -156 +156 @@
-    <img py:if="show_spinner" id="autoCompleteSpinner${field_id}"
-        src="${tg.url([tg.widgets, 'turbogears.widgets/spinnerstopped.png'])}" alt=""/>
-div
+span
-    ${hidden_field.display(value_for(hidden_field), **params_for(hidden_field))}
-div
+span
-    """
-
@@ -224 +224 @@
-
-    template = """
-div xmlns:py="http://purl.org/kid/ns#
+span xmlns:py="http://purl.org/kid/ns#" class="${field_class}
-    <script language="JavaScript" type="text/JavaScript">
-        AutoCompleteManager${field_id} = new AutoCompleteManager('${field_id}', '${field_id}', null,
@@ -236 +236 @@
-    <img py:if="show_spinner" id="autoCompleteSpinner${field_id}"
-        src="${tg.url([tg.widgets, 'turbogears.widgets/spinnerstopped.png'])}" alt=""/>
-div
-div
+span
+span
-    """
-

branches/1.1/turbogears/widgets/tests/test_widgets.py

@@ -651 +651 @@
-    assert '<option value="java">' in output
-    assert '<option value="pascal">' in output
+
+def test_calendardatepicker():
+    """CalendarDatePicker widget is wrapped in a SPAN element with proper class
+    """
+    w = widgets.CalendarDatePicker(
+       name = 'test_cdp',
+       field_class = 'my_cdp',
+       label='Test',
+       format='%m/%d/%Y',
+       validator = validators.DateConverter(format="mm/dd/yyyy")
+    )
+    output = w.render(format='xhtml')
+    print output
+    assert '<span class="my_cdp">' in output
+
+def test_calendardatepicker():
+    """CalendarDatePicker widget is wrapped in SPAN element with proper class
+    """
+    w = widgets.CalendarDatePicker(
+       name = 'test_cdp',
+       field_class = 'cdp',
+       label='Test',
+       format='%m/%d/%Y',
+       validator = validators.DateConverter(format="mm/dd/yyyy")
+    )
+    output = w.render(format='xhtml')
+    assert '<span class="cdp">' in output
+
+def test_autocompletefield():
+    """AutoCompleteField widget is wrapped in SPAN element with proper class/id
+    """
+    w = widgets.AutoCompleteField(name="my_acf",
+        field_class='acf',
+        search_controller="/search",
+        search_param="test", result_name="test")
+    output = w.render(format='xhtml')
+    assert '<span id="my_acf" class="acf">' in output
+
+def test_autocompletetextfield():
+    """AutoCompleteTextField widget is wrapped in SPAN element with proper class/id
+    """
+    w = widgets.AutoCompleteTextField(name="my_actf",
+        field_class='actf',
+        search_controller="/search",
+        search_param="test", result_name="test")
+    output = w.render(format='xhtml')
+    assert '<span class="actf">' in output