Fix merge errors

dfc7e17a · Tres Seaver · 2b1d8c47 · dfc7e17a
Commit dfc7e17a authored May 11, 2000 by Tres Seaver
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

lib/python/OFS/renameForm.dtml lib/python/OFS/renameForm.dtml +7 -3

No files found.
--- a/lib/python/OFS/renameForm.dtml
+++ b/lib/python/OFS/renameForm.dtml
@@ -5,8 +5,12 @@
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
 <dtml-if expr="_.hasattr(REQUEST, 'ids')">
-<H2>Rename Items</H2>
-<H2>Rename <dtml-var meta_type></H2>
+
+ <dtml-if "_.len( ids ) > 1">
+  <H2>Rename Items</H2>
+ <dtml-else>
+  <H2>Rename Item</H2>
+ </dtml-if>

 <dtml-var "HelpSys.HelpButton('Folder_Rename.dtml','OFSP')">

@@ -27,7 +31,7 @@
  </TD>
  <TD ALIGN="LEFT" VALIGN="TOP">
  <INPUT TYPE="HIDDEN" NAME="ids:list" VALUE="<dtml-var id html_quote>">
-  <INPUT TYPE="TEXT" NAME="new_ids" SIZE="20" value="&dtml-id;">
+  <INPUT TYPE="TEXT" NAME="new_ids:list" SIZE="20" value="&dtml-id;">
  </TD>
 <dtml-else>
  <TD ALIGN="LEFT" VALIGN="TOP" COLSPAN="3">