[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/search/ - tweaking

Yvo Schubbe cvs-admin at zope.org
Wed Sep 26 07:17:14 UTC 2012


Log message for revision 127893:
  - tweaking

Changed:
  A   Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.rst
  D   Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.txt
  D   Products.CMFDefault/trunk/Products/CMFDefault/browser/search/results.pt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search.py
  A   Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search_results.pt

-=-
Copied: Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.rst (from rev 127891, Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.txt)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.rst	                        (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.rst	2012-09-26 07:17:10 UTC (rev 127893)
@@ -0,0 +1,9 @@
+Converting skins to views:
+==========================
+
+[/] ISiteRoot @@search.html:
+----------------------------
+- [ ] search_form.py -> search.Search
+- [ ] search_form_template.pt -> search.pt
+- [ ] search.py -> search.Search
+- [ ] search_results_template.pt -> search_results.pt

Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.txt	2012-09-26 07:10:40 UTC (rev 127892)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/search/TODO.txt	2012-09-26 07:17:10 UTC (rev 127893)
@@ -1,7 +0,0 @@
-Search Views
-------------
-  [x] search:
-
-      search.py, search_form.py  -> search.py.Search
-      search_form_template.pt -> search.pt
-      search_results_template.pt -> results.pt

Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/search/results.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/search/results.pt	2012-09-26 07:10:40 UTC (rev 127892)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/search/results.pt	2012-09-26 07:17:10 UTC (rev 127893)
@@ -1,51 +0,0 @@
-<html metal:use-macro="context/@@standard_macros/page">
-
-<body>
-
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-
-<h1 tal:content="view/label | nothing ">Search Results</h1>
-
-<table class="SearchResults" tal:condition="view/listBatchItems">
- <thead>
-  <tr>
-   <td width="16">&nbsp;</td>
-   <th i18n:translate="">Title</th>
-   <th i18n:translate="">Type</th>
-   <th i18n:translate="">Date</th>
-  </tr>
- </thead>
- <tbody tal:repeat="item_info view/listBatchItems">
-  <tr>
-   <td
-   ><a href="" tal:condition="item_info/icon"
-       tal:attributes="href item_info/url"
-    ><img src="" border="0" alt="" title=""
-        tal:attributes="src item_info/icon;
-                        alt item_info/type;
-                        title item_info/type" /></a></td>
-   <td
-   ><a href="" tal:attributes="href item_info/url"
-   ><tal:case tal:condition="item_info/title"
-       tal:content="item_info/title">Title</tal:case
-   ><tal:case tal:condition="not:item_info/title"
-       i18n:translate="">(No title)</tal:case></a></td>
-   <td tal:content="item_info/type" i18n:translate="">Type</td>
-   <td tal:content="item_info/date">Date</td>
-  </tr>
-  <tr>
-   <td>&nbsp;</td>
-   <td colspan="3"
-   ><em tal:condition="item_info/description"
-       tal:content="item_info/description">Description</em
-   ><em tal:condition="not:item_info/description"
-       i18n:translate="">(No description)</em></td>
-  </tr>
- </tbody>
-</table>
-<metal:macro metal:use-macro="context/@@batch_widget/navigation" />
-
-</metal:slot>
-
-</body>
-</html>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search.py	2012-09-26 07:10:40 UTC (rev 127892)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search.py	2012-09-26 07:17:10 UTC (rev 127893)
@@ -36,7 +36,7 @@
     """Portal Search Form"""
 
     template = ViewPageTemplateFile("search.pt")
-    results = ViewPageTemplateFile("results.pt")
+    results = ViewPageTemplateFile("search_results.pt")
     hidden_fields = form.FormFields(IBatchForm)
     form_fields = form.FormFields(ISearchSchema)
     form_fields['review_state'].custom_widget = ChoiceMultiSelectWidget

Copied: Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search_results.pt (from rev 127891, Products.CMFDefault/trunk/Products/CMFDefault/browser/search/results.pt)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search_results.pt	                        (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/search/search_results.pt	2012-09-26 07:17:10 UTC (rev 127893)
@@ -0,0 +1,51 @@
+<html metal:use-macro="context/@@standard_macros/page">
+
+<body>
+
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+
+<h1 tal:content="view/label | nothing ">Search Results</h1>
+
+<table class="SearchResults" tal:condition="view/listBatchItems">
+ <thead>
+  <tr>
+   <td width="16">&nbsp;</td>
+   <th i18n:translate="">Title</th>
+   <th i18n:translate="">Type</th>
+   <th i18n:translate="">Date</th>
+  </tr>
+ </thead>
+ <tbody tal:repeat="item_info view/listBatchItems">
+  <tr>
+   <td
+   ><a href="" tal:condition="item_info/icon"
+       tal:attributes="href item_info/url"
+    ><img src="" border="0" alt="" title=""
+        tal:attributes="src item_info/icon;
+                        alt item_info/type;
+                        title item_info/type" /></a></td>
+   <td
+   ><a href="" tal:attributes="href item_info/url"
+   ><tal:case tal:condition="item_info/title"
+       tal:content="item_info/title">Title</tal:case
+   ><tal:case tal:condition="not:item_info/title"
+       i18n:translate="">(No title)</tal:case></a></td>
+   <td tal:content="item_info/type" i18n:translate="">Type</td>
+   <td tal:content="item_info/date">Date</td>
+  </tr>
+  <tr>
+   <td>&nbsp;</td>
+   <td colspan="3"
+   ><em tal:condition="item_info/description"
+       tal:content="item_info/description">Description</em
+   ><em tal:condition="not:item_info/description"
+       i18n:translate="">(No description)</em></td>
+  </tr>
+ </tbody>
+</table>
+<metal:macro metal:use-macro="context/@@batch_widget/navigation" />
+
+</metal:slot>
+
+</body>
+</html>



More information about the checkins mailing list