[Checkins] SVN: z3c.formui/trunk/ Made a lot of improvements to the
templates.
Stephan Richter
srichter at cosmos.phy.tufts.edu
Wed Jun 27 15:32:21 EDT 2007
Log message for revision 77155:
Made a lot of improvements to the templates.
Changed:
U z3c.formui/trunk/CHANGES.txt
U z3c.formui/trunk/src/z3c/formui/configure.zcml
U z3c.formui/trunk/src/z3c/formui/div-form.pt
U z3c.formui/trunk/src/z3c/formui/table-form.pt
-=-
Modified: z3c.formui/trunk/CHANGES.txt
===================================================================
--- z3c.formui/trunk/CHANGES.txt 2007-06-27 19:29:23 UTC (rev 77154)
+++ z3c.formui/trunk/CHANGES.txt 2007-06-27 19:32:20 UTC (rev 77155)
@@ -5,8 +5,17 @@
Version 1.1.0 (??/??/2007)
-------------------------
+- Feature: Registered all defined macros for each form template. Also, added
+ more slots to the templates providing more hooks for customization.
+
+- Feature: Added a macro/slot for the "required info", which explains how
+ required fields are marked.
+
+- Feature: Added support for form labels.
+
- Feature: Added support for groups to templates.
+
Version 1.0.1 (6/22/2007)
-------------------------
@@ -14,6 +23,7 @@
element and not the name. This has worked until recently, because the
name and id were the same, but they are different now.
+
Version 1.0.0 (5/24/2007)
-------------------------
Modified: z3c.formui/trunk/src/z3c/formui/configure.zcml
===================================================================
--- z3c.formui/trunk/src/z3c/formui/configure.zcml 2007-06-27 19:29:23 UTC (rev 77154)
+++ z3c.formui/trunk/src/z3c/formui/configure.zcml 2007-06-27 19:32:20 UTC (rev 77155)
@@ -39,18 +39,60 @@
layer=".interfaces.ITableFormLayer"
/>
<z3c:macro
+ name="form-label"
+ macro="label"
+ template="table-form.pt"
+ layer=".interfaces.ITableFormLayer"
+ />
+ <z3c:macro
+ name="form-required-info"
+ macro="form-required-info"
+ template="table-form.pt"
+ layer=".interfaces.ITableFormLayer"
+ />
+ <z3c:macro
name="form-header"
macro="header"
template="table-form.pt"
layer=".interfaces.ITableFormLayer"
/>
<z3c:macro
+ name="form-errors"
+ macro="header"
+ template="table-form.pt"
+ layer=".interfaces.ITableFormLayer"
+ />
+ <z3c:macro
name="form-table"
- macro="table"
+ macro="formtable"
template="table-form.pt"
layer=".interfaces.ITableFormLayer"
/>
<z3c:macro
+ name="form-row"
+ macro="formrow"
+ template="table-form.pt"
+ layer=".interfaces.ITableFormLayer"
+ />
+ <z3c:macro
+ name="form-label-cell"
+ macro="labelcell"
+ template="table-form.pt"
+ layer=".interfaces.ITableFormLayer"
+ />
+ <z3c:macro
+ name="form-widget-cell"
+ macro="widgetcell"
+ template="table-form.pt"
+ layer=".interfaces.ITableFormLayer"
+ />
+ <z3c:macro
+ name="form-groups"
+ macro="groups"
+ template="table-form.pt"
+ layer=".interfaces.ITableFormLayer"
+ />
+ <z3c:macro
name="form-buttons"
macro="buttons"
template="table-form.pt"
@@ -82,12 +124,30 @@
layer=".interfaces.IDivFormLayer"
/>
<z3c:macro
+ name="form-label"
+ macro="label"
+ template="div-form.pt"
+ layer=".interfaces.IDivFormLayer"
+ />
+ <z3c:macro
+ name="form-required-info"
+ macro="required-info"
+ template="div-form.pt"
+ layer=".interfaces.IDivFormLayer"
+ />
+ <z3c:macro
name="form-header"
macro="header"
template="div-form.pt"
layer=".interfaces.IDivFormLayer"
/>
<z3c:macro
+ name="form-errors"
+ macro="errors"
+ template="div-form.pt"
+ layer=".interfaces.IDivFormLayer"
+ />
+ <z3c:macro
name="widget-rows"
macro="widget-rows"
template="div-form.pt"
@@ -100,6 +160,12 @@
layer=".interfaces.IDivFormLayer"
/>
<z3c:macro
+ name="form-groups"
+ macro="groups"
+ template="div-form.pt"
+ layer=".interfaces.IDivFormLayer"
+ />
+ <z3c:macro
name="form-buttons"
macro="buttons"
template="div-form.pt"
Modified: z3c.formui/trunk/src/z3c/formui/div-form.pt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/div-form.pt 2007-06-27 19:29:23 UTC (rev 77154)
+++ z3c.formui/trunk/src/z3c/formui/div-form.pt 2007-06-27 19:32:20 UTC (rev 77155)
@@ -8,25 +8,34 @@
name view/name;
id view/id">
<div class="viewspace" metal:define-slot="viewspace">
- <metal:block define-macro="label">
- <h1 tal:condition="view/label|nothing"
+ <metal:block define-slot="label">
+ <h1 metal:define-macro="label"
+ tal:condition="view/label|nothing"
tal:content="view/label">
Form Label
</h1>
</metal:block>
- <metal:block define-macro="header">
+ <metal:block define-slot="info">
+ <div class="required-info"
+ metal:define-macro="required-info">
+ <span class="required">*</span>
+ – required
+ </div>
+ </metal:block>
+ <metal:block define-slot="header">
<div class="status"
- tal:define="status view/status"
- tal:condition="status">
+ tal:condition="view/status"
+ metal:define-macro="header">
<div class="summary"
- i18n:translate=""
- tal:content="view/status">
+ i18n:translate=""
+ tal:content="view/status">
Form status summary
</div>
- <ul class="errors" tal:condition="view/widgets/errors">
+ <ul class="errors"
+ tal:condition="view/widgets/errors"
+ metal:define-macro="errors">
<li tal:repeat="error view/widgets/errors">
- <span tal:replace="error/widget/label" />
- :
+ <span tal:replace="error/widget/label" />:
<span tal:replace="structure error/render">Error Type</span>
</li>
</ul>
@@ -66,8 +75,15 @@
tal:repeat="view view/groups">
<legend tal:condition="view/label"
tal:content="view/label">Label</legend>
- <div metal:use-macro="template/macros/header" />
- <div metal:use-macro="template/macros/widget-rows" />
+ <metal:block define-slot="group-header">
+ <div class="status"
+ tal:condition="view/widgets/errors">
+ <div metal:use-macro="template/macros/errors" />
+ </div>
+ </metal:block>
+ <metal:block define-slot="group-rows">
+ <div metal:use-macro="template/macros/widget-rows" />
+ </metal:block>
</fieldset>
</metal:block>
</div>
Modified: z3c.formui/trunk/src/z3c/formui/table-form.pt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/table-form.pt 2007-06-27 19:29:23 UTC (rev 77154)
+++ z3c.formui/trunk/src/z3c/formui/table-form.pt 2007-06-27 19:32:20 UTC (rev 77155)
@@ -8,26 +8,35 @@
name view/name;
id view/id">
<div class="viewspace" metal:define-slot="viewspace">
- <metal:block define-macro="label">
- <h1 tal:condition="view/label|nothing"
+ <metal:block define-slot="label">
+ <h1 metal:define-macro="label"
+ tal:condition="view/label|nothing"
tal:content="view/label">
Form Label
</h1>
</metal:block>
- <metal:block define-macro="header">
+ <metal:block define-slot="info">
+ <div class="required-info"
+ metal:define-macro="required-info">
+ <span class="required">*</span>
+ – required
+ </div>
+ </metal:block>
+ <metal:block define-slot="header">
<div class="status"
- tal:define="status view/status"
- tal:condition="status">
+ tal:condition="view/status"
+ metal:define-macro="header">
<div class="summary"
i18n:translate=""
tal:content="view/status">
Form status summary
</div>
- <ul class="errors" tal:condition="view/widgets/errors">
+ <ul class="errors"
+ tal:condition="view/widgets/errors"
+ metal:define-macro="errors">
<li tal:repeat="error view/widgets/errors">
- <span tal:replace="error/widget/label" />
- :
- <span tal:replace="structure error/render"> Error Type </span>
+ <span tal:replace="error/widget/label" />:
+ <span tal:replace="structure error/render">Error Type</span>
</li>
</ul>
</div>
@@ -80,8 +89,15 @@
tal:repeat="view view/groups">
<legend tal:condition="view/label"
tal:content="view/label">Label</legend>
- <div metal:use-macro="template/macros/header" />
- <div metal:use-macro="template/macros/formtable" />
+ <metal:block define-slot="group-header">
+ <div class="status"
+ tal:condition="view/widgets/errors">
+ <div metal:use-macro="template/macros/errors" />
+ </div>
+ </metal:block>
+ <metal:block define-slot="group-rows">
+ <div metal:use-macro="template/macros/formtable" />
+ </metal:block>
</fieldset>
</metal:block>
<tal:block repeat="widget view/widgets/values"
More information about the Checkins
mailing list