[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog/dtml - manageIndex.dtml:1.3.10.2 catalogIndexes.dtml:1.5.62.1

[Steve Alexander]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog/dtml
In directory cvs.zope.org:/tmp/cvs-serv5745/dtml

Modified Files:
      Tag: stevea_zcatalog_api_cruft_cleanup-branch
	manageIndex.dtml catalogIndexes.dtml 
Log Message:
Tidied up ZCatalog.py API to make manage_delXXXX and related methods
singular in name, but take either a string or a sequence of strings
as an argument for names/ids/urls.
Also, updated relevant dtml files and regression tests.
The old API is kept as deprecated methods, which log a warning when used.



=== Zope/lib/python/Products/ZCatalog/dtml/manageIndex.dtml 1.3.10.1 => 1.3.10.2 ===
     <td>
       <div class="list-item">
-      <dtml-try>
-      <dtml-var numObjects missing="not available">
-      <dtml-except>n/a
-      </dtml-try>
+      <dtml-var numObjects missing="n/a">
     </div>
     </td>
 
@@ -209,7 +206,7 @@
   <td align="left" valign="top">
   <div class="form-element">
 
-  <input class="form-element" type="submit" name="manage_deleteIndex:method"  value="Remove index">
+  <input class="form-element" type="submit" name="manage_delIndex:method"  value="Remove index">
   <input class="form-element" type="submit" name="manage_reindexIndex:method" value="Reindex">
   <input class="form-element" type="submit" name="manage_clearIndex:method"   value="Clear index">
 


=== Zope/lib/python/Products/ZCatalog/dtml/catalogIndexes.dtml 1.5 => 1.5.62.1 ===
     <td align="left" valign="top">
     <div class="form-element">
-    <input class="form-element" type="submit" name="manage_delIndexes:method" 
+    <input class="form-element" type="submit" name="manage_delIndex:method" 
      value="Delete" /> 
     </div>
     </td>