[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - search_form.pt:1.6

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


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

Modified Files:
	search_form.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_form.pt 1.5 => 1.6 ===
--- CMF/CMFDefault/skins/zpt_generic/search_form.pt:1.5	Fri Jul  5 15:45:06 2002
+++ CMF/CMFDefault/skins/zpt_generic/search_form.pt	Thu Mar  6 05:34:21 2003
@@ -2,11 +2,12 @@
       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">
 
-<h1>Search <span tal:replace="here/Title" /></h1>
+<h1 i18n:translate="">Search <span tal:replace="here/Title"
+                                   i18n:name="title" /></h1>
 
 <form action="search"
       tal:attributes="action string:${here/portal_url}/search"
@@ -16,31 +17,29 @@
 
 
  <tr tal:condition="python: here.portal_membership.checkPermission('Review portal content', here)">
-  <th> Review Status
-  </th>
+  <th i18n:translate="">Review Status</th>
   <td>
    <select name="review_state" size="3" multiple>
-    <option value="" selected>-- any --</option>
-    <option>private</option>
-    <option>pending</option>
-    <option>published</option>
+    <option value="" selected i18n:translate="">-- any --</option>
+    <option value="private" i18n:translate="">private</option>
+    <option value="pending" i18n:translate="">pending</option>
+    <option value="published" i18n:translate="">published</option>
    </select>
    <dl class="FieldHelp">
-    <dd> As a reviewer, you may search for items based on their
-         review state.  If you wish to constrain results to items
-         in certain states, select them from this list.
+    <dd i18n:translate="">As a reviewer, you may search for items based on
+      their review state.  If you wish to constrain results to items in
+      certain states, select them from this list.
     </dd>
    </dl>
   </td>
  </tr>
- 
+
  <tr valign="top">
-  <th> Full Text
-  </th>
+  <th i18n:translate="">Full Text</th>
   <td>
-    <input name="SearchableText" size="40">
+    <input name="SearchableText" size="40" />
    <dl class="FieldHelp">
-    <dd> For a simple text search, enter your search term
+    <dd i18n:translate="">For a simple text search, enter your search term
          here.  Multiple words may be found by combining
          them with <b>AND</b> and <b>OR</b>.  This will
          find text in items' contents, title and
@@ -51,18 +50,17 @@
  </tr>
 
  <tr>
-  <th>Title
-  </th>
+  <th i18n:translate="">Title</th>
   <td>
-   <input name="Title" size="20">
+   <input name="Title" size="20" />
   </td>
  </tr>
 
  <tr valign="top">
-  <th>Subject</th>
+  <th i18n:translate="">Subject</th>
   <td tal:define="items python: here.portal_catalog.uniqueValuesFor('Subject')">
    <select name="Subject:list" multiple size="5">
-    <option value="" selected>-- any --</option>
+    <option value="" selected i18n:translate="">-- any --</option>
     <option value=""
 		    tal:repeat="item items"
 		    tal:attributes="value item"
@@ -73,12 +71,11 @@
  </tr>
 
  <tr>
-  <th> Description
-  </th>
+  <th i18n:translate="">Description</th>
   <td>
-   <input name="Description" size="20">
+   <input name="Description" size="20" />
    <dl class="FieldHelp">
-    <dd> You may also search the items' descriptions and
+    <dd i18n:translate=""> You may also search the items' descriptions and
          titles specifically.  Multiple words may be found
          by combining them with <b>AND</b> and <b>OR</b>.
     </dd>
@@ -87,8 +84,7 @@
  </tr>
 
  <tr>
-  <th> Find new items since...
-  </th>
+  <th i18n:translate="">Find new items since...</th>
   <td tal:define="today python: here.ZopeTime().earliestTime();
 			      mtool here/portal_membership;
                   member python:mtool.getAuthenticatedMember();
@@ -98,38 +94,44 @@
 	              lastMth python:(today-31).Date();
                  ">
    <select name="created:date">
-    <option value="1970/01/01 00:00:00 GMT">Ever</option>
-	<option value=""
-	        tal:condition="python:not(here.portal_membership.isAnonymousUser())"
-			tal:attributes="value lastLogin">Last login</option>
+    <option value="1970/01/01 00:00:00 GMT"
+            i18n:translate="">Ever</option>
+    <option value=""
+            tal:condition="python:not(here.portal_membership.isAnonymousUser())"
+            tal:attributes="value lastLogin"
+            i18n:translate="">Last login</option>
     <option value=""
-			tal:attributes="value yesterday">Yesterday</option>
+            tal:attributes="value yesterday"
+            i18n:translate="">Yesterday</option>
     <option value=""
-			tal:attributes="value lastWeek">Last week</option>
+            tal:attributes="value lastWeek"
+            i18n:translate="">Last week</option>
     <option value=""
-			tal:attributes="value lastMth">Last month</option>
+            tal:attributes="value lastMth"
+            i18n:translate="">Last month</option>
    </select>
-   <input type="hidden" name="created_usage" value="range:min">
+   <input type="hidden" name="created_usage" value="range:min" />
    <dl class="FieldHelp">
-    <dd> You may find only recent items by selecting a time-frame.
+    <dd i18n:translate="">You may find only recent items by selecting a
+      time-frame.
     </dd>
    </dl>
   </td>
  </tr>
 
  <tr>
-  <th> Item type
-  </th>
+  <th i18n:translate="">Item type</th>
   <td tal:define="typeinfos here/portal_types/listTypeInfo" >
    <select name="portal_type:list" multiple size="5">
-    <option value="" selected>-- any --</option>
+    <option value="" selected i18n:translate="">-- any --</option>
     <option value=""
-		    tal:repeat="typeinfo typeinfos"
-		    tal:attributes="value typeinfo/getId"
-		    tal:content="typeinfo/Title"></option>
-    </select> 
+            tal:repeat="typeinfo typeinfos"
+            tal:attributes="value typeinfo/getId"
+            tal:content="typeinfo/Title"
+            i18n:translate=""></option>
+    </select>
    <dl class="FieldHelp">
-    <dd> You may limit your results to particular kinds of
+    <dd i18n:translate="">You may limit your results to particular kinds of
          items by selecting them above.  To find all kinds
          of items, do not select anything.
     </dd>
@@ -138,13 +140,12 @@
  </tr>
 
  <tr>
-  <th> Creator
-  </th>
+  <th i18n:translate="">Creator</th>
   <td>
-   <input name="Creator" size="20">
+   <input name="Creator" size="20" />
 
    <dl class="FieldHelp">
-    <dd> To find items by a particular user only, enter
+    <dd i18n:translate="">To find items by a particular user only, enter
          their username above.  Note that you must enter
          their username <i>exactly</i>.
     </dd>
@@ -153,9 +154,9 @@
  </tr>
 
  <tr>
-  <td><br></td>
+  <td><br /></td>
   <td>
-    <input type="submit" value="Search">
+    <input type="submit" value=" Search " i18n:attributes="value" />
   </td>
  </tr>
 </table>