[Checkins] SVN: zamplugin.sitemanager/trunk/ Use new zam.api.layer implementation

Roger Ineichen roger at projekt01.ch
Sun Mar 2 09:15:56 EST 2008


Log message for revision 84405:
  Use new zam.api.layer implementation
  Removed z3c.batching externals, use new egg release

Changed:
  U   zamplugin.sitemanager/trunk/buildout.cfg
  _U  zamplugin.sitemanager/trunk/externals/
  U   zamplugin.sitemanager/trunk/setup.py
  A   zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/browser.py
  U   zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/browser.zcml
  U   zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/configure.zcml
  D   zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/contents.pt
  U   zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/menu.zcml

-=-
Modified: zamplugin.sitemanager/trunk/buildout.cfg
===================================================================
--- zamplugin.sitemanager/trunk/buildout.cfg	2008-03-02 14:13:09 UTC (rev 84404)
+++ zamplugin.sitemanager/trunk/buildout.cfg	2008-03-02 14:15:55 UTC (rev 84405)
@@ -1,6 +1,5 @@
 [buildout]
 develop = .
-          externals/z3c.batching
           externals/z3c.contents
           externals/z3c.menu.ready2go
           externals/z3c.table


Property changes on: zamplugin.sitemanager/trunk/externals
___________________________________________________________________
Name: svn:externals
   - z3c.menu.ready2go     svn://svn.zope.org/repos/main/z3c.menu.ready2go/trunk
z3c.table             svn://svn.zope.org/repos/main/z3c.table/trunk
z3c.contents          svn://svn.zope.org/repos/main/z3c.contents/trunk
z3c.batching          svn://svn.zope.org/repos/main/z3c.batching/trunk
zam.api               svn://svn.zope.org/repos/main/zam.api/trunk
zam.skin              svn://svn.zope.org/repos/main/zam.skin/trunk

   + z3c.menu.ready2go     svn://svn.zope.org/repos/main/z3c.menu.ready2go/trunk
z3c.table             svn://svn.zope.org/repos/main/z3c.table/trunk
z3c.contents          svn://svn.zope.org/repos/main/z3c.contents/trunk
zam.api               svn://svn.zope.org/repos/main/zam.api/trunk
zam.skin              svn://svn.zope.org/repos/main/zam.skin/trunk


Modified: zamplugin.sitemanager/trunk/setup.py
===================================================================
--- zamplugin.sitemanager/trunk/setup.py	2008-03-02 14:13:09 UTC (rev 84404)
+++ zamplugin.sitemanager/trunk/setup.py	2008-03-02 14:15:55 UTC (rev 84405)
@@ -74,6 +74,7 @@
     install_requires = [
         'setuptools',
         'z3c.baseregistry',
+        'z3c.batching',
         'z3c.form',
         'z3c.formui',
         'z3c.layer.pagelet',

Added: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/browser.py
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/browser.py	                        (rev 0)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/browser.py	2008-03-02 14:15:55 UTC (rev 84405)
@@ -0,0 +1,31 @@
+##############################################################################
+#
+# Copyright (c) 2008 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""
+$Id:$
+"""
+__docformat__ = "reStructuredText"
+
+from z3c.contents import browser
+
+
+class SiteManagement(browser.ContentsPage):
+    """Site management page."""
+
+    cssClasses = {'table': 'list'}
+    cssClassEven = u'even'
+    cssClassOdd = u'odd'
+    cssClassSelected = u'selected'
+    
+    batchSize = 2
+    startBatchingAt = 2


Property changes on: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/browser.py
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/browser.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/browser.zcml	2008-03-02 14:13:09 UTC (rev 84404)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/browser.zcml	2008-03-02 14:15:55 UTC (rev 84405)
@@ -7,29 +7,29 @@
   <z3c:pagelet
       name="contents.html"
       for="zope.app.component.interfaces.ISiteManagementFolder"
-      class="z3c.contents.browser.ContentsPage"
+      class=".browser.SiteManagement"
       permission="zope.ManageSite"
-      layer="zam.api.layer.IZAMBrowserLayer"
+      layer="zam.api.layer.ISiteManagerPluginLayer"
       />
 
   <defaultView
       for="zope.app.component.interfaces.ISiteManagementFolder"
       name="contents.html"
-      layer="zam.api.layer.IZAMBrowserLayer"
+      layer="zam.api.layer.ISiteManagerPluginLayer"
       />
 
   <z3c:pagelet
       name="contents.html"
       for="zope.app.component.interfaces.ILocalSiteManager"
-      class="z3c.contents.browser.ContentsPage"
+      class=".browser.SiteManagement"
       permission="zope.ManageSite"
-      layer="zam.api.layer.IZAMBrowserLayer"
+      layer="zam.api.layer.ISiteManagerPluginLayer"
       />
 
   <defaultView
       for="zope.app.component.interfaces.ILocalSiteManager"
       name="contents.html"
-      layer="zam.api.layer.IZAMBrowserLayer"
+      layer="zam.api.layer.ISiteManagerPluginLayer"
       />
 
 </configure>

Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/configure.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/configure.zcml	2008-03-02 14:13:09 UTC (rev 84404)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/configure.zcml	2008-03-02 14:15:55 UTC (rev 84405)
@@ -4,10 +4,19 @@
 
   <include file="plugin.zcml" />
 
+  <!-- plugin management for ISiteManagerPluginLayer -->
+  <adapter
+      factory="zam.api.browser.plugin.PluginManagement"
+      for="zamplugin.sitemanager.plugin.SiteManagerPlugin
+           zam.api.layer.ISiteManagerPluginLayer
+           zope.app.component.interfaces.ISite"
+      provides="zam.api.interfaces.IPluginManagement"
+      />
+
   <registerIn registry="zamplugin.sitemanager.plugin.SiteManagerBaseRegistry">
     <view
         name="etc"
-        type="zam.api.layer.IZAMBrowserLayer"
+        type="zam.api.layer.ISiteManagerPluginLayer"
         provides="zope.traversing.interfaces.ITraversable" for="*"
         factory="zope.traversing.namespace.etc"
         />

Deleted: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/contents.pt
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/contents.pt	2008-03-02 14:13:09 UTC (rev 84404)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/contents.pt	2008-03-02 14:15:55 UTC (rev 84405)
@@ -1,97 +0,0 @@
-    <form name="containerContentsForm" method="post" action="."
-          tal:attributes="action request/URL"
-          tal:define="container_contents view/listContentInfo">
-
-      <input type="hidden" name="type_name" value=""
-             tal:attributes="value request/type_name"
-             tal:condition="request/type_name|nothing"
-             />
-      <input type="hidden" name="retitle_id" value=""
-             tal:attributes="value request/retitle_id"
-             tal:condition="request/retitle_id|nothing"
-             />
-
-      <div class="page_error"
-           tal:condition="view/error"
-           tal:content="view/error"
-           i18n:translate="">
-        Error message
-      </div>
-
-      <table id="sortable" class="listing" summary="Content listing"
-             i18n:attributes="summary">
-
-        <thead>
-          <tr>
-            <th>X</th>
-            <th i18n:translate="">Name</th>
-            <th i18n:translate="">Title</th>
-            <th i18n:translate="">Size</th>
-            <th i18n:translate="">Created</th>
-            <th i18n:translate="">Modified</th>
-          </tr>
-        </thead>
-
-        <tbody>
-
-        <metal:block tal:define="supportsRename view/supportsRename"
-                     tal:repeat="item container_contents">
-          <tr tal:define="url item/url; oddrow repeat/item/odd"
-              tal:attributes="class python:oddrow and 'even' or 'odd'" >
-            <td>
-              <input type="checkbox" class="noborder slaveBox" name="ids:list" id="#"
-                     value="#"
-                     tal:attributes="value item/id;
-                                     id item/cb_id;
-                                     checked request/ids_checked|nothing;"/>
-            </td>
-            <td><a href="#"
-                     tal:attributes="href
-                                 string:${url}/index.html"
-                     tal:content="item/id"
-                     >foo</a
-                  ></td>
-            <td>
-              <span
-                 tal:content="item/title|default"
-                 i18n:translate=""
-                 >&nbsp;&nbsp;&nbsp;&nbsp;</span>
-            </td>
-
-            <td><span tal:content="item/size/sizeForDisplay|nothing"
-                    i18n:translate="">
-                      &nbsp;</span></td>
-            <td><span tal:define="created item/created|default"
-                      tal:content="created"
-                      i18n:translate="">&nbsp;</span></td>
-            <td><span tal:define="modified item/modified|default"
-                      tal:content="modified"
-                      i18n:translate="">&nbsp;</span></td>
-          </tr>
-        </metal:block>
-
-        </tbody>
-      </table>
-
-      <tal:block tal:condition="view/normalButtons">
-        <input type="submit" name="container_paste_button" value="Paste"
-               tal:condition="view/hasClipboardContents"
-               i18n:attributes="value container-paste-button"
-               />
-        <input type="submit" name="container_delete_button" value="Delete"
-               i18n:attributes="value container-delete-button"
-               tal:condition="view/supportsDelete"
-               i18n:domain="zope"
-               />
-      </tal:block>
-
-      <div tal:condition="view/specialButtons">
-        <input type="submit" value="Apply"
-               i18n:attributes="value container-apply-button"
-               />
-        <input type="submit" name="container_cancel_button" value="Cancel"
-               i18n:attributes="value container-cancel-button"
-               />
-      </div>
-
-    </form>

Modified: zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/menu.zcml
===================================================================
--- zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/menu.zcml	2008-03-02 14:13:09 UTC (rev 84404)
+++ zamplugin.sitemanager/trunk/src/zamplugin/sitemanager/menu.zcml	2008-03-02 14:15:55 UTC (rev 84405)
@@ -8,7 +8,7 @@
       for="*"
       class=".menu.SiteManagerMenuItem"
       manager="zam.api.menu.IGlobalMenu"
-      layer="zam.api.layer.IZAMBrowserLayer"
+      layer="zam.api.layer.ISiteManagerPluginLayer"
       permission="zope.ManageServices"
       />
 



More information about the Checkins mailing list