[Checkins] SVN: five.megrok.z3cform/branches/based-on-megrok.z3cform.base/ use z3c.form 2.1 & fix tests
Jean-Francois Roche
jfroche at jfroche.be
Mon Sep 28 09:27:59 EDT 2009
Log message for revision 104589:
use z3c.form 2.1 & fix tests
Changed:
U five.megrok.z3cform/branches/based-on-megrok.z3cform.base/buildout.cfg
U five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/form/form.py
U five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/formwithlayout/formwithlayout.py
-=-
Modified: five.megrok.z3cform/branches/based-on-megrok.z3cform.base/buildout.cfg
===================================================================
--- five.megrok.z3cform/branches/based-on-megrok.z3cform.base/buildout.cfg 2009-09-28 11:25:50 UTC (rev 104588)
+++ five.megrok.z3cform/branches/based-on-megrok.z3cform.base/buildout.cfg 2009-09-28 13:27:58 UTC (rev 104589)
@@ -10,7 +10,7 @@
versions = versions
[versions]
-z3c.form = 1.9.0
+z3c.form = 2.1.0
grokcore.annotation = 1.1
grokcore.component = 1.7
grokcore.formlib = 1.4
@@ -25,7 +25,6 @@
zope.component = 3.4.0
zope.i18n = 3.4.0
zope.interface = 3.4.1
-zope.schema = 3.4.0
zope.securitypolicy = 3.4.1
zope.testing = 3.7.6
@@ -81,6 +80,7 @@
fake-zope-eggs = true
skip-fake-eggs =
zope.component
+ zope.schema
[instance]
recipe = plone.recipe.zope2instance
Modified: five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/form/form.py
===================================================================
--- five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/form/form.py 2009-09-28 11:25:50 UTC (rev 104588)
+++ five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/form/form.py 2009-09-28 13:27:58 UTC (rev 104589)
@@ -18,44 +18,44 @@
>>> edit = getMultiAdapter((manfred, request), name='edit')
>>> print edit()
<form action="http://127.0.0.1" method="post"
- enctype="multipart/form-data">
- <div class="row">
- <div class="field">
- <label for="form-widgets-name">
- <span>Name</span>
- </label>
- <span class="fieldRequired"
- title="Required">
- (Required)
- </span>
- <div class="widget">
- <input type="text" id="form-widgets-name"
- name="form.widgets.name"
- class="text-widget required textline-field" value="" />
+ enctype="multipart/form-data">
+ <div class="row">
+ <div class="field">
+ <label for="form-widgets-name">
+ <span>Name</span>
+ </label>
+ <span class="fieldRequired"
+ title="Required">
+ (Required)
+ </span>
+ <div class="widget">
+ <input id="form-widgets-name" name="form.widgets.name"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </div>
+ </div>
</div>
- </div>
- </div>
- <div class="row">
- <div class="field">
- <label for="form-widgets-age">
- <span>Age</span>
- </label>
- <span class="fieldRequired"
- title="Required">
- (Required)
- </span>
- <div class="widget">
- <input type="text" id="form-widgets-age"
- name="form.widgets.age"
- class="text-widget required int-field" value="" />
+ <div class="row">
+ <div class="field">
+ <label for="form-widgets-age">
+ <span>Age</span>
+ </label>
+ <span class="fieldRequired"
+ title="Required">
+ (Required)
+ </span>
+ <div class="widget">
+ <input id="form-widgets-age" name="form.widgets.age"
+ class="text-widget required int-field" value=""
+ type="text" />
+ </div>
+ </div>
</div>
+ <div class="action">
+ <input id="form-buttons-apply" name="form.buttons.apply"
+ class="submit-widget button-field" value="Apply"
+ type="submit" />
</div>
- </div>
- <div class="action">
- <input type="submit" id="form-buttons-apply"
- name="form.buttons.apply"
- class="submit-widget button-field" value="Apply" />
- </div>
</form>
"""
Modified: five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/formwithlayout/formwithlayout.py
===================================================================
--- five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/formwithlayout/formwithlayout.py 2009-09-28 11:25:50 UTC (rev 104588)
+++ five.megrok.z3cform/branches/based-on-megrok.z3cform.base/src/five/megrok/z3cform/tests/formwithlayout/formwithlayout.py 2009-09-28 13:27:58 UTC (rev 104589)
@@ -20,53 +20,53 @@
>>> edit
<plone.z3cform.layout.MyFormWrapper object at ...>
>>> print edit()
- <html xmlns="http://www.w3.org/1999/xhtml">
- <body>
- <h1></h1>
- <div id="layout-contents">
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <body>
+ <h1></h1>
+ <div id="layout-contents">
<form action="http://127.0.0.1" method="post"
- enctype="multipart/form-data">
- <div class="row">
- <div class="field">
- <label for="form-widgets-name">
- <span>Name</span>
- </label>
- <span class="fieldRequired"
- title="Required">
- (Required)
- </span>
- <div class="widget">
- <input type="text" id="form-widgets-name"
- name="form.widgets.name"
- class="text-widget required textline-field" value="" />
+ enctype="multipart/form-data">
+ <div class="row">
+ <div class="field">
+ <label for="form-widgets-name">
+ <span>Name</span>
+ </label>
+ <span class="fieldRequired"
+ title="Required">
+ (Required)
+ </span>
+ <div class="widget">
+ <input id="form-widgets-name" name="form.widgets.name"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </div>
</div>
- </div>
- </div>
- <div class="row">
- <div class="field">
- <label for="form-widgets-age">
- <span>Age</span>
- </label>
- <span class="fieldRequired"
- title="Required">
- (Required)
- </span>
- <div class="widget">
- <input type="text" id="form-widgets-age"
- name="form.widgets.age"
- class="text-widget required int-field" value="" />
+ </div>
+ <div class="row">
+ <div class="field">
+ <label for="form-widgets-age">
+ <span>Age</span>
+ </label>
+ <span class="fieldRequired"
+ title="Required">
+ (Required)
+ </span>
+ <div class="widget">
+ <input id="form-widgets-age" name="form.widgets.age"
+ class="text-widget required int-field" value=""
+ type="text" />
+ </div>
</div>
- </div>
+ </div>
+ <div class="action">
+ <input id="form-buttons-apply" name="form.buttons.apply"
+ class="submit-widget button-field" value="Apply"
+ type="submit" />
</div>
- <div class="action">
- <input type="submit" id="form-buttons-apply"
- name="form.buttons.apply"
- class="submit-widget button-field" value="Apply" />
- </div>
- </form>
- </div>
- </body>
- </html>
+ </form>
+ </div>
+ </body>
+ </html>
"""
import os
from five import grok
More information about the checkins
mailing list