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.

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.
d47d70e2 · Florent Guillaume · 3d8bc1dd · d47d70e2 · d47d70e2
Commit d47d70e2 authored Jul 19, 2002 by Florent Guillaume
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 8 deletions

doc/CHANGES.txt doc/CHANGES.txt +7 -1

lib/python/Shared/DC/ZRDB/Search.py lib/python/Shared/DC/ZRDB/Search.py +7 -7

No files found.
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -6,10 +6,16 @@ Zope Changes

    Bugs Fixed

+      - 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.
+
      - Fixed brokenness of session data manager hasSessionData method.
        The old method created a session data object as a result of the
        call; it does not now.
-    
+
      - Collector #458: Fixed broken reindex_all in CatalogAwareness classes.

      - The default "start" script now causes the event log to be sent to

--- a/lib/python/Shared/DC/ZRDB/Search.py
+++ b/lib/python/Shared/DC/ZRDB/Search.py
@@ -12,8 +12,8 @@
 ##############################################################################
 __doc__='''Search Interface Wizard

-$Id: Search.py,v 1.18 2001/11/28 15:51:13 matt Exp $'''
-__version__='$Revision: 1.18 $'[11:-2]
+$Id: Search.py,v 1.19 2002/07/19 18:24:23 efge Exp $'''
+__version__='$Revision: 1.19 $'[11:-2]

 from Globals import DTMLFile
 from Aqueduct import custom_default_report, custom_default_zpt_report, nicify, Args
@@ -198,7 +198,7 @@ def default_input_form(arguments,action='query',
            '<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 @@ def default_input_zpt_form(arguments,action='query',
            "%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 @@ def default_input_zpt_form(arguments,action='query',
        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)
            )