Skip to content

Commit

Permalink
Split config, mostly to be able to include in pyramid without browser…
Browse files Browse the repository at this point in the history
… resources and viewletssplit config, mos
  • Loading branch information
agroszer committed Apr 16, 2013
1 parent d1d95bb commit 54dadff
Show file tree
Hide file tree
Showing 11 changed files with 298 additions and 253 deletions.
3 changes: 2 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ CHANGES
3.0.0a3 (unreleased)
--------------------

- Nothing changed yet.
- Split config, mostly to be able to include in pyramid without browser
resources and viewlets


3.0.0a2 (2013-02-26)
Expand Down
19 changes: 19 additions & 0 deletions src/z3c/formui/div-form-browser.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser">

<browser:resource
name="div-form.css"
file="div-form.css"
layer=".interfaces.IDivFormLayer"
/>
<browser:viewlet
name="div-form.css"
for="*"
manager=".interfaces.ICSS"
class=".browser.DivFormCSSViewlet"
permission="zope.Public"
layer=".interfaces.IDivFormLayer"
/>

</configure>
9 changes: 9 additions & 0 deletions src/z3c/formui/div-form-layer.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<configure
xmlns="http://namespaces.zope.org/zope">

<interface
interface=".interfaces.IDivFormLayer"
type="zope.publisher.interfaces.browser.IBrowserSkinType"
/>

</configure>
70 changes: 70 additions & 0 deletions src/z3c/formui/div-form-macros.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:z3c="http://namespaces.zope.org/z3c">

<!-- form macros -->
<z3c:macro
name="form"
template="div-form.pt"
layer=".interfaces.IDivFormLayer"
/>
<z3c:macro
name="subform"
template="div-form.pt"
layer=".interfaces.IDivFormLayer"
/>
<z3c:macro
name="subform-display"
template="div-form-display.pt"
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"
layer=".interfaces.IDivFormLayer"
/>
<z3c:macro
name="widget-row"
macro="widget-row"
template="div-form.pt"
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"
layer=".interfaces.IDivFormLayer"
/>

</configure>
39 changes: 39 additions & 0 deletions src/z3c/formui/div-form-templates.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:z3c="http://namespaces.zope.org/z3c">

<!-- IContentTemplate -->
<z3c:template
template="div-form.pt"
for="z3c.form.interfaces.IInputForm"
layer=".interfaces.IDivFormLayer"
/>
<z3c:template
template="div-form-display.pt"
for="z3c.form.interfaces.IDisplayForm"
layer=".interfaces.IDivFormLayer"
/>

<!-- named IContentTemplate -->
<z3c:template
name="display"
template="div-form-display.pt"
for="z3c.form.interfaces.IForm"
layer=".interfaces.IDivFormLayer"
/>
<z3c:template
name="subform"
template="subform.pt"
for="z3c.form.interfaces.IForm"
layer=".interfaces.IDivFormLayer"
/>

<!-- named ILayoutTemplate -->
<z3c:layout
name="subform"
template="subform-layout.pt"
for="z3c.form.interfaces.IForm"
layer=".interfaces.IDivFormLayer"
/>

</configure>
125 changes: 5 additions & 120 deletions src/z3c/formui/div-form.zcml
Original file line number Diff line number Diff line change
@@ -1,124 +1,9 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:z3c="http://namespaces.zope.org/z3c">
xmlns="http://namespaces.zope.org/zope">

<interface
interface=".interfaces.IDivFormLayer"
type="zope.publisher.interfaces.browser.IBrowserSkinType"
/>

<browser:resource
name="div-form.css"
file="div-form.css"
layer=".interfaces.IDivFormLayer"
/>
<browser:viewlet
name="div-form.css"
for="*"
manager=".interfaces.ICSS"
class=".browser.DivFormCSSViewlet"
permission="zope.Public"
layer=".interfaces.IDivFormLayer"
/>

<!-- form macros -->
<z3c:macro
name="form"
template="div-form.pt"
layer=".interfaces.IDivFormLayer"
/>
<z3c:macro
name="subform"
template="div-form.pt"
layer=".interfaces.IDivFormLayer"
/>
<z3c:macro
name="subform-display"
template="div-form-display.pt"
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"
layer=".interfaces.IDivFormLayer"
/>
<z3c:macro
name="widget-row"
macro="widget-row"
template="div-form.pt"
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"
layer=".interfaces.IDivFormLayer"
/>

<!-- IContentTemplate -->
<z3c:template
template="div-form.pt"
for="z3c.form.interfaces.IInputForm"
layer=".interfaces.IDivFormLayer"
/>
<z3c:template
template="div-form-display.pt"
for="z3c.form.interfaces.IDisplayForm"
layer=".interfaces.IDivFormLayer"
/>

<!-- named IContentTemplate -->
<z3c:template
name="display"
template="div-form-display.pt"
for="z3c.form.interfaces.IForm"
layer=".interfaces.IDivFormLayer"
/>
<z3c:template
name="subform"
template="subform.pt"
for="z3c.form.interfaces.IForm"
layer=".interfaces.IDivFormLayer"
/>

<!-- named ILayoutTemplate -->
<z3c:layout
name="subform"
template="subform-layout.pt"
for="z3c.form.interfaces.IForm"
layer=".interfaces.IDivFormLayer"
/>
<include file="div-form-layer.zcml" />
<include file="div-form-browser.zcml" />
<include file="div-form-macros.zcml" />
<include file="div-form-templates.zcml" />

</configure>
19 changes: 19 additions & 0 deletions src/z3c/formui/table-form-browser.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser">

<browser:resource
name="table-form.css"
file="table-form.css"
layer=".interfaces.ITableFormLayer"
/>
<browser:viewlet
name="table-form.css"
for="*"
manager=".interfaces.ICSS"
class=".browser.TableFormCSSViewlet"
permission="zope.Public"
layer=".interfaces.ITableFormLayer"
/>

</configure>
9 changes: 9 additions & 0 deletions src/z3c/formui/table-form-layer.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<configure
xmlns="http://namespaces.zope.org/zope">

<interface
interface=".interfaces.ITableFormLayer"
type="zope.publisher.interfaces.browser.IBrowserSkinType"
/>

</configure>
82 changes: 82 additions & 0 deletions src/z3c/formui/table-form-macros.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:z3c="http://namespaces.zope.org/z3c">

<!-- form macros -->
<z3c:macro
name="form"
template="table-form.pt"
layer=".interfaces.ITableFormLayer"
/>
<z3c:macro
name="subform"
template="table-form.pt"
layer=".interfaces.ITableFormLayer"
/>
<z3c:macro
name="subform-display"
template="table-form-display.pt"
layer=".interfaces.ITableFormLayer"
/>
<z3c:macro
name="form-label"
macro="label"
template="table-form.pt"
layer=".interfaces.ITableFormLayer"
/>
<z3c:macro
name="form-required-info"
macro="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="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"
layer=".interfaces.ITableFormLayer"
/>

</configure>
Loading

0 comments on commit 54dadff

Please sign in to comment.