[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - search.pt:1.4

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


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

Modified Files:
	search.pt 
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/search.pt 1.3 => 1.4 ===
--- CMF/CMFDefault/skins/zpt_generic/search.pt:1.3	Fri Jan  4 20:30:19 2002
+++ CMF/CMFDefault/skins/zpt_generic/search.pt	Thu Mar  6 05:34:02 2003
@@ -2,30 +2,32 @@
       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> Search Results </h3>
+<h3 i18n:translate="">Search Results</h3>
 
 <div tal:define="b_start python:0;b_start request/b_start | b_start;
                  results python:here.doFormSearch( REQUEST=request );
 	             Batch python:modules['ZTUtils'].Batch;
 	             global batch python:Batch(results, 25, b_start, orphan=1);
                 ">
-    <p>Found <span tal:define="pss modules/Products.PythonScripts.standard"
-               tal:replace="python:pss.thousands_commas(len(results))">100</span> items 
-		 <span tal:condition="exists: request/SearchableText"
-		       tal:replace="string:matching ${request/SearchableText}"></span>.
-    </p>
+
+<p i18n:translate="">Found
+  <span tal:define="pss modules/Products.PythonScripts.standard"
+        tal:replace="python:pss.thousands_commas(len(results))"
+        i18n:name="count">100</span> items
+  <span tal:condition="exists: request/SearchableText"
+        tal:replace="string:matching ${request/SearchableText}"
+        i18n:name="text"></span>.
+</p>
+
 <table class="SearchResults">
  <tr>
-  <td width="16"><br></td>
-  <th> Title
-  </th>
-  <th> Type
-  </th>
-  <th> Date
-  </th>
+  <td width="16"><br /></td>
+  <th i18n:translate="">Title</th>
+  <th i18n:translate="">Type</th>
+  <th i18n:translate="">Date</th>
   </tr>
 <tbody tal:repeat="results batch"
     tal:condition="results">
@@ -33,16 +35,19 @@
   <td tal:define="global objURL python: results.getURL() + '/view'">
    <span tal:condition="results/getIcon|nothing">
      <a href="" tal:attributes="href objURL"><img src="" border="0" alt="" title=""
-	                                              tal:define="alt results/Type"
-	                                              tal:attributes="src results/getIcon; alt alt; title alt">
+                                                  tal:define="alt results/Type"
+                                                  tal:attributes="src results/getIcon; alt alt; title alt" />
 	 </a>
     </span>
   </td>
   <td>
-     <a href="" tal:attributes="href objURL"><span tal:condition="results/Title" 
-                                                 tal:content="results/Title">Title</span><span tal:condition="not:results/Title" tal:content="string:(No title)"></span></a>
+    <a href="" tal:attributes="href objURL">
+    <span tal:condition="results/Title"
+          tal:content="results/Title">Title</span>
+    <span tal:condition="not:results/Title"
+          i18n:translate="">(No title)</span></a>
   </td>
-  <td><span tal:content="results/Type">Type</span></td>
+  <td><span tal:content="results/Type" i18n:translate="">Type</span></td>
   <td tal:content="results/Date">Date</td>
 </tr>
 <tr>
@@ -50,26 +55,28 @@
   <td colspan="3">
   <em><span tal:condition="results/Description"
             tal:content="results/Description">Description</span>
-	  <span tal:condition="not:results/Description"
-	        tal:content="string:(No description)"></span></em>
+      <span tal:condition="not:results/Description"
+            i18n:translate="">(No description)</span></em>
   </td>
 </tr>
 </tbody>
-  </table>
-<div tal:condition="not:results"
-     tal:replace="string:There are no items matching your specified criteria"></div>
+</table>
+<p tal:condition="not:results"
+   i18n:translate="">There are no items matching your specified criteria</p>
 
  <p class="Desktop" tal:define="mq python:modules['ZTUtils'].make_query">
  <span tal:define="p batch/previous" tal:condition="p">
    <a href=""
       tal:attributes="href python: '?' + mq( request.form, b_start=p.first )"
-   >Previous <span tal:replace="p/length">n</span> items</a>
+      i18n:translate=""
+   >Previous <span tal:replace="p/length" i18n:name="count">n</span> items</a>
  </span>&nbsp;&nbsp;
  <span tal:define="n batch/next" tal:condition="n">
    <a href=""
       tal:attributes="href python: '?' + mq( request.form, b_start=n.first )"
-   >Next <span tal:replace="n/length">n</span> items</a>
- </span> 
+      i18n:translate=""
+   >Next <span tal:replace="n/length" i18n:name="count">n</span> items</a>
+ </span>
  </p>
 </div>
 </div>