[CMF-checkins] CVS: CMF/CMFDefault/skins/generic - folder_contents.dtml:1.12 folder_rename_form.dtml:1.7

[Tres Seaver]

Update of /cvs-repository/CMF/CMFDefault/skins/generic
In directory cvs.zope.org:/tmp/cvs-serv28520/CMFDefault/skins/generic

Modified Files:
	folder_contents.dtml folder_rename_form.dtml 
Log Message:


  - Close out <div> tags properly (thanks to Sean Bowman for reporting this!).

  - Flatten case in HTML tags.


=== CMF/CMFDefault/skins/generic/folder_contents.dtml 1.11 => 1.12 ===
 <h1> Desktop </h1>
 
-<form ACTION="&dtml-absolute_url;" METHOD="POST">
+<form action="&dtml-absolute_url;" method="POST">
  <table class="FormLayout">
   <tr>
    <td valign="top">
@@ -132,28 +132,33 @@
 </table><dtml-comment> End of listing table </dtml-comment>
 
 
-<TABLE BORDER="0" CELLSPACING="0" CELLPADDING=2>
-<TR>
-  <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="16"></TD>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-  <dtml-if expr="portal_membership.checkPermission('Add portal content', this())">
-    <INPUT TYPE="SUBMIT" NAME="folder_factories:method" VALUE="New...">
+<table border="0" cellspacing="0" cellpadding="2">
+<tr>
+  <td align="left" valign="top" width="16"></td>
+  <td align="left" valign="top">
+  <dtml-if expr="portal_membership.checkPermission('Add portal content'
+                                                  , this())">
+    <input type="submit" name="folder_factories:method" value="New...">
   </dtml-if>
-  <dtml-if expr="portal_membership.checkPermission('View management screens', this())">
-    <INPUT TYPE="SUBMIT" NAME="folder_rename_form:method" VALUE="Rename">
-    <INPUT TYPE="SUBMIT" NAME="folder_cut:method" VALUE="Cut"> 
-    <INPUT TYPE="SUBMIT" NAME="folder_copy:method" VALUE="Copy">
+  <dtml-if expr="portal_membership.checkPermission('View management screens'
+                                                  , this())">
+    <input type="submit" name="folder_rename_form:method" value="Rename">
+    <input type="submit" name="folder_cut:method" value="Cut"> 
+    <input type="submit" name="folder_copy:method" value="Copy">
     <dtml-if cb_dataValid>
-    <INPUT TYPE="SUBMIT" NAME="folder_paste:method" VALUE="Paste">
+    <input type="submit" name="folder_paste:method" value="Paste">
     </dtml-if>
   </dtml-if>
   <dtml-if expr="portal_membership.checkPermission('Delete objects', this())">
-    <INPUT TYPE="SUBMIT" NAME="folder_delete:method" VALUE="Delete">
+    <input type="submit" name="folder_delete:method" value="Delete">
   </dtml-if>
-  </TD>
-</TR>
-</TABLE>
+  </td>
+</tr>
+</table>
+
+</form>
 
-</FORM>
 <dtml-var folder_filter_form>
+</div>
+
 <dtml-var standard_html_footer>


=== CMF/CMFDefault/skins/generic/folder_rename_form.dtml 1.6 => 1.7 ===
 
+<div class="Desktop">
+
 <dtml-in folder_rename_items>
 
 <dtml-if sequence-start>
-<div class="Desktop">
-<H1> Rename Items </H2>
+<h2> Rename Items </h2>
 
-<FORM ACTION="folder_rename" METHOD="POST">
-<TABLE class="FormLayout">
+<form action="folder_rename" method="POST">
+<table class="FormLayout">
 </dtml-if sequence-start>
-<TR>
-  <TD ALIGN="LEFT" VALIGN="TOP" width="8%">
+
+<tr>
+  <td align="left" valign="top" width="8%">
   <dtml-var iconHTML>
-  </TD>
-  <TD ALIGN="LEFT" VALIGN="TOP" width="20%" NOWRAP>
+  </td>
+  <td align="left" valign="top" width="20%" nowrap>
   <dtml-var getId>
-  <INPUT TYPE="HIDDEN" NAME="ids:list" VALUE="&dtml-getId;">
-  </TD>
-  <TD ALIGN="LEFT" VALIGN="TOP" width="5%">
-  <STRONG>to</STRONG>
-  </TD>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-  <INPUT TYPE="TEXT" NAME="new_ids:list" value="&dtml-getId;" SIZE="20">
-  </TD>
-</TR>
+  <input type="hidden" name="ids:list" value="&dtml-getId;">
+  </td>
+  <td align="left" valign="top" width="5%">
+  <strong>to</strong>
+  </td>
+  <td align="left" valign="top">
+  <input type="text" name="new_ids:list" value="&dtml-getId;" size="20">
+  </td>
+</tr>
 <dtml-if sequence-end>
-<TR>
-<TD COLSPAN=4>
-  <INPUT TYPE="submit" VALUE=" Ok ">
-</TD>
-</TR>
-</TABLE>
-</FORM>
+<tr>
+<td colspan="4">
+  <input type="submit" value=" Ok ">
+</td>
+</tr>
+</table>
+</form>
 </dtml-if sequence-end>
 
 <dtml-else>
-<FORM ACTION="folder_contents" METHOD="GET">
+<form action="folder_contents" method="GET">
 <p>You must select renamable items to rename.</p>
-<INPUT TYPE="submit" VALUE=" Ok ">
-</FORM>
+<input type="submit" value=" Ok ">
+</form>
 </dtml-in>
+
+</div>
+
 <dtml-var standard_html_footer>