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

Tres Seaver tseaver@zope.com
Mon, 16 Sep 2002 09:43:59 -0400


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

Modified Files:
      Tag: CMF-1_3-branch
	search.pt 
Log Message:
 - Revert unintended checkin.

=== CMF/CMFDefault/skins/zpt_generic/search.pt 1.3.18.1 => 1.3.18.2 ===
--- CMF/CMFDefault/skins/zpt_generic/search.pt:1.3.18.1	Mon Sep 16 08:08:56 2002
+++ CMF/CMFDefault/skins/zpt_generic/search.pt	Mon Sep 16 09:43:59 2002
@@ -2,89 +2,78 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
 <body>
-
-<div class="Desktop"
-     metal:fill-slot="main"
-     tal:define="b_start python:request.get( 'b_start', 0 );
-                 results python:here.doFormSearch( REQUEST=request );
-                 Batch python:modules['ZTUtils'].Batch;
-                 global batch python:Batch(results, 25, b_start, orphan=1);
-                 pss modules/Products.PythonScripts.standard;" >
+<div metal:fill-slot="main">
+<div class="Desktop">
 
 <h3> Search Results </h3>
 
-<p tal:condition="not:results">
-There are no items matching your specified criteria.
-</p>
-
-<div tal:condition="results">
-
-<p tal:define=" tc nocall:pss/thousands_commas">
-  Found <span tal:replace="python:tc(len(results))">100</span> items 
-        <span tal:condition="exists: request/SearchableText"
-              tal:replace="string:matching ${request/SearchableText}"></span>.
-</p>
-
+<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>
 <table class="SearchResults">
-
  <tr>
   <td width="16"><br></td>
-  <th> Title</th>
-  <th> Type</th>
-  <th> Date</th>
- </tr>
-
- <tbody tal:repeat="results batch">
+  <th> Title
+  </th>
+  <th> Type
+  </th>
+  <th> Date
+  </th>
+  </tr>
+<tbody tal:repeat="results batch"
+    tal:condition="results">
   <tr>
   <td tal:define="global objURL python: results.getURL() + '/view'">
-     <a href="" tal:attributes="href objURL"
-        tal:condition="results/getIcon|nothing"
-     ><img src="" border="0" alt="" title=""
-           tal:define="alt results/Type"
-           tal:attributes="src results/getIcon;
-                           alt alt;
-                           title alt"></a>
+   <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">
+	 </a>
+    </span>
   </td>
   <td>
-     <a href="" tal:attributes="href objURL"
-     ><span tal:replace="results/Title | results/getId">(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" tal:content="string:(No title)"></span></a>
   </td>
   <td><span tal:content="results/Type">Type</span></td>
   <td tal:content="results/Date">Date</td>
- </tr>
-
- <tr>
-  <td></td>
+</tr>
+<tr>
+  <td>&nbsp;</td>
   <td colspan="3">
-    <em tal:condition="results/Description"
-        tal:content="results/Description | default">(No description)"></em>
+  <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>
   </td>
- </tr>
-
- </tbody>
-
-</table>
+</tr>
+</tbody>
+  </table>
+<div tal:condition="not:results"
+     tal:replace="string:There are no items matching your specified criteria"></div>
 
- <p class="Desktop"
-    tal:define="mq python:modules['ZTUtils'].make_query">
- <span tal:define="p batch/previous"
-       tal:condition="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>
  </span>&nbsp;&nbsp;
- <span tal:define="n batch/next"
-       tal:condition="n">
+ <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> 
  </p>
-
 </div>
-
 </div>
-
+</div>
 </body>
 </html>