[Checkins] SVN: z3c.contents/trunk/ adjust imports, reflect changes in zope packages
Roger Ineichen
roger at projekt01.ch
Sun Nov 29 02:55:45 EST 2009
Log message for revision 106098:
adjust imports, reflect changes in zope packages
Changed:
U z3c.contents/trunk/CHANGES.txt
U z3c.contents/trunk/setup.py
U z3c.contents/trunk/src/z3c/contents/README.txt
U z3c.contents/trunk/src/z3c/contents/browser.py
U z3c.contents/trunk/src/z3c/contents/configure.zcml
U z3c.contents/trunk/src/z3c/contents/ftesting.zcml
U z3c.contents/trunk/src/z3c/contents/testing.py
U z3c.contents/trunk/src/z3c/contents/value.py
-=-
Modified: z3c.contents/trunk/CHANGES.txt
===================================================================
--- z3c.contents/trunk/CHANGES.txt 2009-11-29 04:53:08 UTC (rev 106097)
+++ z3c.contents/trunk/CHANGES.txt 2009-11-29 07:55:45 UTC (rev 106098)
@@ -2,15 +2,18 @@
CHANGES
=======
-Version 0.5.1dev (unreleased)
------------------------------
+0.6.0 (2009-11-29)
+------------------
+- adjust imports, reflect changes in zope packages
+
- Fix error in the template when ``allowSearch`` attribute of
the view is set to False and there's no search form.
-Version 0.5.0 (2008-04-13)
---------------------------
+0.5.0 (2008-04-13)
+------------------
+
- Refactored the search implementation. Now it's very easy to customize the
search. The offered z3c.table.interfaces.IValue adapter based search allows
us to implement any kind of search patters for any context and table
Modified: z3c.contents/trunk/setup.py
===================================================================
--- z3c.contents/trunk/setup.py 2009-11-29 04:53:08 UTC (rev 106097)
+++ z3c.contents/trunk/setup.py 2009-11-29 07:55:45 UTC (rev 106098)
@@ -23,7 +23,7 @@
setup (
name='z3c.contents',
- version='0.5.1dev',
+ version='0.6.0',
author = "Roger Ineichen and the Zope Community",
author_email = "zope3-dev at zope.org",
description = "Container management page based on z3c.form and z3c.table for Zope3",
@@ -56,6 +56,7 @@
'z3c.macro',
'z3c.table',
'z3c.etestbrowser',
+ 'zope.app.component',
'zope.app.pagetemplate',
'zope.app.securitypolicy',
'zope.app.testing',
@@ -64,16 +65,13 @@
),
install_requires = [
'setuptools',
- 'z3c.batching',
'z3c.form',
'z3c.formui',
- 'z3c.macro',
'z3c.table',
'z3c.template',
'zope.annotation',
- 'zope.app.container',
'zope.component',
- 'zope.contentprovider',
+ 'zope.container',
'zope.copypastemove',
'zope.exceptions',
'zope.i18n',
@@ -82,7 +80,6 @@
'zope.interface',
'zope.publisher',
'zope.schema',
- 'zope.schema',
'zope.security',
'zope.traversing',
],
Modified: z3c.contents/trunk/src/z3c/contents/README.txt
===================================================================
--- z3c.contents/trunk/src/z3c/contents/README.txt 2009-11-29 04:53:08 UTC (rev 106097)
+++ z3c.contents/trunk/src/z3c/contents/README.txt 2009-11-29 07:55:45 UTC (rev 106098)
@@ -11,19 +11,9 @@
Let's create a sample container which we can use as our context:
- >>> import zope.app.container.interfaces
- >>> class IContainer(zope.app.container.interfaces.IContainer):
- ... """Custom container marker use as discriminator."""
+ >>> from z3c.contents import testing
+ >>> container = testing.SampleContainer()
- >>> import zope.interface
- >>> from zope.app.container import btree
- >>> class Container(btree.BTreeContainer):
- ... """Sample container."""
- ...
- ... zope.interface.implements(IContainer)
- ...
- >>> container = Container()
-
add them to the root:
>>> root['container'] = container
@@ -75,6 +65,7 @@
registered correctly.
>>> from zope.configuration import xmlconfig
+ >>> import zope.i18n
>>> import zope.component
>>> import zope.viewlet
>>> import zope.app.component
@@ -82,6 +73,7 @@
>>> import z3c.macro
>>> import z3c.template
>>> import z3c.formui
+ >>> xmlconfig.XMLConfig('meta.zcml', zope.i18n)()
>>> xmlconfig.XMLConfig('meta.zcml', zope.component)()
>>> xmlconfig.XMLConfig('meta.zcml', zope.viewlet)()
>>> xmlconfig.XMLConfig('meta.zcml', zope.app.component)()
@@ -112,28 +104,46 @@
enctype="multipart/form-data" class="edit-form"
name="contents" id="contents">
<div class="viewspace">
- <div class="required-info">
- <span class="required">*</span>
- – required
- </div>
<div>
- ...
+ <fieldset>
+ <legend>Search</legend>
+ <table>
+ <tr>
+ <td class="row">
+ <label for="search-widgets-searchterm">Search</label>
+ <input id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </td>
+ <td class="action">
+ <input id="search-buttons-search"
+ name="search.buttons.search"
+ class="submit-widget button-field" value="Search"
+ type="submit" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
</div>
</div>
<div>
<div class="buttons">
- <input type="submit" id="contents-buttons-copy"
- name="contents.buttons.copy"
- class="submit-widget button-field" value="Copy" />
- <input type="submit" id="contents-buttons-cut"
- name="contents.buttons.cut"
- class="submit-widget button-field" value="Cut" />
- <input type="submit" id="contents-buttons-delete"
- name="contents.buttons.delete"
- class="submit-widget button-field" value="Delete" />
- <input type="submit" id="contents-buttons-rename"
- name="contents.buttons.rename"
- class="submit-widget button-field" value="Rename" />
+ <input id="contents-buttons-copy"
+ name="contents.buttons.copy"
+ class="submit-widget button-field" value="Copy"
+ type="submit" />
+ <input id="contents-buttons-cut" name="contents.buttons.cut"
+ class="submit-widget button-field" value="Cut"
+ type="submit" />
+ <input id="contents-buttons-delete"
+ name="contents.buttons.delete"
+ class="submit-widget button-field" value="Delete"
+ type="submit" />
+ <input id="contents-buttons-rename"
+ name="contents.buttons.rename"
+ class="submit-widget button-field" value="Rename"
+ type="submit" />
</div>
</div>
</form>
@@ -147,6 +157,7 @@
for this:
>>> import zope.component
+ >>> from zope.container.interfaces import IContainer
>>> from z3c.table.interfaces import IColumn
>>> from z3c.contents import interfaces
>>> from z3c.table.column import CheckBoxColumn
@@ -177,70 +188,88 @@
enctype="multipart/form-data" class="edit-form"
name="contents" id="contents">
<div class="viewspace">
- <div class="required-info">
- <span class="required">*</span>
- – required
- </div>
<div>
- ...
- <table>
- <thead>
- <tr>
- <th>X</th>
- <th>Name</th>
- <th>Created</th>
- <th>Modified</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="first" /></td>
- <td><a href="http://127.0.0.1/container/first">first</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="fourth" /></td>
- <td><a href="http://127.0.0.1/container/fourth">fourth</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="second" /></td>
- <td><a href="http://127.0.0.1/container/second">second</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="third" /></td>
- <td><a href="http://127.0.0.1/container/third">third</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
- <td><a href="http://127.0.0.1/container/zero">zero</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- </tbody>
- </table>
- </div>
+ <fieldset>
+ <legend>Search</legend>
+ <table>
+ <tr>
+ <td class="row">
+ <label for="search-widgets-searchterm">Search</label>
+ <input id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </td>
+ <td class="action">
+ <input id="search-buttons-search"
+ name="search.buttons.search"
+ class="submit-widget button-field" value="Search"
+ type="submit" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <table>
+ <thead>
+ <tr>
+ <th>X</th>
+ <th>Name</th>
+ <th>Created</th>
+ <th>Modified</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="first" /></td>
+ <td><a href="http://127.0.0.1/container/first">first</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="fourth" /></td>
+ <td><a href="http://127.0.0.1/container/fourth">fourth</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="second" /></td>
+ <td><a href="http://127.0.0.1/container/second">second</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="third" /></td>
+ <td><a href="http://127.0.0.1/container/third">third</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
+ <td><a href="http://127.0.0.1/container/zero">zero</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ </tbody>
+ </table>
</div>
+ </div>
<div>
<div class="buttons">
- <input type="submit" id="contents-buttons-copy"
- name="contents.buttons.copy"
- class="submit-widget button-field" value="Copy" />
- <input type="submit" id="contents-buttons-cut"
- name="contents.buttons.cut"
- class="submit-widget button-field" value="Cut" />
- <input type="submit" id="contents-buttons-delete"
- name="contents.buttons.delete"
- class="submit-widget button-field" value="Delete" />
- <input type="submit" id="contents-buttons-rename"
- name="contents.buttons.rename"
- class="submit-widget button-field" value="Rename" />
+ <input id="contents-buttons-copy"
+ name="contents.buttons.copy"
+ class="submit-widget button-field" value="Copy"
+ type="submit" />
+ <input id="contents-buttons-cut" name="contents.buttons.cut"
+ class="submit-widget button-field" value="Cut"
+ type="submit" />
+ <input id="contents-buttons-delete"
+ name="contents.buttons.delete"
+ class="submit-widget button-field" value="Delete"
+ type="submit" />
+ <input id="contents-buttons-rename"
+ name="contents.buttons.rename"
+ class="submit-widget button-field" value="Rename"
+ type="submit" />
</div>
</div>
</form>
@@ -262,40 +291,92 @@
<form action="http://127.0.0.1" method="post"
enctype="multipart/form-data" class="edit-form"
name="contents" id="contents">
- ...
- <tbody>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
- <td><a href="http://127.0.0.1/container/zero">zero</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="third" /></td>
- <td><a href="http://127.0.0.1/container/third">third</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="second" /></td>
- <td><a href="http://127.0.0.1/container/second">second</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="fourth" /></td>
- <td><a href="http://127.0.0.1/container/fourth">fourth</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="first" /></td>
- <td><a href="http://127.0.0.1/container/first">first</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- </tbody>
- ...
+ <div class="viewspace">
+ <div>
+ <fieldset>
+ <legend>Search</legend>
+ <table>
+ <tr>
+ <td class="row">
+ <label for="search-widgets-searchterm">Search</label>
+ <input id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </td>
+ <td class="action">
+ <input id="search-buttons-search"
+ name="search.buttons.search"
+ class="submit-widget button-field" value="Search"
+ type="submit" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <table>
+ <thead>
+ <tr>
+ <th>X</th>
+ <th>Name</th>
+ <th>Created</th>
+ <th>Modified</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
+ <td><a href="http://127.0.0.1/container/zero">zero</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="third" /></td>
+ <td><a href="http://127.0.0.1/container/third">third</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="second" /></td>
+ <td><a href="http://127.0.0.1/container/second">second</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="fourth" /></td>
+ <td><a href="http://127.0.0.1/container/fourth">fourth</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="first" /></td>
+ <td><a href="http://127.0.0.1/container/first">first</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div>
+ <div class="buttons">
+ <input id="contents-buttons-copy"
+ name="contents.buttons.copy"
+ class="submit-widget button-field" value="Copy"
+ type="submit" />
+ <input id="contents-buttons-cut" name="contents.buttons.cut"
+ class="submit-widget button-field" value="Cut"
+ type="submit" />
+ <input id="contents-buttons-delete"
+ name="contents.buttons.delete"
+ class="submit-widget button-field" value="Delete"
+ type="submit" />
+ <input id="contents-buttons-rename"
+ name="contents.buttons.rename"
+ class="submit-widget button-field" value="Rename"
+ type="submit" />
+ </div>
+ </div>
+ </form>
Let's make coverage happy and sort on the rename column:
@@ -348,7 +429,7 @@
First we need to setup another container which we can copy to:
- >>> secondContainer = Container()
+ >>> secondContainer = testing.SampleContainer()
>>> root['secondContainer'] = secondContainer
And we need another contents page instance:
@@ -364,26 +445,41 @@
enctype="multipart/form-data" class="edit-form"
name="contents" id="contents">
<div class="viewspace">
- <div class="required-info">
- <span class="required">*</span>
- – required
- </div>
<div>
- ...
- <table>
- <thead>
- <tr>
- <th>X</th>
- <th>Name</th>
- <th>Created</th>
- <th>Modified</th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
- </div>
+ <fieldset>
+ <legend>Search</legend>
+ <table>
+ <tr>
+ <td class="row">
+ <label for="search-widgets-searchterm">Search</label>
+ <input id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </td>
+ <td class="action">
+ <input id="search-buttons-search"
+ name="search.buttons.search"
+ class="submit-widget button-field" value="Search"
+ type="submit" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <table>
+ <thead>
+ <tr>
+ <th>X</th>
+ <th>Name</th>
+ <th>Created</th>
+ <th>Modified</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
</div>
+ </div>
<div>
<div class="buttons">
</div>
@@ -407,69 +503,96 @@
<form action="http://127.0.0.1" method="post"
enctype="multipart/form-data" class="edit-form"
name="contents" id="contents">
- ...
+ <div class="viewspace">
<div class="status">
<div class="summary">Items choosen for copy</div>
</div>
- ...
- <thead>
- <tr>
- <th>X</th>
- <th>Name</th>
- <th>Created</th>
- <th>Modified</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="first" /></td>
- <td><a href="http://127.0.0.1/container/first">first</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="fourth" /></td>
- <td><a href="http://127.0.0.1/container/fourth">fourth</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="second" /></td>
- <td><a href="http://127.0.0.1/container/second">second</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="third" /></td>
- <td><a href="http://127.0.0.1/container/third">third</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" checked="checked" /></td>
- <td><a href="http://127.0.0.1/container/zero">zero</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- </tbody>
- ...
+ <div>
+ <fieldset>
+ <legend>Search</legend>
+ <table>
+ <tr>
+ <td class="row">
+ <label for="search-widgets-searchterm">Search</label>
+ <input id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </td>
+ <td class="action">
+ <input id="search-buttons-search"
+ name="search.buttons.search"
+ class="submit-widget button-field" value="Search"
+ type="submit" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <table>
+ <thead>
+ <tr>
+ <th>X</th>
+ <th>Name</th>
+ <th>Created</th>
+ <th>Modified</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="first" /></td>
+ <td><a href="http://127.0.0.1/container/first">first</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="fourth" /></td>
+ <td><a href="http://127.0.0.1/container/fourth">fourth</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="second" /></td>
+ <td><a href="http://127.0.0.1/container/second">second</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="third" /></td>
+ <td><a href="http://127.0.0.1/container/third">third</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" checked="checked" /></td>
+ <td><a href="http://127.0.0.1/container/zero">zero</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
<div>
<div class="buttons">
- <input type="submit" id="contents-buttons-copy"
- name="contents.buttons.copy"
- class="submit-widget button-field" value="Copy" />
- <input type="submit" id="contents-buttons-cut"
- name="contents.buttons.cut"
- class="submit-widget button-field" value="Cut" />
- <input type="submit" id="contents-buttons-paste"
- name="contents.buttons.paste"
- class="submit-widget button-field" value="Paste" />
- <input type="submit" id="contents-buttons-delete"
- name="contents.buttons.delete"
- class="submit-widget button-field" value="Delete" />
- <input type="submit" id="contents-buttons-rename"
- name="contents.buttons.rename"
- class="submit-widget button-field" value="Rename" />
+ <input id="contents-buttons-copy"
+ name="contents.buttons.copy"
+ class="submit-widget button-field" value="Copy"
+ type="submit" />
+ <input id="contents-buttons-cut" name="contents.buttons.cut"
+ class="submit-widget button-field" value="Cut"
+ type="submit" />
+ <input id="contents-buttons-paste"
+ name="contents.buttons.paste"
+ class="submit-widget button-field" value="Paste"
+ type="submit" />
+ <input id="contents-buttons-delete"
+ name="contents.buttons.delete"
+ class="submit-widget button-field" value="Delete"
+ type="submit" />
+ <input id="contents-buttons-rename"
+ name="contents.buttons.rename"
+ class="submit-widget button-field" value="Rename"
+ type="submit" />
</div>
</div>
</form>
@@ -492,37 +615,72 @@
<form action="http://127.0.0.1" method="post"
enctype="multipart/form-data" class="edit-form"
name="contents" id="contents">
- ...
+ <div class="viewspace">
<div class="status">
<div class="summary">Data successfully pasted</div>
</div>
- ...
- <tbody>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
- <td><a href="http://127.0.0.1/secondContainer/zero">zero</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- </tbody>
- ...
+ <div>
+ <fieldset>
+ <legend>Search</legend>
+ <table>
+ <tr>
+ <td class="row">
+ <label for="search-widgets-searchterm">Search</label>
+ <input id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </td>
+ <td class="action">
+ <input id="search-buttons-search"
+ name="search.buttons.search"
+ class="submit-widget button-field" value="Search"
+ type="submit" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <table>
+ <thead>
+ <tr>
+ <th>X</th>
+ <th>Name</th>
+ <th>Created</th>
+ <th>Modified</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
+ <td><a href="http://127.0.0.1/secondContainer/zero">zero</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
<div>
<div class="buttons">
- <input type="submit" id="contents-buttons-copy"
- name="contents.buttons.copy"
- class="submit-widget button-field" value="Copy" />
- <input type="submit" id="contents-buttons-cut"
- name="contents.buttons.cut"
- class="submit-widget button-field" value="Cut" />
- <input type="submit" id="contents-buttons-paste"
- name="contents.buttons.paste"
- class="submit-widget button-field" value="Paste" />
- <input type="submit" id="contents-buttons-delete"
- name="contents.buttons.delete"
- class="submit-widget button-field" value="Delete" />
- <input type="submit" id="contents-buttons-rename"
- name="contents.buttons.rename"
- class="submit-widget button-field" value="Rename" />
+ <input id="contents-buttons-copy"
+ name="contents.buttons.copy"
+ class="submit-widget button-field" value="Copy"
+ type="submit" />
+ <input id="contents-buttons-cut" name="contents.buttons.cut"
+ class="submit-widget button-field" value="Cut"
+ type="submit" />
+ <input id="contents-buttons-paste"
+ name="contents.buttons.paste"
+ class="submit-widget button-field" value="Paste"
+ type="submit" />
+ <input id="contents-buttons-delete"
+ name="contents.buttons.delete"
+ class="submit-widget button-field" value="Delete"
+ type="submit" />
+ <input id="contents-buttons-rename"
+ name="contents.buttons.rename"
+ class="submit-widget button-field" value="Rename"
+ type="submit" />
</div>
</div>
</form>
@@ -596,46 +754,80 @@
<form action="http://127.0.0.1" method="post"
enctype="multipart/form-data" class="edit-form"
name="contents" id="contents">
- ...
+ <div class="viewspace">
<div class="status">
<div class="summary">Data successfully pasted</div>
</div>
- ...
- <tbody>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="first" /></td>
- <td><a href="http://127.0.0.1/secondContainer/first">first</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="second" /></td>
- <td><a href="http://127.0.0.1/secondContainer/second">second</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
- <td><a href="http://127.0.0.1/secondContainer/zero">zero</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- </tbody>
- ...
+ <div>
+ <fieldset>
+ <legend>Search</legend>
+ <table>
+ <tr>
+ <td class="row">
+ <label for="search-widgets-searchterm">Search</label>
+ <input id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </td>
+ <td class="action">
+ <input id="search-buttons-search"
+ name="search.buttons.search"
+ class="submit-widget button-field" value="Search"
+ type="submit" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <table>
+ <thead>
+ <tr>
+ <th>X</th>
+ <th>Name</th>
+ <th>Created</th>
+ <th>Modified</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="first" /></td>
+ <td><a href="http://127.0.0.1/secondContainer/first">first</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="second" /></td>
+ <td><a href="http://127.0.0.1/secondContainer/second">second</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
+ <td><a href="http://127.0.0.1/secondContainer/zero">zero</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
<div>
<div class="buttons">
- <input type="submit" id="contents-buttons-copy"
+ <input id="contents-buttons-copy"
name="contents.buttons.copy"
- class="submit-widget button-field" value="Copy" />
- <input type="submit" id="contents-buttons-cut"
- name="contents.buttons.cut"
- class="submit-widget button-field" value="Cut" />
- <input type="submit" id="contents-buttons-delete"
+ class="submit-widget button-field" value="Copy"
+ type="submit" />
+ <input id="contents-buttons-cut" name="contents.buttons.cut"
+ class="submit-widget button-field" value="Cut"
+ type="submit" />
+ <input id="contents-buttons-delete"
name="contents.buttons.delete"
- class="submit-widget button-field" value="Delete" />
- <input type="submit" id="contents-buttons-rename"
+ class="submit-widget button-field" value="Delete"
+ type="submit" />
+ <input id="contents-buttons-rename"
name="contents.buttons.rename"
- class="submit-widget button-field" value="Rename" />
+ class="submit-widget button-field" value="Rename"
+ type="submit" />
</div>
</div>
</form>
@@ -650,42 +842,77 @@
<form action="http://127.0.0.1" method="post"
enctype="multipart/form-data" class="edit-form"
name="contents" id="contents">
- ...
- <tbody>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="fourth" /></td>
- <td><a href="http://127.0.0.1/container/fourth">fourth</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="third" /></td>
- <td><a href="http://127.0.0.1/container/third">third</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- <tr>
- <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
- <td><a href="http://127.0.0.1/container/zero">zero</a></td>
- <td>01/01/01 01:01</td>
- <td>02/02/02 02:02</td>
- </tr>
- </tbody>
- ...
+ <div class="viewspace">
+ <div>
+ <fieldset>
+ <legend>Search</legend>
+ <table>
+ <tr>
+ <td class="row">
+ <label for="search-widgets-searchterm">Search</label>
+ <input id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field"
+ value="" type="text" />
+ </td>
+ <td class="action">
+ <input id="search-buttons-search"
+ name="search.buttons.search"
+ class="submit-widget button-field" value="Search"
+ type="submit" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <table>
+ <thead>
+ <tr>
+ <th>X</th>
+ <th>Name</th>
+ <th>Created</th>
+ <th>Modified</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="fourth" /></td>
+ <td><a href="http://127.0.0.1/container/fourth">fourth</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="third" /></td>
+ <td><a href="http://127.0.0.1/container/third">third</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" class="checkbox-widget" name="contents-checkBoxColumn-0-selectedItems" value="zero" /></td>
+ <td><a href="http://127.0.0.1/container/zero">zero</a></td>
+ <td>01/01/01 01:01</td>
+ <td>02/02/02 02:02</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
<div>
<div class="buttons">
- <input type="submit" id="contents-buttons-copy"
- name="contents.buttons.copy"
- class="submit-widget button-field" value="Copy" />
- <input type="submit" id="contents-buttons-cut"
- name="contents.buttons.cut"
- class="submit-widget button-field" value="Cut" />
- <input type="submit" id="contents-buttons-delete"
- name="contents.buttons.delete"
- class="submit-widget button-field" value="Delete" />
- <input type="submit" id="contents-buttons-rename"
- name="contents.buttons.rename"
- class="submit-widget button-field" value="Rename" />
+ <input id="contents-buttons-copy"
+ name="contents.buttons.copy"
+ class="submit-widget button-field" value="Copy"
+ type="submit" />
+ <input id="contents-buttons-cut" name="contents.buttons.cut"
+ class="submit-widget button-field" value="Cut"
+ type="submit" />
+ <input id="contents-buttons-delete"
+ name="contents.buttons.delete"
+ class="submit-widget button-field" value="Delete"
+ type="submit" />
+ <input id="contents-buttons-rename"
+ name="contents.buttons.rename"
+ class="submit-widget button-field" value="Rename"
+ type="submit" />
</div>
</div>
</form>
@@ -982,10 +1209,6 @@
enctype="multipart/form-data" class="edit-form"
name="contents" id="contents">
<div class="viewspace">
- <div class="required-info">
- <span class="required">*</span>
- – required
- </div>
<div>
<fieldset>
<legend>Search</legend>
@@ -993,14 +1216,16 @@
<tr>
<td class="row">
<label for="search-widgets-searchterm">Search</label>
- <input type="text" id="search-widgets-searchterm"
- name="search.widgets.searchterm"
- class="text-widget required textline-field" value="" />
+ <input id="search-widgets-searchterm"
+ name="search.widgets.searchterm"
+ class="text-widget required textline-field"
+ value="" type="text" />
</td>
<td class="action">
- <input type="submit" id="search-buttons-search"
+ <input id="search-buttons-search"
name="search.buttons.search"
- class="submit-widget button-field" value="Search" />
+ class="submit-widget button-field" value="Search"
+ type="submit" />
</td>
</tr>
</table>
@@ -1039,18 +1264,21 @@
</div>
<div>
<div class="buttons">
- <input type="submit" id="contents-buttons-copy"
+ <input id="contents-buttons-copy"
name="contents.buttons.copy"
- class="submit-widget button-field" value="Copy" />
- <input type="submit" id="contents-buttons-cut"
- name="contents.buttons.cut"
- class="submit-widget button-field" value="Cut" />
- <input type="submit" id="contents-buttons-delete"
+ class="submit-widget button-field" value="Copy"
+ type="submit" />
+ <input id="contents-buttons-cut" name="contents.buttons.cut"
+ class="submit-widget button-field" value="Cut"
+ type="submit" />
+ <input id="contents-buttons-delete"
name="contents.buttons.delete"
- class="submit-widget button-field" value="Delete" />
- <input type="submit" id="contents-buttons-rename"
+ class="submit-widget button-field" value="Delete"
+ type="submit" />
+ <input id="contents-buttons-rename"
name="contents.buttons.rename"
- class="submit-widget button-field" value="Rename" />
+ class="submit-widget button-field" value="Rename"
+ type="submit" />
</div>
</div>
</form>
Modified: z3c.contents/trunk/src/z3c/contents/browser.py
===================================================================
--- z3c.contents/trunk/src/z3c/contents/browser.py 2009-11-29 04:53:08 UTC (rev 106097)
+++ z3c.contents/trunk/src/z3c/contents/browser.py 2009-11-29 07:55:45 UTC (rev 106098)
@@ -21,6 +21,8 @@
import zope.i18nmessageid
import zope.i18n
from zope.annotation.interfaces import IAnnotations
+from zope.container.interfaces import IContainerNamesContainer
+from zope.container.interfaces import DuplicateIDError
from zope.copypastemove import ItemNotFoundError
from zope.copypastemove.interfaces import IPrincipalClipboard
from zope.copypastemove.interfaces import IObjectCopier, IObjectMover
@@ -31,8 +33,6 @@
from zope.security.interfaces import Unauthorized
from zope.traversing.interfaces import TraversalError
from zope.traversing import api
-from zope.app.container.interfaces import IContainerNamesContainer
-from zope.app.container.interfaces import DuplicateIDError
from z3c.form import button, field
from z3c.formui import form
Modified: z3c.contents/trunk/src/z3c/contents/configure.zcml
===================================================================
--- z3c.contents/trunk/src/z3c/contents/configure.zcml 2009-11-29 04:53:08 UTC (rev 106097)
+++ z3c.contents/trunk/src/z3c/contents/configure.zcml 2009-11-29 07:55:45 UTC (rev 106098)
@@ -10,7 +10,7 @@
<adapter
name="checkBoxColumn"
factory="z3c.table.column.CheckBoxColumn"
- for="zope.app.container.interfaces.IContainer
+ for="zope.container.interfaces.IContainer
zope.interface.Interface
z3c.contents.interfaces.IContentsPage"
provides="z3c.table.interfaces.IColumn"
@@ -19,7 +19,7 @@
<adapter
name="renameColumn"
factory="z3c.contents.column.RenameColumn"
- for="zope.app.container.interfaces.IContainer
+ for="zope.container.interfaces.IContainer
zope.interface.Interface
z3c.contents.interfaces.IContentsPage"
provides="z3c.table.interfaces.IColumn"
@@ -28,7 +28,7 @@
<adapter
name="createdColumn"
factory="z3c.table.column.CreatedColumn"
- for="zope.app.container.interfaces.IContainer
+ for="zope.container.interfaces.IContainer
zope.interface.Interface
z3c.contents.interfaces.IContentsPage"
provides="z3c.table.interfaces.IColumn"
@@ -37,7 +37,7 @@
<adapter
name="modifiedColumn"
factory="z3c.table.column.ModifiedColumn"
- for="zope.app.container.interfaces.IContainer
+ for="zope.container.interfaces.IContainer
zope.interface.Interface
z3c.contents.interfaces.IContentsPage"
provides="z3c.table.interfaces.IColumn"
@@ -47,7 +47,7 @@
leaving out CheckBoxColumn -->
<adapter
factory="z3c.contents.header.ContentsColumnHeader"
- for="zope.app.container.interfaces.IContainer
+ for="zope.container.interfaces.IContainer
zope.interface.Interface
z3c.contents.interfaces.IContentsPage
z3c.contents.column.RenameColumn"
@@ -56,7 +56,7 @@
<adapter
factory="z3c.contents.header.ContentsColumnHeader"
- for="zope.app.container.interfaces.IContainer
+ for="zope.container.interfaces.IContainer
zope.interface.Interface
z3c.contents.interfaces.IContentsPage
z3c.table.column.CreatedColumn"
@@ -65,7 +65,7 @@
<adapter
factory="z3c.contents.header.ContentsColumnHeader"
- for="zope.app.container.interfaces.IContainer
+ for="zope.container.interfaces.IContainer
zope.interface.Interface
z3c.contents.interfaces.IContentsPage
z3c.table.column.ModifiedColumn"
Modified: z3c.contents/trunk/src/z3c/contents/ftesting.zcml
===================================================================
--- z3c.contents/trunk/src/z3c/contents/ftesting.zcml 2009-11-29 04:53:08 UTC (rev 106097)
+++ z3c.contents/trunk/src/z3c/contents/ftesting.zcml 2009-11-29 07:55:45 UTC (rev 106098)
@@ -5,14 +5,14 @@
i18n_domain="demo">
<include package="zope.app.component" file="meta.zcml" />
- <include package="zope.app.component.browser" file="meta.zcml" />
- <include package="zope.app.container.browser" file="meta.zcml" />
<include package="zope.app.form.browser" file="meta.zcml" />
<include package="zope.app.pagetemplate" file="meta.zcml" />
<include package="zope.app.publication" file="meta.zcml" />
<include package="zope.app.publisher" file="meta.zcml" />
<include package="zope.app.security" file="meta.zcml" />
<include package="zope.app.securitypolicy" file="meta.zcml" />
+ <include package="zope.app.container.browser" file="meta.zcml" />
+ <include package="zope.i18n" file="meta.zcml" />
<include package="zope.viewlet" file="meta.zcml" />
<include package="z3c.form" file="meta.zcml" />
<include package="z3c.macro" file="meta.zcml" />
@@ -25,17 +25,13 @@
<include package="zope.app.appsetup" />
<include package="zope.app.component" />
<include package="zope.app.container" />
- <include package="zope.app.error" />
- <include package="zope.app.folder" />
- <include package="zope.app.i18n" />
<include package="zope.app.publication" />
<include package="zope.app.security" />
<include package="zope.app.securitypolicy" />
- <include package="zope.app.session" />
- <include package="zope.app.wsgi" />
<include package="zope.annotation" />
<include package="zope.component" />
<include package="zope.contentprovider" />
+ <include package="zope.i18n" />
<include package="zope.location" />
<include package="zope.publisher" />
<include package="zope.traversing" />
@@ -75,7 +71,7 @@
<!-- test contents page for the root folder -->
<z3c:pagelet
name="index"
- for="zope.app.folder.interfaces.IRootFolder"
+ for="zope.site.interfaces.IRootFolder"
class="z3c.contents.browser.ContentsPage"
layer="z3c.contents.testing.IContentsTestBrowserLayer"
permission="zope.ManageContent"
Modified: z3c.contents/trunk/src/z3c/contents/testing.py
===================================================================
--- z3c.contents/trunk/src/z3c/contents/testing.py 2009-11-29 04:53:08 UTC (rev 106097)
+++ z3c.contents/trunk/src/z3c/contents/testing.py 2009-11-29 07:55:45 UTC (rev 106098)
@@ -20,6 +20,9 @@
import zope.component
import zope.interface
from zope.annotation.interfaces import IAnnotations
+from zope.container.interfaces import IContainer
+from zope.container.interfaces import IContained
+from zope.container import btree
from zope.copypastemove import ContainerItemRenamer
from zope.copypastemove import ObjectMover
from zope.copypastemove import ObjectCopier
@@ -30,8 +33,6 @@
from zope.copypastemove.interfaces import IPrincipalClipboard
from zope.index.text.interfaces import ISearchableText
-from zope.app.container.interfaces import IContainer
-from zope.app.container.interfaces import IContained
from zope.app.testing import functional
from zope.app.testing import setup
@@ -47,6 +48,12 @@
#
###############################################################################
+class SampleContainer(btree.BTreeContainer):
+ """Sample container."""
+
+ zope.interface.implements(IContainer)
+
+
class IContentsTestBrowserLayer(z3c.layer.ready2go.IReady2GoBrowserLayer):
"""test layer."""
Modified: z3c.contents/trunk/src/z3c/contents/value.py
===================================================================
--- z3c.contents/trunk/src/z3c/contents/value.py 2009-11-29 04:53:08 UTC (rev 106097)
+++ z3c.contents/trunk/src/z3c/contents/value.py 2009-11-29 07:55:45 UTC (rev 106098)
@@ -18,11 +18,11 @@
import zope.interface
import zope.component
+from zope.container.interfaces import IReadContainer
+from zope.container.interfaces import IObjectFindFilter
+from zope.container.find import SimpleIdFindFilter
from zope.index.text.interfaces import ISearchableText
from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.app.container.interfaces import IReadContainer
-from zope.app.container.interfaces import IObjectFindFilter
-from zope.app.container.find import SimpleIdFindFilter
import z3c.table.value
from z3c.contents import interfaces
More information about the checkins
mailing list