[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - folder_rename_form.pt:1.6 index_html_utils.html:1.3

Yvo Schubbe schubbe@web.de
Thu, 6 Mar 2003 05:30:34 -0500


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

Modified Files:
	folder_rename_form.pt index_html_utils.html 
Log Message:
Merged yuppie-collector122-branch:
- Added i18n attributes. (Collector #122)
- Made scripts independent of submit button values.
- Added transition_form.

=== CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt 1.5 => 1.6 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt:1.5	Thu May 23 08:28:09 2002
+++ CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt	Thu Mar  6 05:30:34 2003
@@ -2,44 +2,46 @@
       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 class="Desktop">
 
-<h3> Rename Items </h3>
+<h3 i18n:translate="">Rename Items</h3>
 
 <div tal:condition="here/folder_rename_items" >
 
-<form action="folder_rename" method="POST"
+<form action="folder_rename" method="post"
       tal:attributes="action string:${here/absolute_url}/folder_rename"
 >
 
  <table class="FormLayout">
 
   <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>
       <span tal:replace="item/getId">ID</span>
       <input type="hidden" name="ids:list" value=""
-             tal:attributes="value item/getId">
+             tal:attributes="value item/getId" />
     </td>
 
     <td align="left" valign="top" width="5%">
-      <strong>to</strong>
+      <strong i18n:translate="">to</strong>
     </td>
 
     <td align="left" valign="top">
       <input type="text" name="new_ids:list" value=""
-             tal:attributes="value item/getId" size="20">
+             tal:attributes="value item/getId" size="20" />
     </td>
   </tr>
 
   <tr>
-    <td colspan="4"> <input type="submit" value=" Ok "> </td>
+    <td colspan="4">
+      <input type="submit" value=" Ok " i18n:attributes="value" />
+    </td>
   </tr>
 
  </table>
@@ -50,11 +52,11 @@
 
 <div tal:condition="not: here/folder_rename_items">
 
-<form action="folder_contents" method="GET"
+<form action="folder_contents" method="get"
       tal:attributes="action string:${here/absolute_url}/folder_contents"
 >
-  <p>You must select one or more items to rename.</p>
-  <input type="submit" value=" Ok ">
+  <p i18n:translate="">You must select one or more items to rename.</p>
+  <input type="submit" value=" Ok " i18n:attributes="value" />
 </form>
 </div>
 


=== CMF/CMFDefault/skins/zpt_generic/index_html_utils.html 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_generic/index_html_utils.html:1.2	Thu Jul 25 10:48:46 2002
+++ CMF/CMFDefault/skins/zpt_generic/index_html_utils.html	Thu Mar  6 05:30:34 2003
@@ -9,7 +9,7 @@
 
 </div>
 
-<div metal:define-macro="index_content">
+<div metal:define-macro="index_content" i18n:domain="cmf_default">
 
   <div tal:define="auth_filter nocall: modules/ZTUtils/LazyFilter;
                    default_types python:( 'Document'
@@ -25,7 +25,7 @@
                   ">
   <div tal:condition="items">
 
-  <h4> Content </h4>
+  <h4 i18n:translate=""> Content </h4>
 
   <ul>
    <li tal:repeat="item items">
@@ -33,7 +33,8 @@
       align="middle" border="0"
       tal:attributes="src   string:${item/portal_url}/${item/getIcon};
                       alt   string:${item/Type};
-                      title string:${item/Type}"></a>
+                      title string:${item/Type}"
+      i18n:attributes="alt title" /></a>
     <a href="item_url" tal:attributes="href item/absolute_url"
        tal:content="item/Title"> Title </a>
      <blockquote tal:condition="exists: item/Description"
@@ -49,7 +50,7 @@
 </div>
 
 
-<div metal:define-macro="index_links">
+<div metal:define-macro="index_links" i18n:domain="cmf_default">
 
   <div tal:define="auth_filter nocall: modules/ZTUtils/LazyFilter;
                    default_types python:( 'Link'
@@ -62,7 +63,7 @@
                    items python: auth_filter( raw_items, skip='View' );
                   ">
   <div tal:condition="items">
-  <h4> Related Resources </h4>
+  <h4 i18n:translate=""> Related Resources </h4>
 
   <ul>
    <li tal:repeat="item items">
@@ -70,7 +71,8 @@
       align="middle" border="0"
       tal:attributes="src   string:${item/portal_url}/${item/getIcon};
                       alt   string:${item/Type};
-                      title string:${item/Type}"></a>
+                      title string:${item/Type}"
+      i18n:attributes="alt title" /></a>
     <a href="item_url" tal:attributes="href item/absolute_url"
        tal:content="item/Title"> Title </a>
      <blockquote tal:condition="exists: item/Description"
@@ -85,11 +87,11 @@
 
 </div>
 
-<div metal:define-macro="index_folders">
+<div metal:define-macro="index_folders" i18n:domain="cmf_default">
 
   <div tal:define="auth_filter nocall: modules/ZTUtils/LazyFilter;
                    default_types python:( 'Folder'
-                                        , 
+                                        ,
                                         );
                    types types | here/show_folder_types | default_types;
                    raw_items python: here.contentValues(
@@ -97,7 +99,7 @@
                    items python: auth_filter( raw_items, skip='View' );
                   ">
   <div tal:condition="items">
-  <h4> Folders </h4>
+  <h4 i18n:translate=""> Folders </h4>
 
   <ul>
    <li tal:repeat="item items">
@@ -105,7 +107,8 @@
       align="middle" border="0"
       tal:attributes="src   string:${item/portal_url}/${item/getIcon};
                       alt   string:${item/Type};
-                      title string:${item/Type}"></a>
+                      title string:${item/Type}"
+      i18n:attributes="alt title" /></a>
     <a href="item_url" tal:attributes="href item/absolute_url"
        tal:content="item/TitleOrId"> Title </a>
      <blockquote tal:condition="exists: item/Description"
@@ -120,7 +123,7 @@
 
 </div>
 
-<div metal:define-macro="news_box">
+<div metal:define-macro="news_box" i18n:domain="cmf_default">
 
  <table class="NewsItems"
         cellspacing="0"
@@ -136,28 +139,28 @@
 		            global batch python:Batch(news, 10, 0, orphan=1)">
   <tr>
    <td class="NewsBorder" width="1" rowspan="13" bgcolor="#6699CC">
-    <img src="spacer.gif" alt=" " width="1" height="2" border="0">
+    <img src="spacer.gif" alt=" " width="1" height="2" border="0" />
    </td>
    <td valign="top" class="NewsTitle" width="100%">
-     <b>News</b>
+     <b i18n:translate="">News</b>
    </td>
   </tr>
   <tr class="NewsItemRow" tal:condition="news"
       tal:repeat="news batch">
    <td valign="top" wrap>
     <a href="" tal:attributes="href python:news.getURL()"
-       tal:content="news/Title"></a><br>
+       tal:content="news/Title"></a><br />
     <span tal:replace="news/Date">Date</span>
    </td>
   </tr>
   <tr class="NewsItemRow" tal:condition="python:not(news)">
-   <td valign="top">
+   <td valign="top" i18n:translate="">
      No news is no news.
    </td>
   </tr>
   <tr class="NewsItemRow">
    <td>
-     <a href="recent_news">More...</a>
+     <a href="recent_news" i18n:translate="">More...</a>
    </td>
   </tr>
 </tbody>