[Checkins] SVN: zamplugin.authenticator/trunk/ - Requiring ``zam.api`` 0.7 or newer for ZTK 1.0 compatibility.

Michael Howitz mh at gocept.com
Fri Jan 21 02:59:39 EST 2011


Log message for revision 119814:
  - Requiring ``zam.api`` 0.7 or newer for ZTK 1.0 compatibility.
  
  - Updated tests to run with ``z3c.form`` 2.1 or newer thus requiring at
    least this version.
  
  - Updated author email and home page address in package meta data.
  
  

Changed:
  U   zamplugin.authenticator/trunk/CHANGES.txt
  U   zamplugin.authenticator/trunk/setup.py
  U   zamplugin.authenticator/trunk/src/zamplugin/authenticator/README.txt
  U   zamplugin.authenticator/trunk/src/zamplugin/authenticator/ftesting.zcml

-=-
Modified: zamplugin.authenticator/trunk/CHANGES.txt
===================================================================
--- zamplugin.authenticator/trunk/CHANGES.txt	2011-01-21 07:51:06 UTC (rev 119813)
+++ zamplugin.authenticator/trunk/CHANGES.txt	2011-01-21 07:59:38 UTC (rev 119814)
@@ -5,9 +5,15 @@
 Version 0.5.1dev (unreleased)
 -----------------------------
 
-- ...
+- Requiring ``zam.api`` 0.7 or newer for ZTK 1.0 compatibility.
 
-Version 0.5.0 (2008-04-16)
---------------------------
+- Updated tests to run with ``z3c.form`` 2.1 or newer thus requiring at
+  least this version.
 
+- Updated author email and home page address in package meta data.
+
+
+0.5.0 (2008-04-16)
+------------------
+
 - Initial Release

Modified: zamplugin.authenticator/trunk/setup.py
===================================================================
--- zamplugin.authenticator/trunk/setup.py	2011-01-21 07:51:06 UTC (rev 119813)
+++ zamplugin.authenticator/trunk/setup.py	2011-01-21 07:59:38 UTC (rev 119814)
@@ -25,8 +25,8 @@
     name='zamplugin.authenticator',
     version='0.5.1dev',
     author = "Roger Ineichen and the Zope Community",
-    author_email = "zope3-dev at zope.org",
-    description = "Site manager support for Zope Application Management",
+    author_email = "zope-dev at zope.org",
+    description = "Site manager support for ZAM (Zope Application Management)",
     long_description=(
         read('README.txt')
         + '\n\n' +
@@ -44,25 +44,28 @@
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
         'Framework :: Zope3'],
-    url = 'http://cheeseshop.python.org/pypi/zamplugin.authenticator',
+    url = 'http://pypi.python.org/pypi/zamplugin.authenticator',
     packages = find_packages('src'),
     include_package_data = True,
     package_dir = {'':'src'},
     namespace_packages = ['zamplugin'],
     extras_require = dict(
         test = [
+            'z3c.testing',
+            'zam.skin >= 0.7',
             'zope.app.testing',
             'zope.testbrowser',
-            'z3c.testing',
             ],
         ),
     install_requires = [
         'setuptools',
+        'z3c.authenticator',
         'z3c.baseregistry',
+        'z3c.configurator',
+        'z3c.form >= 2.1',
+        'z3c.formui >= 2.1',
         'z3c.menu.ready2go',
-        'z3c.authenticator',
-        'z3c.configurator',
-        'zam.api',
+        'zam.api >= 0.7',
         'zope.component',
         ],
     zip_safe = False,

Modified: zamplugin.authenticator/trunk/src/zamplugin/authenticator/README.txt
===================================================================
--- zamplugin.authenticator/trunk/src/zamplugin/authenticator/README.txt	2011-01-21 07:51:06 UTC (rev 119813)
+++ zamplugin.authenticator/trunk/src/zamplugin/authenticator/README.txt	2011-01-21 07:59:38 UTC (rev 119814)
@@ -71,18 +71,47 @@
   >>> mgr.open(rootURL + '/++etc++site/auth/edit.html')
   >>> print mgr.contents
   <!DOCTYPE ...
-  ...
-  <div id="content">
-    <form action="http://localhost/++skin++ZAM/++etc++site/auth/edit.html"
-          method="post" enctype="multipart/form-data"
-          class="edit-form" name="form" id="form">
+      <div id="content">
+        <form action="http://localhost/++skin++ZAM/++etc++site/auth/edit.html"
+        method="post" enctype="multipart/form-data"
+        class="edit-form" name="form" id="form">
     <div class="viewspace">
         <h1>Edit Authenticator.</h1>
         <div class="required-info">
-           <span class="required">*</span>
-           &ndash; required
+           <span class="required">*</span>&ndash; required
         </div>
       <div>
+            <div id="form-widgets-includeNextUtilityForAuthenticate-row"
+                 class="row">
+                <div class="label">
+                  <label for="form-widgets-includeNextUtilityForAuthenticate">
+                    <span>Include next utility for authenticate</span>
+                    <span class="required">*</span>
+                  </label>
+                </div>
+                <div class="widget">
+  <span class="option">
+    <label for="form-widgets-includeNextUtilityForAuthenticate-0">
+      <input id="form-widgets-includeNextUtilityForAuthenticate-0"
+             name="form.widgets.includeNextUtilityForAuthenticate:list"
+             class="radio-widget required bool-field"
+             value="true" checked="checked" type="radio" />
+      <span class="label">yes</span>
+    </label>
+  </span>
+  <span class="option">
+    <label for="form-widgets-includeNextUtilityForAuthenticate-1">
+      <input id="form-widgets-includeNextUtilityForAuthenticate-1"
+             name="form.widgets.includeNextUtilityForAuthenticate:list"
+             class="radio-widget required bool-field"
+             value="false" type="radio" />
+      <span class="label">no</span>
+    </label>
+  </span>
+  <input name="form.widgets.includeNextUtilityForAuthenticate-empty-marker"
+         type="hidden" value="1" />
+  </div>
+            </div>
             <div id="form-widgets-credentialsPlugins-row"
                  class="row">
                 <div class="label">
@@ -91,7 +120,9 @@
                     <span class="required">*</span>
                   </label>
                 </div>
-                <div class="widget"><script type="text/javascript">
+                <div class="widget">
+  <script type="text/javascript">
+  /*  <![CDATA[ */
   function moveItems(from, to)
     {
     // shortcuts for selection fields
@@ -211,30 +242,29 @@
   // error message for missing selection
   function selectionError()
     {alert("Must select something!")}
+  /* ]]> */
   </script>
   <table border="0" class="ordered-selection-field">
     <tr>
       <td>
         <select id="form-widgets-credentialsPlugins-from"
                 name="form.widgets.credentialsPlugins.from"
-                size="5" multiple="multiple"
-                class="required list-field">
+                class="required list-field"
+                multiple="multiple" size="5">
         </select>
       </td>
       <td>
-        <button name="from2toButton" type="button"
-                value="&rarr;"
-                onclick="javascript:from2to('form-widgets-credentialsPlugins')">&rarr;</button>
+        <button onclick="javascript:from2to('form-widgets-credentialsPlugins')"
+                name="from2toButton" type="button" value="→">&rarr;</button>
         <br />
-        <button name="to2fromButton" type="button"
-                value="&larr;"
-                onclick="javascript:to2from('form-widgets-credentialsPlugins')">&larr;</button>
+        <button onclick="javascript:to2from('form-widgets-credentialsPlugins')"
+                name="to2fromButton" type="button" value="←">&larr;</button>
       </td>
       <td>
         <select id="form-widgets-credentialsPlugins-to"
                 name="form.widgets.credentialsPlugins.to"
-                size="5" multiple="multiple"
-                class="required list-field">
+                class="required list-field"
+                multiple="multiple" size="5">
         </select>
         <input name="form.widgets.credentialsPlugins-empty-marker"
                type="hidden" />
@@ -244,11 +274,11 @@
         </span>
       </td>
       <td>
-        <button name="upButton" type="button" value="&uarr;"
-                onclick="javascript:moveUp('form-widgets-credentialsPlugins')">&uarr;</button>
+        <button onclick="javascript:moveUp('form-widgets-credentialsPlugins')"
+                name="upButton" type="button" value="↑">&uarr;</button>
         <br />
-        <button name="downButton" type="button" value="&darr;"
-                onclick="javascript:moveDown('form-widgets-credentialsPlugins')">&darr;</button>
+        <button onclick="javascript:moveDown('form-widgets-credentialsPlugins')"
+                name="downButton" type="button" value="↓">&darr;</button>
       </td>
     </tr>
   </table>
@@ -262,7 +292,9 @@
                     <span class="required">*</span>
                   </label>
                 </div>
-                <div class="widget"><script type="text/javascript">
+                <div class="widget">
+  <script type="text/javascript">
+  /*  <![CDATA[ */
   function moveItems(from, to)
     {
     // shortcuts for selection fields
@@ -382,30 +414,29 @@
   // error message for missing selection
   function selectionError()
     {alert("Must select something!")}
+  /* ]]> */
   </script>
   <table border="0" class="ordered-selection-field">
     <tr>
       <td>
         <select id="form-widgets-authenticatorPlugins-from"
                 name="form.widgets.authenticatorPlugins.from"
-                size="5" multiple="multiple"
-                class="required list-field">
+                class="required list-field"
+                multiple="multiple" size="5">
         </select>
       </td>
       <td>
-        <button name="from2toButton" type="button"
-                value="&rarr;"
-                onclick="javascript:from2to('form-widgets-authenticatorPlugins')">&rarr;</button>
+        <button onclick="javascript:from2to('form-widgets-authenticatorPlugins')"
+                name="from2toButton" type="button" value="→">&rarr;</button>
         <br />
-        <button name="to2fromButton" type="button"
-                value="&larr;"
-                onclick="javascript:to2from('form-widgets-authenticatorPlugins')">&larr;</button>
+        <button onclick="javascript:to2from('form-widgets-authenticatorPlugins')"
+                name="to2fromButton" type="button" value="←">&larr;</button>
       </td>
       <td>
         <select id="form-widgets-authenticatorPlugins-to"
                 name="form.widgets.authenticatorPlugins.to"
-                size="5" multiple="multiple"
-                class="required list-field">
+                class="required list-field"
+                multiple="multiple" size="5">
         </select>
         <input name="form.widgets.authenticatorPlugins-empty-marker"
                type="hidden" />
@@ -415,11 +446,11 @@
         </span>
       </td>
       <td>
-        <button name="upButton" type="button" value="&uarr;"
-                onclick="javascript:moveUp('form-widgets-authenticatorPlugins')">&uarr;</button>
+        <button onclick="javascript:moveUp('form-widgets-authenticatorPlugins')"
+                name="upButton" type="button" value="↑">&uarr;</button>
         <br />
-        <button name="downButton" type="button" value="&darr;"
-                onclick="javascript:moveDown('form-widgets-authenticatorPlugins')">&darr;</button>
+        <button onclick="javascript:moveDown('form-widgets-authenticatorPlugins')"
+                name="downButton" type="button" value="↓">&darr;</button>
       </td>
     </tr>
   </table>
@@ -429,10 +460,10 @@
     </div>
     <div>
       <div class="buttons">
-        <input type="submit" id="form-buttons-apply"
-         name="form.buttons.apply"
-         class="submit-widget button-field" value="Apply" />
+  <input id="form-buttons-apply" name="form.buttons.apply"
+         class="submit-widget button-field" value="Apply"
+         type="submit" />
       </div>
     </div>
   </form>
-  ...
\ No newline at end of file
+  ...

Modified: zamplugin.authenticator/trunk/src/zamplugin/authenticator/ftesting.zcml
===================================================================
--- zamplugin.authenticator/trunk/src/zamplugin/authenticator/ftesting.zcml	2011-01-21 07:51:06 UTC (rev 119813)
+++ zamplugin.authenticator/trunk/src/zamplugin/authenticator/ftesting.zcml	2011-01-21 07:59:38 UTC (rev 119814)
@@ -6,9 +6,12 @@
 
   <!-- use ftesting configuration from zam.api -->
   <include package="zam.skin" file="ftesting.zcml" />
+  <include package="zope.i18n" />
+  <include package="zope.app.schema" />
 
   <!-- load 3rd party configuration -->
   <include package="z3c.contents" />
+  <include package="z3c.authenticator" />
 
   <!-- zamplugin configuration -->
   <include package="zamplugin.authenticator" />



More information about the checkins mailing list