[Zope-Checkins] CVS: Zope/lib/python/Shared/DC/ZRDB - Search.py:1.19

Florent Guillaume fg@nuxeo.com
Fri, 19 Jul 2002 14:24:24 -0400


Update of /cvs-repository/Zope/lib/python/Shared/DC/ZRDB
In directory cvs.zope.org:/tmp/cvs-serv17804/lib/python/Shared/DC/ZRDB

Modified Files:
	Search.py 
Log Message:
Collector #478: Z Search Interfaces with no parameters are now
generating correct HTML.

Collector #448: Z Search Interfaces created as PageTemplates have a
correct title, not a fragment of dtml.



=== Zope/lib/python/Shared/DC/ZRDB/Search.py 1.18 => 1.19 ===
             '<h2><dtml-var document_title></h2>\n'
             'This query requires no input.<p>\n'
             '<input type="SUBMIT" name="SUBMIT" value="Submit Query">\n'
-            '</td></tr>\n</table>\n</form>\n'
+            '</form>\n'
             '<dtml-var standard_html_footer>\n'
             % (tabs, action)
             )
@@ -213,7 +213,7 @@
             "%s\n%s%s" % (
                 '<html><body>\n%s\n'
                 '<form action="%s" method="get">\n'
-                '<h2><dtml-var document_title></h2>\n'
+                '<h2 tal:content="template/title_or_id">Title</h2>\n'
                 'Enter query parameters:<br>'
                 '<table>\n'
                 % (tabs,action),
@@ -245,10 +245,10 @@
         return (
             '<html><body>\n%s\n'
             '<form action="%s" method="get">\n'
-            '<h2><dtml-var document_title></h2>\n'
-            'This query requires no input.<p>\n'
+            '<h2 tal:content="template/title_or_id">Title</h2>\n'
+            '<p>This query requires no input.</p>\n'
             '<input type="SUBMIT" name="SUBMIT" value="Submit Query">\n'
-            '</td></tr>\n</table>\n</form>\n'
+            '</form>\n'
             '</body></html>\n'
             % (tabs, action)
             )