[Checkins] SVN: z3ext.layoutform/trunk/ - Groups support restored
Nikolay Kim
fafhrd at datacom.kz
Tue Oct 14 06:32:06 EDT 2008
Log message for revision 92189:
- Groups support restored
- Use IPageletType for views
Changed:
U z3ext.layoutform/trunk/CHANGES.txt
U z3ext.layoutform/trunk/setup.py
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/form.pt
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formadd.pt
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formbuttons.pt
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formedit.pt
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroups.pt
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formview.pt
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formviewspace.pt
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/interfaces.py
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/subform.pt
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/widget.pt
-=-
Modified: z3ext.layoutform/trunk/CHANGES.txt
===================================================================
--- z3ext.layoutform/trunk/CHANGES.txt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/CHANGES.txt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -2,12 +2,14 @@
CHANGES
=======
-1.2.3 (2008-10-??)
+1.2.3 (2008-10-14)
------------------
- Groups support restored
+- Use IPageletType for views
+
1.2.2 (2008-10-08)
------------------
Modified: z3ext.layoutform/trunk/setup.py
===================================================================
--- z3ext.layoutform/trunk/setup.py 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/setup.py 2008-10-14 10:32:05 UTC (rev 92189)
@@ -58,7 +58,7 @@
'zope.i18nmessageid',
'z3c.form',
'z3c.autoinclude',
- 'z3ext.layout>=1.5.0',
+ 'z3ext.layout>=1.5.1',
'z3ext.resource>=1.2.0',
'z3ext.resourcepackage>=1.2.0',
'z3ext.statusmessage',
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml 2008-10-14 10:32:05 UTC (rev 92189)
@@ -75,6 +75,11 @@
permission="zope.Public" />
<!-- form view -->
+ <interface
+ name="layoutform.form"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IForm" />
+
<z3ext:pagelet
for="z3c.form.interfaces.IForm"
template="formview.pt"
@@ -83,6 +88,11 @@
permission="zope.Public" />
<!-- viewspace view -->
+ <interface
+ name="layoutform.viewspace"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IViewspace" />
+
<z3ext:pagelet
for="..interfaces.IPageletForm"
template="formviewspace.pt"
@@ -90,15 +100,12 @@
layer="..interfaces.ILayoutFormLayer"
permission="zope.Public" />
- <!-- groups view -->
- <z3ext:pagelet
- for="..interfaces.IPageletForm"
- template="formgroups.pt"
- provides="z3ext.layoutform.browser.interfaces.IFormGroups"
- layer="..interfaces.ILayoutFormLayer"
- permission="zope.Public" />
+ <!-- form buttons -->
+ <interface
+ name="layoutform.buttons"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IFormButtons" />
- <!-- form buttons -->
<z3ext:pagelet
for="..interfaces.IPageletForm"
template="formbuttons.pt"
@@ -107,6 +114,11 @@
permission="zope.Public" />
<!-- widget view -->
+ <interface
+ name="layoutform.widget"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IWidget" />
+
<z3ext:pagelet
for="z3c.form.interfaces.IWidget"
template="widget.pt"
@@ -114,6 +126,32 @@
layer="..interfaces.ILayoutFormLayer"
permission="zope.Public" />
+ <!-- group view -->
+ <interface
+ name="layoutform.group"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IGroup" />
+
+ <z3ext:pagelet
+ for="z3c.form.interfaces.IGroup"
+ template="formgroup.pt"
+ provides="z3ext.layoutform.browser.interfaces.IGroup"
+ layer="..interfaces.ILayoutFormLayer"
+ permission="zope.Public" />
+
+ <!-- groups view -->
+ <interface
+ name="layoutform.groups"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IFormGroups" />
+
+ <z3ext:pagelet
+ for="..interfaces.IPageletForm"
+ template="formgroups.pt"
+ provides="z3ext.layoutform.browser.interfaces.IFormGroups"
+ layer="..interfaces.ILayoutFormLayer"
+ permission="zope.Public" />
+
<!-- add form buttons -->
<z3ext:pagelet
for="..interfaces.IPageletAddForm"
@@ -122,6 +160,32 @@
layer="..interfaces.ILayoutFormLayer"
permission="zope.Public" />
+ <!-- extra form views -->
+ <interface
+ name="layoutform.formInfo"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IExtraFormInfo" />
+
+ <interface
+ name="layoutform.viewspaceInfo"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IExtraViewspaceInfo" />
+
+ <interface
+ name="layoutform.widgetBefore"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IExtraBeforeWidget" />
+
+ <interface
+ name="layoutform.widgetAfter"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IExtraAfterWidget" />
+
+ <interface
+ name="layoutform.buttonsInfo"
+ type="z3ext.layout.interfaces.IPageletType"
+ interface="z3ext.layoutform.browser.interfaces.IExtraFormButtonsInfo" />
+
<!-- status message -->
<adapter factory=".message.Message" />
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/form.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/form.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/form.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -1,4 +1,3 @@
<div class="z-form z-form-standard"
- tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IForm">
+ tal:content="structure context/@@pagelet/layoutform.form">
</div>
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formadd.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formadd.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formadd.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -1,4 +1,3 @@
<div class="z-form z-form-add"
- tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IForm">
+ tal:content="structure context/@@pagelet/layoutform.form">
</div>
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formbuttons.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formbuttons.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formbuttons.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -1,6 +1,6 @@
<div class="z-form-controls">
<tal:block tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IExtraFormButtonsInfo|nothing" />
+ context/@@pagelet/layoutform.buttonsInfo|nothing" />
<span tal:condition="context/actions/values">
<hr />
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formedit.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formedit.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formedit.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -1,4 +1,3 @@
<div class="z-form z-form-edit"
- tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IForm">
+ tal:content="structure context/@@pagelet/layoutform.form">
</div>
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroup.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -1,8 +1,7 @@
-<fieldset>
- <legend tal:content="context/label"></legend>
- <div class="pageDescription" tal:content="context/description|nothing"></div>
+<div class="z-form-fieldset">
+ <h3 tal:content="context/label"></h3>
+ <div class="z-page-description" tal:content="context/description|nothing"></div>
<tal:block tal:repeat="widget context/widgets/values"
- tal:content="structure
- widget/@@pagelet/z3ext.layoutform.browser.interfaces.IWidget" />
-</fieldset>
+ tal:content="structure widget/@@pagelet/layoutform.widget" />
+</div>
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroups.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroups.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formgroups.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -1,9 +1,3 @@
-<div class="z-form-fieldset" tal:repeat="group context/groups">
- <h3 tal:content="group/label|nothing"></h3>
- <div class="z-form-description"
- tal:content="group/description|nothing"></div>
-
- <tal:block tal:repeat="widget group/widgets/values"
- tal:content="structure
- widget/@@pagelet/z3ext.layoutform.browser.interfaces.IWidget" />
-</div>
+<tal:block
+ tal:repeat="group context/groups"
+ tal:content="structure group/@@pagelet/layoutform.group" />
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formview.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formview.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formview.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -7,12 +7,7 @@
name context/name;
id context/id">
- <tal:block tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IExtraFormInfo|nothing" />
-
- <tal:block tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IViewspace" />
-
- <tal:block tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IFormButtons" />
+ <tal:block tal:content="structure context/@@pagelet/layoutform.formInfo|nothing" />
+ <tal:block tal:content="structure context/@@pagelet/layoutform.viewspace" />
+ <tal:block tal:content="structure context/@@pagelet/layoutform.buttons" />
</form>
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formviewspace.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formviewspace.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/formviewspace.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -5,7 +5,7 @@
tal:content="context/description|nothing"></div>
<tal:block tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IExtraViewspaceInfo|nothing" />
+ context/@@pagelet/layoutform.viewspaceInfo|nothing" />
<div class="z-form-fieldset" tal:condition="context/widgets">
<tal:block tal:repeat="widget context/widgets/values"
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/interfaces.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/interfaces.py 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/interfaces.py 2008-10-14 10:32:05 UTC (rev 92189)
@@ -46,6 +46,10 @@
""" extra widget information """
+class IGroup(interface.Interface):
+ """ group """
+
+
class IFormGroups(interface.Interface):
""" form groups """
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/subform.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/subform.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/subform.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -5,8 +5,7 @@
tal:content="context/description|nothing"></div>
<tal:block tal:repeat="widget context/widgets/values"
- tal:content="structure
- widget/@@pagelet/z3ext.layoutform.browser.interfaces.IWidget" />
+ tal:content="structure widget/@@pagelet/layoutform.widget" />
</div>
<tal:block tal:content="structure
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/widget.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/widget.pt 2008-10-14 10:22:39 UTC (rev 92188)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/widget.pt 2008-10-14 10:32:05 UTC (rev 92189)
@@ -1,8 +1,7 @@
<div class="z-form-field"
tal:define="error context/error|nothing"
tal:attributes="class python:error and'z-form-field error'or'z-form-field'">
- <tal:block tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IExtraBeforeWidget|nothing" />
+ <tal:block tal:content="structure context/@@pagelet/layoutform.widgetBefore|nothing" />
<label tal:attributes="for context/id;
title context/field/description"
tal:content="context/label">The Label</label>
@@ -16,6 +15,5 @@
<div tal:content="structure context/render">
<input type="text" style="width:100%" />
</div>
- <tal:block tal:content="structure
- context/@@pagelet/z3ext.layoutform.browser.interfaces.IExtraAfterWidget|nothing" />
+ <tal:block tal:content="structure context/@@pagelet/layoutform.widgetAfter|nothing" />
</div>
More information about the Checkins
mailing list