Changeset 7795 for main/waeup.sirp/trunk/src/waeup/sirp/widgets

Timestamp:

8 Mar 2012, 03:30:30 (13 years ago)

Author:

uli

Message:

Merge changes from ulif-schoolgrades back into trunk.

Location:

main/waeup.sirp/trunk

Files:

• . (modified) (1 prop)
• src/waeup/sirp/widgets/objectwidget.pt (modified) (1 diff)
• src/waeup/sirp/widgets/objectwidget.py (modified) (1 diff)
• src/waeup/sirp/widgets/sequencewidget.pt (copied) (copied from main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/widgets/sequencewidget.pt)
• src/waeup/sirp/widgets/sequencewidget.py (copied) (copied from main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/widgets/sequencewidget.py)
• src/waeup/sirp/widgets/tests/test_objectwidget.py (modified) (9 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/widgets/objectwidget.pt

@@ -1 @@
-  <td class="row" tal:repeat="widget context/subwidgets">
-    <span tal:define="error widget/error"
-          tal:replace="structure error" tal:condition="error" />
-    <span tal:replace="structure widget" />
-  </td>
+  <div class="row">
+    <span tal:repeat="widget context/subwidgets">
+      <span tal:define="error widget/error"
+            tal:replace="structure error" tal:condition="error" />
+      <span tal:replace="structure widget" />
+    </span>
+  </div>

main/waeup.sirp/trunk/src/waeup/sirp/widgets/objectwidget.py

@@ -60 +60 @@
         return SIRPObjectWidgetView(self, request)
 
+
 class SIRPObjectDisplayWidget(SIRPObjectWidget):
 

main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_objectwidget.py

@@ -21 +21 @@
 import unittest
 import sys
-from zope.component import testing
 from zope.interface import Interface, implements
 from zope.interface.verify import verifyClass
@@ -45 +44 @@
     name = TextLine()
     email = TextLine()
-    
+
 class TestContact(object):
     implements(ITestContact)
@@ -51 +50 @@
 class ITestContent(Interface):
     foo = Object(
-        ITestContact, 
+        ITestContact,
         title = u'Foo Title',
         description = u'',
         )
-    
+
 class ObjectWidgetInputErrorView(object):
     implements(IWidgetInputErrorView)
@@ -82 +81 @@
         provideAdapter(TextWidget, (ITextLine, IDefaultBrowserLayer),
                        IInputWidget)
-        
+
         class TestObject(object):
             implements(ITestContent)
@@ -120 +119 @@
         error_html = widget.error()
         if sys.version_info < (2, 5):
-            self.assertTrue("email: <zope.formlib.interfaces.Mis" 
+            self.assertTrue("email: <zope.formlib.interfaces.Mis"
                              in error_html)
             self.assertTrue("name: <zope.formlib.interfaces.Miss"
@@ -161 +160 @@
         widget1, widget2 = widget.subwidgets()
         self.assertTrue(widget1 is name_widget)
-        
-        
+
+
 class ObjectDisplayWidgetTest(BrowserWidgetTest):
     """Documents and tests the display variant of object widget.
@@ -184 +183 @@
         # adapter that can turn nearly any object into an ITraversable.
         provideAdapter(DefaultTraversable, (None,), ITraversable)
-        
+
         class TestObject(object):
             implements(ITestContent)
@@ -206 +205 @@
                        IDisplayWidget)
 
-        
+
     def test_interfaces(self):
-        from zope.interface.verify import DoesNotImplement
         self.assertTrue(IDisplayWidget.providedBy(self._widget))
         self.assertFalse(IInputWidget.providedBy(self._widget))
@@ -219 +217 @@
 
         check_list = [
-            '<td', 'class=', 'row',
+            '<div', 'class=', 'row',
+            '<span',
             'Foo Name',
-            '</td>', '<td', 'class=', 'row',
+            '</span>', '<span',
             'foo@foo.test',
-            '</td>']
-        self.verifyResult(widget(), check_list, inorder=True)    
+            '</div>']
+        self.verifyResult(widget(), check_list, inorder=True)
 
 def test_suite():