[Checkins] SVN: z3c.formui/trunk/ Bugfix,

[Roger Ineichen]

Log message for revision 82499:
  Bugfix, 
  renamed table layout macro argument from form-required-info to required-info
  Added tests for layout macros

Changed:
  U   z3c.formui/trunk/CHANGES.txt
  U   z3c.formui/trunk/src/z3c/formui/README.txt
  U   z3c.formui/trunk/src/z3c/formui/table-form.zcml

-=-
Modified: z3c.formui/trunk/CHANGES.txt
===================================================================
--- z3c.formui/trunk/CHANGES.txt	2007-12-28 15:01:10 UTC (rev 82498)
+++ z3c.formui/trunk/CHANGES.txt	2007-12-28 15:39:19 UTC (rev 82499)
@@ -5,13 +5,18 @@
 Version 1.4.0 (unreleased)
 -------------------------
 
+- Bugfix, rename table macro argument from ´´form-required-info´´ to 
+  ´´required-info´´. The macro ´´form-required-info´´ did not exist.
+
 - Improve layout implementation, support built in layout templates
 
 - Added form module which offers built in layout support.
 
 - Added unittests for layout support
 
+- Added tests for layout macros
 
+
 Version 1.3.0 (8/24/2007)
 -------------------------
 

Modified: z3c.formui/trunk/src/z3c/formui/README.txt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/README.txt	2007-12-28 15:01:10 UTC (rev 82498)
+++ z3c.formui/trunk/src/z3c/formui/README.txt	2007-12-28 15:39:19 UTC (rev 82499)
@@ -313,6 +313,128 @@
   </html>
 
 
+Form Macros
+-----------
+
+Try at least to load the confguration, which will make sure that all macros
+get registered correctly.
+
+  >>> from zope.configuration import xmlconfig
+  >>> import zope.component
+  >>> import zope.viewlet
+  >>> import zope.app.component
+  >>> import zope.app.publisher.browser
+  >>> import z3c.macro
+  >>> import z3c.template
+  >>> import z3c.formui
+  >>> xmlconfig.XMLConfig('meta.zcml', zope.component)()
+  >>> xmlconfig.XMLConfig('meta.zcml', zope.viewlet)()
+  >>> xmlconfig.XMLConfig('meta.zcml', zope.app.component)()
+  >>> xmlconfig.XMLConfig('meta.zcml', zope.app.publisher.browser)()
+  >>> xmlconfig.XMLConfig('meta.zcml', z3c.macro)()
+  >>> xmlconfig.XMLConfig('meta.zcml', z3c.template)()
+  >>> xmlconfig.XMLConfig('configure.zcml', z3c.formui)()
+
+
+Div layout macros
+-----------------
+
+Now we can see that we have different form macros available:
+
+  >>> from z3c.macro.interfaces import IMacroTemplate
+  >>> objects = (None, addForm, divRequest)
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form')
+  [...div-form.pt'), ...metal:define-macro': u'form'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'subform')
+  [...div-form.pt'), ...define-macro': u'subform'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-label')
+  [...div-form.pt'), ...define-macro': u'label'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-required-info')
+  [...div-form.pt'), ...define-macro', u'required-info'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-header')
+  [...div-form.pt'), ...define-macro': u'header'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-errors')
+  [...div-form.pt'), ...define-macro': u'errors'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'widget-rows')
+  [...div-form.pt'), ...define-macro': u'widget-rows'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'widget-row')
+  [...div-form.pt'), ...define-macro': u'widget-row'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-groups')
+  [...div-form.pt'), ...define-macro': u'groups'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-buttons')
+  [...div-form.pt'), ...define-macro', u'buttons'...
+
+
+Table layout macros
+-------------------
+
+  >>> objects = (None, addForm, tableRequest)
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form')
+  [...table-form.pt'), ...metal:define-macro': u'form'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'subform')
+  [...table-form.pt'), ...define-macro': u'subform'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-label')
+  [...table-form.pt'), ...define-macro': u'label'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-required-info')
+  [...table-form.pt'), ...define-macro', u'required-info'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-header')
+  [...table-form.pt'), ...define-macro': u'header'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-errors')
+  [...table-form.pt'), ...define-macro': u'errors'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-table')
+  [...table-form.pt'), ...define-macro', u'formtable'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-row')
+  [...table-form.pt'), ...define-macro': u'formrow'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-label-cell')
+  [...table-form.pt'), ...define-macro', u'labelcell'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-widget-cell')
+  [...table-form.pt'), ...define-macro', u'widgetcell'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-groups')
+  [...table-form.pt'), ...define-macro': u'groups'...
+
+
+  >>> zope.component.getMultiAdapter(objects, IMacroTemplate, 'form-buttons')
+  [...table-form.pt'), ...define-macro', u'buttons'...
+
+
 Cleanup
 -------
 

Modified: z3c.formui/trunk/src/z3c/formui/table-form.zcml
===================================================================
--- z3c.formui/trunk/src/z3c/formui/table-form.zcml	2007-12-28 15:01:10 UTC (rev 82498)
+++ z3c.formui/trunk/src/z3c/formui/table-form.zcml	2007-12-28 15:39:19 UTC (rev 82499)
@@ -39,7 +39,7 @@
       />
   <z3c:macro
       name="form-required-info"
-      macro="form-required-info"
+      macro="required-info"
       template="table-form.pt"
       layer=".interfaces.ITableFormLayer"
       />