[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - folder_add.pt:1.3 folder_contents.pt:1.3 folder_factories.pt:1.5 folder_rename_form.pt:1.3 standard_error_message.pt:1.3 undo_form.pt:1.3

Tres Seaver tseaver@zope.com
Mon, 1 Apr 2002 18:19:54 -0500


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

Modified Files:
	folder_add.pt folder_contents.pt folder_factories.pt 
	folder_rename_form.pt standard_error_message.pt undo_form.pt 
Log Message:
 - Normalize HTML.

=== CMF/CMFDefault/skins/zpt_generic/folder_add.pt 1.2 => 1.3 ===
 <div metal:fill-slot="main">	  
 <div class="Desktop">
-<H1>Add Folder</H1>
+<h1>Add Folder</h1>
 
-<P> A Folder contains other objects. Use Folders to organize your
+<p> A Folder contains other objects. Use Folders to organize your
     web objects in to logical groups.</P>
 
-<FORM ACTION="manage_addPortalFolder" METHOD="POST">
-<TABLE class="FormLayout">
- <TR>
-  <TD>
-   <STRONG>Id</STRONG>
-  </TD>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-   <INPUT TYPE="TEXT" NAME="id" SIZE="40">
-  </TD>
- </TR>
- <TR>
-  <TD>
-   <EM><STRONG>Title</STRONG></EM>
-  </TD>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-   <INPUT TYPE="TEXT" NAME="title" SIZE="40">
-  </TD>
- </TR>
- <TR><TD COLSPAN="2"><BR></TD></TR>
- <TR>
-  <TD><br></TD>
-  <TD>
-   <BR><INPUT TYPE="SUBMIT" VALUE=" Add ">
-  </TD>
- </TR>
-</TABLE>
+<form action="manage_addPortalFolder" method="POST">
+<table class="FormLayout">
+ <tr>
+  <td>
+   <strong>Id</strong>
+  </td>
+  <td align="left" valign="top">
+   <input type="text" name="id" size="40">
+  </td>
+ </tr>
+ <tr>
+  <td>
+   <em><strong>Title</strong></em>
+  </td>
+  <td align="left" valign="top">
+   <input type="text" name="title" size="40">
+  </td>
+ </tr>
+ <tr><td colspan="2"><br></td></tr>
+ <tr>
+  <td><br></td>
+  <td>
+   <br><input type="submit" value=" Add ">
+  </td>
+ </tr>
+</table>
 </form>
 </div>
 </div>


=== CMF/CMFDefault/skins/zpt_generic/folder_contents.pt 1.2 => 1.3 ===
 <h1> Desktop </h1>
 
-<form action="" METHOD="POST"
+<form action="" method="POST"
       tal:attributes="action here/absolute_url">
  <table class="FormLayout">
   <tr>
@@ -44,7 +44,7 @@
 	   global batch1 batch/next">
 	   <tr align="top"
 	       tal:repeat="items batch">
-        <td align="left" width="5" NOWRAP
+        <td align="left" width="5" nowrap
 		     tal:define="folderish items/isPrincipiaFolderish;
 		               portalish items/isPortalContent|nothing;
 					   global methodID python: folderish and 'folder_contents' or (portalish and 'view' or '');
@@ -76,7 +76,7 @@
     	  <table>
 	   <tr align="top"
 	       tal:repeat="items batch1">
-        <td align="left" width="5" NOWRAP
+        <td align="left" width="5" nowrap
 		    tal:define="folderish items/isPrincipiaFolderish;
 		               portalish items/isPortalContent|nothing;
 					   global methodID python: folderish and 'folder_contents' or (portalish and 'view' or '');
@@ -124,27 +124,27 @@
 <!-- end cotentList -->
 </table>
 
-<TABLE BORDER="0" CELLSPACING="0" CELLPADDING=2>
-<TR>
-  <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="16"></TD>
-  <TD ALIGN="LEFT" VALIGN="TOP">
+<table border="0" cellspacing="0" cellpadding=2>
+<tr>
+  <td align="left" valign="top" width="16"></td>
+  <td align="left" valign="top">
   <span tal:condition="python: here.portal_membership.checkPermission('Add portal content', here)">
-    <INPUT TYPE="SUBMIT" NAME="folder_factories:method" VALUE="New...">
+    <input type="submit" name="folder_factories:method" value="New...">
   </span>
   <span tal:condition="python: here.portal_membership.checkPermission('View management screens', here)">
-    <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">
+    <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">
     <span tal:condition="here/cb_dataValid">
-    <INPUT TYPE="SUBMIT" NAME="folder_paste:method" VALUE="Paste">
+    <input type="submit" name="folder_paste:method" value="Paste">
     </span>
   </span>
   <span tal:condition="python: here.portal_membership.checkPermission('Delete objects', here)">
-    <INPUT TYPE="SUBMIT" NAME="folder_delete:method" VALUE="Delete">
+    <input type="submit" name="folder_delete:method" value="Delete">
   </span>
-  </TD>
-</TR>
-</TABLE>
+  </td>
+</tr>
+</table>
 </table>
 </form>
 <span tal:replace="structure here/folder_filter_form">Filter Form Here</span>


=== CMF/CMFDefault/skins/zpt_generic/folder_factories.pt 1.4 => 1.5 ===
 <table width="100%" class="FormLayout" tal:repeat="item here/allowedContentTypes">
 <tr valign="top">
-  <td align="left" width="2%" NOWRAP><input type="radio" name="type_name" value="" id="" tal:attributes="value item/getId; id string:cb_${repeat/item/number}"/>
+  <td align="left" width="2%" nowrap><input type="radio" name="type_name" value="" id="" tal:attributes="value item/getId; id string:cb_${repeat/item/number}"/>
   </td>
   <td align="left" colspan="2" class="ListName"><label for="" 
 	  tal:attributes="for string:cb_${repeat/item/number}"


=== CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt 1.2 => 1.3 ===
 <div class="Desktop">
 <h3> Rename Items </h3>
-<TABLE class="FormLayout"
+<table class="FormLayout"
        tal:condition="here/folder_rename_items">
-	   <FORM ACTION="folder_rename" METHOD="POST">
-  <TR tal:repeat="item here/folder_rename_items">
-    <TD ALIGN="LEFT" VALIGN="TOP" width="8%">
+	   <form action="folder_rename" method="POST">
+  <tr tal:repeat="item here/folder_rename_items">
+    <td align="left" valign="top" width="8%">
       <span tal:replace="structure item/iconHTML">Type Image</span>
-    </TD>
-    <TD ALIGN="LEFT" VALIGN="TOP" width="20%" NOWRAP>
+    </td>
+    <td align="left" valign="top" width="20%" nowrap>
       <span tal:replace="item/getId">ID</span>
-      <INPUT TYPE="HIDDEN" NAME="ids:list" VALUE=""
+      <input type="hidden" name="ids:list" value=""
 	         tal:attributes="value item/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=""
-	         tal:attributes="value item/getId" SIZE="20">
-    </TD>
-  </TR>
+    </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=""
+	         tal:attributes="value item/getId" size="20">
+    </td>
+  </tr>
 
-  <TR>
-    <TD COLSPAN=4>
-      <INPUT TYPE="submit" VALUE=" Ok ">
-    </TD>
-  </TR>
-  </FORM>
-</TABLE>
+  <tr>
+    <td colspan=4>
+      <input type="submit" value=" Ok ">
+    </td>
+  </tr>
+  </form>
+</table>
 
 
 
 <div tal:condition="python: not(here.folder_rename_items())">
-  <FORM ACTION="folder_contents" METHOD="GET">
+  <form action="folder_contents" method="GET">
   <p>You must select one or more items to rename.</p>
-  <INPUT TYPE="submit" VALUE=" Ok ">
-  </FORM>
+  <input type="submit" value=" Ok ">
+  </form>
 </div>
 </div>
 </div>


=== CMF/CMFDefault/skins/zpt_generic/standard_error_message.pt 1.2 => 1.3 ===
 
 <div tal:condition="not: options/error_message">
-  <H2>Site Error</H2>
+  <h2>Site Error</h2>
 
-  <P>An error was encountered while publishing this resource.
-  </P>
+  <p>An error was encountered while publishing this resource.</p>
   
-  <P>
-  <STRONG>Error Type: <span tal:replace="structure options/error_type" /></STRONG><BR>
-  <STRONG>Error Value: <span tal:replace="structure options/error_value" /></STRONG><BR> 
-  </P>
+  <p> <strong>Error Type:
+        <span tal:replace="structure options/error_type" />
+      </strong>
+  <br><strong>Error Value:
+      <span tal:replace="structure options/error_value" /></strong>
+  <br> 
+  </p>
  
-  <HR NOSHADE>
+  <hr noshade>
  
-  <P>Troubleshooting Suggestions</P>
+  <p>Troubleshooting Suggestions</p>
 
-  <UL>
-  <div tal:condition="python: options['error_type'] in ('KeyError','NameError')">
-  <LI>This resource may be trying to reference a
-  nonexistent object or variable <STRONG><span tal:replace="options/error_value" /></STRONG>.</LI>
+  <ul>
+  <div tal:condition="python: options['error_type'] in ('KeyError'
+                                                       ,'NameError')">
+  <li>This resource may be trying to reference a
+      nonexistent object or variable
+      <strong><span tal:replace="options/error_value" /></strong>.</li>
   </div>
-  <LI>The URL may be incorrect.</LI>
-  <LI>The parameters passed to this resource may be incorrect.</LI>
-  <LI>A resource that this resource relies on may be encountering
-      an error.</LI>
-  </UL>
+  <li>The URL may be incorrect.</li>
+  <li>The parameters passed to this resource may be incorrect.</li>
+  <li>A resource that this resource relies on may be encountering
+      an error.</li>
+  </ul>
 
-  <P>For more detailed information about the error, please
+  <p>For more detailed information about the error, please
   refer to the HTML source for this page.
-  </P>
+  </p>
 
-  <P>If the error persists please contact the site maintainer.
+  <p>If the error persists please contact the site maintainer.
   Thank you for your patience.
-  </P>
+  </p>
 
 </div>
 </div>


=== CMF/CMFDefault/skins/zpt_generic/undo_form.pt 1.2 => 1.3 ===
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
-<body>
-<div metal:fill-slot="main">
-<div class="Desktop">
-
-<h1> Undo Transactions </h1>
-<div tal:define="transactions python: here.portal_undo.listUndoableTransactionsFor(here)">
-    <div tal:condition="transactions">
-        <FORM ACTION="undo" METHOD="POST">
-        <p>This application's transactional feature allows you to easily undo changes
-           made to the application's settings or data. You can revert the application
-           to a &quot;snapshot&quot; of it's state at a previous point in time. </p>
-        <P>Select one or more transactions below and then click on the &quot;Undo&quot;
-           button to undo the transactions.  Note that even though a transaction
-           is shown below, you will not be able to undo it if later transactions
-           modified objects that were modified by the transaction. </p>
-       <table class="FormLayout">
-         <tr><td colspan=2 align=center><INPUT TYPE="SUBMIT" VALUE=" Undo ">
-           </td></tr>
-         <tr><td></td></tr>
-         <tbody tal:condition="request/first_transaction">
-           <tr><td colspan=2 align=center>
-            <a href=""
-               tal:attributes="href python:here.portal_url() + '/undo_form?first_transaction:int=' + 
-                               str(request.first_transaction*2-request.last_transaction) +
-                               '&last_transaction:int=' +
-                               str(request.first_transaction) + 
-                               '&PrincipiaUndoBatchSize:int=' +
-                               str(request.PrincipiaUndoBatchSize)">Later Transactions</a>
-           </td></tr>
-         </tbody>
-    <tbody tal:repeat="items transactions">
-      <tr>
-      <td valign=top><input type=checkbox name="transaction_info:list"
-	  value=""
-          tal:attributes="value items/id">
-      </td>
-      <td valign=top>
-	  <strong><span tal:replace="items/description" /></strong> by <strong>
-          <span tal:condition="items/user_name|nothing">
-	     <span tal:replace="items/user_name" />
-          </span>
-          <span condition="python:not(items.description)">
-            <em>Zope</em>
-          </span>
-	  </strong> on <span tal:replace="python: items['time'].Month()" /> <span tal:replace="python: items['time'].day()" /> at
-	  <span tal:replace="python: items['time'].Time()" />
-      </td>
-    </tr>
-    </tbody>
-    <tr><td colspan=2 align=center>
-    <span tal:condition="python: len(transactions) == request.PrincipiaUndoBatchSize">
-        <a href=""
-           tal:attributes="href python: here.absolute_url() + '/undo_form?first_transaction:int=' + str(request.last_transaction) + '&last_transaction:int=' + str(request.last_transaction+request.PrincipiaUndoBatchSize) + '&PrincipiaUndoBatchSize:int=' + str(request.PrincipiaUndoBatchSize)">Earlier Transactions</a>
-    </span>
-    </td></tr>
-    <tr><td></td></tr>
-    <tr><td colspan=2 align=center><INPUT TYPE="SUBMIT" VALUE=" Undo ">
-    </td></tr>
-  </table>
-  </FORM>
-</div>
-<div tal:condition="python: not(transactions)">
-
-  There are no transactions that can be undone.
-
-</div>
-</div>
-</div>
-</div>
-</body>
-</html>
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:use-macro="here/main_template/macros/master">
+<body>
+
+<div metal:fill-slot="main">
+
+<div class="Desktop">
+
+<h1> Undo Transactions </h1>
+<div tal:define="utool here/portal_undo;
+                 url here/portal_url;
+                 transactions python:utool.listUndoableTransactionsFor(here)">
+
+ <div
+   tal:condition="transactions"
+   tal:define="b_first python:request.first_transaction;
+               b_last python:request.last_transaction;
+               b_size python:request.PrincipiaUndoBatchSize;
+               b_fmt1 string:%s/undo_form;
+               b_fmt2 string:first_transaction:int=%s;
+               b_fmt3 string:last_transaction:int=%s;
+               b_fmt4 string:PrincipiaUndoBatchSize:int=%s;
+               b_fmt string:${b_fmt1}?${b_fmt2}&${b_fmt3}&${b_fmt4};
+               e_start python:( b_first * 2 - b_last );
+               e_end b_first;
+               l_start b_last;
+               l_end python:b_last+b_size;
+              ">
+
+  <form action="undo" method="POST">
+
+   <p> This application's transactional feature allows you to easily
+       undo changes made to the application's settings or data. You can
+       revert the application to a &quot;snapshot&quot; of it's state
+       at a previous point in time. </p>
+
+   <p> Select one or more transactions below and then click on the
+       &quot;Undo&quot; button to undo the transactions.  Note that
+       even though a transaction is shown below, you will not be able
+       to undo it if later transactions modified objects that were
+       modified by the transaction. </p>
+
+   <table class="FormLayout">
+
+    <tr>
+     <td colspan="2" align="center">
+      <input type="submit" value=" Undo ">
+     </td>
+    </tr>
+
+    <tr>
+     <td><br></td>
+    </tr>
+
+    <tbody tal:condition="request/first_transaction">
+    <tr>
+     <td colspan=2 align=center>
+      <a href=""
+         tal:attributes="href python:b_fmt%(url,e_start,e_end,b_size)"
+      >Later Transactions</a>
+     </td>
+    </tr>
+    </tbody>
+
+    <tbody tal:repeat="items transactions">
+    <tr>
+     <td valign="top">
+      <input type=checkbox name="transaction_info:list" value=""
+             tal:attributes="value items/id">
+     </td>
+     <td valign="top">
+	  <strong><span tal:replace="items/description" /></strong> by
+      <strong>
+       <span tal:condition="items/user_name|nothing">
+	     <span tal:replace="items/user_name" />
+       </span>
+       <span condition="python:not(items.description)">
+        <em>Zope</em>
+       </span>
+	  </strong> on <span tal:replace="python: items['time'].Month()" />
+                   <span tal:replace="python: items['time'].day()" />
+                at <span tal:replace="python: items['time'].Time()" />
+           
+     </td>
+    </tr>
+    </tbody>
+
+    <tr>
+     <td colspan=2 align=center>
+      <span tal:condition="python: len(transactions) == b_size">
+       <a href=""
+          tal:attributes="href python:b_fmt%(url,l_start,l_end,b_size)"
+       >Earlier Transactions</a>
+    </span>
+     </td>
+    </tr>
+
+    <tr>
+     <td><br></td>
+    </tr>
+
+    <tr>
+     <td colspan="2" align="center">
+      <input type="submit" value=" Undo ">
+     </td>
+    </tr>
+
+   </table>
+  </form>
+ </div>
+
+ <div tal:condition="python: not(transactions)">
+  There are no transactions that can be undone.
+ </div>
+
+</div>
+
+</div><!-- class="Desktop" -->
+</div><!-- metal:fill-slot="main" -->
+
+</body>
+</html>