fixed help sys headers and footers, tutorial topic order.

50b8d21f · Amos Latteier · bbe18532 · 50b8d21f · 50b8d21f · 50b8d21f
Commit 50b8d21f authored Aug 01, 2000 by Amos Latteier
7 changed files
--- a/lib/python/HelpSys/HelpSys.py
+++ b/lib/python/HelpSys/HelpSys.py
@@ -149,6 +149,8 @@ class HelpSys(Acquisition.Implicit, ObjectManager, Item, Persistent):
    search=HTMLFile('search', globals())
    results=HTMLFile('results', globals())
    main=HTML("""<html></html>""")
+    standard_html_header=HTMLFile('menu_header', globals())
+    standard_html_footer=HTMLFile('menu_footer', globals())

    button=HTMLFile('button', globals())


--- a/lib/python/HelpSys/menu.dtml
+++ b/lib/python/HelpSys/menu.dtml
 <dtml-var standard_html_header>
 <dtml-call "REQUEST.set('MANAGE_TABS_NO_BANNER',1)">
 <dtml-var manage_tabs>
-<h2>Contents</h2>

 <dtml-tree>
 <dtml-if "meta_type =='Help Topic'">
@@ -11,4 +10,6 @@
 </dtml-if>
 </dtml-tree>

-<dtml-var standard_html_footer>
\ No newline at end of file
+<dtml-var standard_html_footer>
+
+
--- a/lib/python/HelpSys/results.dtml
+++ b/lib/python/HelpSys/results.dtml
 <dtml-var standard_html_header>
 <dtml-call "REQUEST.set('MANAGE_TABS_NO_BANNER',1)">
+<dtml-call "REQUEST.set('management_view', 'Search')">
 <dtml-var manage_tabs>
-<h2>Search Results</h2>

+<p>Help topics matching <b><dtml-var SearchableText></b>:</p>
 <p>
 <dtml-in "searchResults(REQUEST)">
 <a href="<dtml-var SCRIPT_NAME><dtml-var url>" target="help_main"><dtml-var title_or_id></a><br>
 <dtml-else>
-<em>No help topics were found matching <b><dtml-var SearchableText></b>.</em>
+<em>No matches.</em>
 </dtml-in>
 </p>

-<dtml-var standard_html_footer>
\ No newline at end of file
+<dtml-var standard_html_footer>
--- a/lib/python/HelpSys/search.dtml
+++ b/lib/python/HelpSys/search.dtml
 <dtml-var standard_html_header>
 <dtml-call "REQUEST.set('MANAGE_TABS_NO_BANNER',1)">
 <dtml-var manage_tabs>
-<h2>Search</h2>
+
 <p>
 <form action="results" method="GET">
 Search terms
@@ -9,4 +9,4 @@ Search terms
 <input type="submit" value=" Search ">
 </form>
 </p>
-<dtml-var standard_html_footer>
\ No newline at end of file
+<dtml-var standard_html_footer>
--- a/lib/python/Products/ZopeTutorial/__init__.py
+++ b/lib/python/Products/ZopeTutorial/__init__.py
@@ -122,7 +122,8 @@ def initialize(context):
    # create glossary
    text=open(glossary_path).read()
    text=term_pat.sub(defineTerm, text)
-    glossary=TutorialTopic.TutorialTopic('glossary', 'Zope Tutorial Glossary', text)
+    glossary=TutorialTopic.TutorialTopic('tutorialGlossary', 'Zope Tutorial Glossary', text)
+    context.registerHelpTopic('tutorialGlossary', glossary)

    # create lessons
    f=open(lesson_path)
@@ -147,8 +148,6 @@ def initialize(context):
            break
    f.close()

-    # register glossary last
-    context.registerHelpTopic('glossary', glossary)


 # Glossary functions
@@ -163,7 +162,7 @@ def glossaryTerm(match):
    """
    name=match.group(1)
    if name in terms:
-        return """<a href="../glossary#%s">%s</a>""" % \
+        return """<a href="../tutorialGlossary#%s">%s</a>""" % \
                (quote_plus(name), html_quote(name))
    return """[%s]""" % name


--- a/lib/python/Products/ZopeTutorial/tutorialNav.dtml
+++ b/lib/python/Products/ZopeTutorial/tutorialNav.dtml
+<dtml-unless "id=='tutorialGlossary'">
 <dtml-call "REQUEST.set('ids', aq_parent.objectIds())">
-<dtml-call "ids.remove('glossary')">
+<dtml-call "ids.remove('tutorialGlossary')">
 <dtml-call "REQUEST.set('i', ids.index(id))">

 <table width="100%" border="0" padding="0" spacing="0">
@@ -22,4 +23,8 @@
 </dtml-if>
 </dtml-unless>

-</td></tr></table>
\ No newline at end of file
+</td></tr></table>
+</dtml-unless>
+
+
+
--- a/lib/python/Products/ZopeTutorial/version.txt
+++ b/lib/python/Products/ZopeTutorial/version.txt
-Zope Tutorial 1.0a5
\ No newline at end of file
+Zope Tutorial 1.0