[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - folder_contents.pt:1.6.18.1 folder_factories.pt:1.8.18.1 folder_filter_form.pt:1.5.18.1

Yvo Schubbe schubbe@web.de
Thu, 27 Feb 2003 19:27:37 -0500


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

Modified Files:
      Tag: yuppie-collector122-branch
	folder_contents.pt folder_factories.pt folder_filter_form.pt 
Log Message:
- added i18n attributes
- closed empty tags

=== CMF/CMFDefault/skins/zpt_generic/folder_contents.pt 1.6 => 1.6.18.1 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_contents.pt:1.6	Fri Aug 16 07:37:41 2002
+++ CMF/CMFDefault/skins/zpt_generic/folder_contents.pt	Thu Feb 27 19:27:34 2003
@@ -11,6 +11,7 @@
                  list_parent python:checkPerm( 'List folder contents', here
                                              , 'aq_parent' );
                 "
+     i18n:domain="cmf_default"
 >
 <div tal:condition="not: list_here"
       tal:define="response request/RESPONSE;
@@ -23,9 +24,9 @@
 <!-- This is the desktop area -->
 <div class="Desktop">
 
-<h1> Desktop </h1>
+<h1 i18n:translate="">Desktop</h1>
 
-<form action="" method="POST"
+<form action="" method="post"
       tal:attributes="action here/absolute_url">
  <table class="FormLayout">
   <tr>
@@ -41,14 +42,15 @@
           <a href="../folder_contents"
           ><img src="" alt="[Link]" border="0"
                 tal:attributes="src string:${here/portal_url}/UpFolder_icon.gif"
-          ></a>
+          /></a>
          </span>&nbsp;&nbsp;
          <span tal:condition="upNav">
-          Up to <a href="../folder_contents"
+          <span tal:omit-tag="" i18n:translate="">Up to</span>
+          <a href="../folder_contents"
                    tal:content="upID">Up ID</a>
          </span>
          <span tal:condition="python: not(upNav)">
-           <span class="mild">Root</span>
+           <span class="mild" i18n:translate="">Root</span>
          </span>
         </td>
       </tr>
@@ -69,7 +71,7 @@
       <!-- First column, first half batch in 'batch1'. -->
       <td colspan="1" align="left" width="49%">
        <table>
-        <tr align="top" tal:repeat="item batch1">
+        <tr valign="top" tal:repeat="item batch1">
          <td align="left" width="5" nowrap
              tal:define="folderish item/isPrincipiaFolderish;
                          portalish item/isPortalContent | nothing;
@@ -90,8 +92,8 @@
                              "
            ><img src="" alt="" border="0"
                  tal:attributes="src string:${here/portal_url}/${icon};
-                                 alt item/Type|nothing;
-                                "></a>
+                                 alt item/Type|nothing;"
+                 i18n:attributes="alt" /></a>
           </span>
          </td>
          <td>
@@ -101,7 +103,7 @@
           ><span tal:replace="item/getId">ID</span>
            <span tal:condition="item/Title"
                  tal:replace="string:(${item/Title})">(Title)</span></a>
-         </td>      
+         </td>
         </tr>
        </table>
       </td>
@@ -110,7 +112,7 @@
       <!-- Second column, second half batch in 'batch2'. -->
       <td colspan="1" width="49%">
        <table>
-        <tr align="top" tal:repeat="item batch2">
+        <tr valign="top" tal:repeat="item batch2">
          <td align="left" width="5" nowrap
              tal:define="folderish item/isPrincipiaFolderish;
                          portalish item/isPortalContent | nothing;
@@ -131,8 +133,8 @@
                              "
            ><img src="" alt="" border="0"
                  tal:attributes="src string:${here/portal_url}/${icon};
-                                 alt item/Type|nothing;
-                                "></a>
+                                 alt item/Type|nothing;"
+                 i18n:attributes="alt" /></a>
           </span>
          </td>
          <td>
@@ -142,19 +144,20 @@
           ><span tal:replace="item/getId">ID</span>
            <span tal:condition="item/Title"
                  tal:replace="string:(${item/Title})">(Title)</span></a>
-         </td>      
+         </td>
         </tr>
        </table>
       </td>
-        
+
      </tr>
- 
+
      <tr>
       <td align="left">
        <span tal:define="p batch1/previous" tal:condition="p">
         <a href=""
            tal:attributes="
                 href string:folder_contents?b_start=${p/previous/first}"
+           i18n:translate=""
         >Previous Items</a>
        </span>
       </td>
@@ -164,6 +167,7 @@
         <a href=""
            tal:attributes="
                 href string:folder_contents?b_start=${batch2/end}"
+           i18n:translate=""
         >Next Items</a>
        </span>
       </td>
@@ -171,23 +175,29 @@
     <!-- end contentList -->
     </table>
 
-    <table border="0" cellspacing="0" cellpadding=2>
+    <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: checkPerm('Add portal content', here)">
-        <input type="submit" name="folder_factories:method" value="New...">
+        <input type="submit" name="folder_factories:method" value="New..."
+               i18n:attributes="value" />
       </span>
       <span tal:condition="python: checkPerm('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"
+               i18n:attributes="value" />
+        <input type="submit" name="folder_cut:method" value="Cut"
+               i18n:attributes="value" />
+        <input type="submit" name="folder_copy:method" value="Copy"
+               i18n:attributes="value" />
         <span tal:condition="here/cb_dataValid">
-        <input type="submit" name="folder_paste:method" value="Paste">
+        <input type="submit" name="folder_paste:method" value="Paste"
+               i18n:attributes="value" />
         </span>
       </span>
       <span tal:condition="python: checkPerm('Delete objects', here)">
-        <input type="submit" name="folder_delete:method" value="Delete">
+        <input type="submit" name="folder_delete:method" value="Delete"
+               i18n:attributes="value" />
       </span>
       </td>
      </tr>


=== CMF/CMFDefault/skins/zpt_generic/folder_factories.pt 1.8 => 1.8.18.1 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_factories.pt:1.8	Fri Aug 16 07:37:41 2002
+++ CMF/CMFDefault/skins/zpt_generic/folder_factories.pt	Thu Feb 27 19:27:34 2003
@@ -2,13 +2,13 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
+<div metal:fill-slot="main" i18n:domain="cmf_default">
 <div tal:condition="python: not(here.portal_membership.checkPermission('Access contents information', here))">
   <span tal:define="dummy here/unauthRedirect"></span>
 </div>
 <div class="Desktop">
-<h1> Add Content </h1>
-<form action="invokeFactory" method="POST"
+<h1 i18n:translate="">Add Content</h1>
+<form action="invokeFactory" method="post"
       tal:attributes="action string:${here/absolute_url}/invokeFactory"
 >
 <table class="FormLayout">
@@ -16,16 +16,20 @@
 <td>
 <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="" 
+  <td align="left" colspan="2" class="ListName"><label for=""
 	  tal:attributes="for string:cb_${repeat/item/number}"
-	  tal:content="item/Title"></label> 
+	  tal:content="item/Title" i18n:translate=""></label>
   </td>
 </tr>
  <tr valign="top">
-  <td colspan="2"> <br> </td>
-  <td align="left" class="ListDefinition" tal:content="item/Description"></td>
+  <td colspan="2"> <br /> </td>
+  <td align="left" class="ListDefinition" tal:content="item/Description"
+      i18n:translate=""></td>
  </tr>
  </table>
  </td>
@@ -33,10 +37,12 @@
 
 <table class="FormLayout">
  <tr valign="top">
-  <td> <br> </td>
-  <td colspan="2" class="TextField"> <strong> ID: </strong>
-       <input type="text" name="id" size="20">
-       <input type="submit" value="Add"> </td>
+  <td> <br /> </td>
+  <td colspan="2" class="TextField">
+   <strong i18n:translate="">ID:</strong>
+   <input type="text" name="id" size="20" />
+   <input type="submit" value=" Add " i18n:attributes="value" />
+  </td>
  </tr>
 </table>
 </form>


=== CMF/CMFDefault/skins/zpt_generic/folder_filter_form.pt 1.5 => 1.5.18.1 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_filter_form.pt:1.5	Sat Aug  3 15:40:14 2002
+++ CMF/CMFDefault/skins/zpt_generic/folder_filter_form.pt	Thu Feb 27 19:27:34 2003
@@ -14,11 +14,12 @@
                       dummy2 python:request.set('show_filter_form', '1');
                      " />
 </span>
-<form action="" method="POST"
+<form action="" method="post"
       tal:define="showfilter request/show_filter_form|nothing;
                   hidefilter python:not showfilter;
                  "
       tal:attributes="action string:${here/absolute_url}/folder_contents"
+      i18n:domain="cmf_default"
 >
 <table class="FormLayout"
     tal:condition="showfilter"
@@ -28,12 +29,13 @@
                 Subject python:filter.get( 'Subject', () );
                ">
 <tr>
-    <td colspan="2" align="left" valign="top">
+    <td colspan="2" align="left" valign="top" i18n:translate="">
         Contents View Filter
     </td>
 </tr>
 <tr>
-    <td align="left" valign="top" width="*">Subject:</td>
+    <td align="left" valign="top" width="*"
+        i18n:translate="">Subject:</td>
     <td align="left" valign="top">
      <input type="text" name="filter_by_Subject:tokens" value=""
             tal:attributes="value python:modules['string'].join(Subject, ' ');
@@ -41,17 +43,18 @@
     </td>
 </tr>
 <tr>
-    <td align="left" valign="top" width="*">Content Type:</td>
+    <td align="left" valign="top" width="*"
+        i18n:translate="">Content Type:</td>
     <td align="left" valign="top">
         <select name="filter_by_portal_type:list" multiple size="3"
             tal:define="typeinfos here/portal_types/listTypeInfo">
-                                        container=here )">
             <option value="type"
                 tal:repeat="typeinfo typeinfos"
                 tal:attributes="value typeinfo/getId;
                                 selected python:typeinfo.getId() in portal_type;
                                "
                 tal:content="typeinfo/Title"
+                i18n:translate=""
                 > type </option>
             <option tal:condition="nothing">Foo</option>
         </select>
@@ -59,17 +62,21 @@
 </tr>
 <tr>
     <td colspan="1" align="left">
-        <input type="submit" name="set_view_filter" value="Set Filter">
+      <input type="submit" name="set_view_filter" value="Set Filter"
+             i18n:attributes="value" />
     </td>
     <td colspan="1" align="left">
-        <input type="submit" name="close_filter_form" value="Close View Filter">
+      <input type="submit" name="close_filter_form" value="Close View Filter"
+             i18n:attributes="value" />
     </td>
     <td colspan="1" align="left">
-        <input type="submit" name="clear_view_filter" value="Clear View Filter">
+      <input type="submit" name="clear_view_filter" value="Clear View Filter"
+             i18n:attributes="value" />
     </td>
 </tr>
 </table>
 <span tal:condition="hidefilter">
-  <input type="submit" name="open_filter_form" value="Set View Filter">
+  <input type="submit" name="open_filter_form" value="Set View Filter"
+         i18n:attributes="value" />
 </span>
 </form>