[Checkins] SVN: megrok.z3cform.wizard/trunk/s use megrok.z3cform.ui for all macros and template stuff

[Christian Klinger]

Log message for revision 110053:
  use megrok.z3cform.ui for all macros and template stuff

Changed:
  U   megrok.z3cform.wizard/trunk/setup.py
  U   megrok.z3cform.wizard/trunk/src/megrok/z3cform/wizard/configure.zcml
  D   megrok.z3cform.wizard/trunk/src/megrok/z3cform/wizard/formelements.pt

-=-
Modified: megrok.z3cform.wizard/trunk/setup.py
===================================================================
--- megrok.z3cform.wizard/trunk/setup.py	2010-03-18 09:33:58 UTC (rev 110052)
+++ megrok.z3cform.wizard/trunk/setup.py	2010-03-18 09:39:27 UTC (rev 110053)
@@ -31,6 +31,7 @@
           'zope.app.testing',
           'zope.app.zcmlfiles',
 	  'megrok.z3cform.base',
+          'megrok.z3cform.ui',
       ],
       entry_points="""
       # -*- Entry points: -*-

Modified: megrok.z3cform.wizard/trunk/src/megrok/z3cform/wizard/configure.zcml
===================================================================
--- megrok.z3cform.wizard/trunk/src/megrok/z3cform/wizard/configure.zcml	2010-03-18 09:33:58 UTC (rev 110052)
+++ megrok.z3cform.wizard/trunk/src/megrok/z3cform/wizard/configure.zcml	2010-03-18 09:39:27 UTC (rev 110053)
@@ -9,17 +9,9 @@
   <include package="megrok.z3cform.base" file="meta.zcml" />
   <include package="megrok.z3cform.base" />
 
-  <include package="z3c.template" file="meta.zcml"/> 
-  <include package="z3c.macro"/>
-  <include package="z3c.macro" file="meta.zcml"/>
+  <include package="megrok.z3cform.ui" />
   <include package="z3c.wizard"/>
 
   <grok:grok package=".meta" />
 
-  <z3c:macro
-      name="widget-rows"
-      macro="widget-rows"
-      template="formelements.pt"
-      />
-
 </configure>

Deleted: megrok.z3cform.wizard/trunk/src/megrok/z3cform/wizard/formelements.pt
===================================================================
--- megrok.z3cform.wizard/trunk/src/megrok/z3cform/wizard/formelements.pt	2010-03-18 09:33:58 UTC (rev 110052)
+++ megrok.z3cform.wizard/trunk/src/megrok/z3cform/wizard/formelements.pt	2010-03-18 09:39:27 UTC (rev 110053)
@@ -1,30 +0,0 @@
-<div>
-      <metal:block define-macro="widget-rows">
-        <tal:block repeat="widget view/widgets/values">
-          <div id="" class="row"
-               tal:attributes="id string:${widget/id}-row"
-               tal:condition="python:widget.mode != 'hidden'">
-            <metal:block define-macro="widget-row">
-              <div class="label">
-                <label tal:attributes="for widget/id">
-                  <span i18n:translate=""
-                      tal:content="widget/label">label</span>
-                  <span class="required"
-                        tal:condition="widget/required">*</span>
-                </label>
-              </div>
-              <div class="widget" tal:content="structure widget/render">
-                <input type="text" size="24" value="" />
-              </div>
-              <div class="error"
-                   tal:condition="widget/error">
-                <span tal:replace="structure widget/error/render">error</span>
-              </div>
-            </metal:block>
-          </div>
-          <input type="hidden" value=""
-                 tal:condition="python:widget.mode == 'hidden'"
-                 tal:replace="structure widget/render" />
-        </tal:block>
-      </metal:block>
-</div>