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

[Steve Alexander]

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

Modified Files:
	manageIndex.dtml catalogIndexes.dtml 
Log Message:
Merge ZCatalog API cleanup into trunk.



=== Zope/lib/python/Products/ZCatalog/dtml/manageIndex.dtml 1.4 => 1.5 ===
     <td>
       <div class="list-item">
-      <dtml-try>
-      <dtml-var numObjects missing="not available">
-      <dtml-except>n/a
-      </dtml-try>
-    </div>
+        <dtml-var numObjects missing="n/a">
+      </div>
     </td>
 
     <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.6 ===
   <dtml-else><tr class="row-hilite"></dtml-if>
     <td align="right" valign="top">
-    <input type="checkbox" name="names:list" value="<dtml-var 
+    <input type="checkbox" name="ids:list" value="<dtml-var 
      id html_quote>" />
     </td>
     <td width="60%" align="left" valign="top">
@@ -61,7 +61,7 @@
     </td>
     <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>