Changeset 4549

Timestamp:

2003-06-11T11:22:44+12:00 (21 years ago)

Author:

sjboddie

Message:

Removed the old HelpBookDocs option

Location:

trunk/gsdl

Files:

• macros/english.dm (modified) (2 diffs)
• src/recpt/pageaction.cpp (modified) (1 diff)

trunk/gsdl/macros/english.dm

@@ -922 +922 @@
 
 _textreadingdocs_ {How to read the documents}
-_booktextreadingdocs_ {How to read the books}
-_bibtextreadingdocs_ {Getting more information on a bibliography item}
 
 _texthelpreadingdocs_ {
-<p>_iconblankbar_
+<p>_iconblankbar_</p>
 <a name=reading-docs>
 <h2>_textreadingdocs_</h2>
 
-<p>You can tell when you have arrived at an individual document because its
-title and author appear at the top left of the page. Beside these is the
-number of the current page, a box that allows you to select a new page, and
-forward and backward arrows.
+<p>You can tell when you have arrived at an individual book or document
+because its title, or a photograph of the front cover, appears at the top
+left of the page. In some collections this is accompanied by a table of
+contents, while others contain just the number of the current page along
+with a box that allows you to select a new page and go forward and
+backward. In the table of contents, the current section heading is in bold
+face, and the table is expandable -- click on the folders to open or close
+them; click on the open book at the top to close it.</p>
 
 <p>Underneath is the text of the current section. When you have read
 through it, there are arrows at the bottom to take you on to the next
-section or back to the previous one.
-
-<p>Below the title and author are three buttons. Click on <i>expand
-text</i> to expand out the whole text of the current document. If the
-document is large, this could take a long time and use a lot of memory!
-Click on <i>detach</i> to make a new browser window for this
+section or back to the previous one.</p>
+
+<p>Below the title or front-cover photograph are some buttons. Click on
+<i>expand text</i> to expand out the whole text of the current section, or
+book. If the document is large, this could take a long time and use a lot
+of memory! Click on <i>expand contents</i> to expand out the whole table of
+contents so that you can see the titles of all chapters and
+subsections. Click on <i>detach</i> to make a new browser window for this
 document. (This is useful if you want to compare documents, or read two at
-once.)  Finally, when you do a search the words you search for are
-highlighted.  Click on <i>no highlighting</i> to remove the highlighting.
-<p>
-<table cellspacing="0" cellpadding="2" border="0">
-<tr><td colspan=2><img src="_httpiconmore_" border="0"></td><td>Click on the arrow to go to the next section ...</td></tr>
-<tr><td colspan=2><img src="_httpiconless_" border="0"></td><td>... or back to the previous section</td></tr>
-<tr><td><img src="_document:httpiconealltof_" border="0"></td><td><img 
-src="_document:httpiconetsecof_" border="0"></td><td>Display all text, or not</td></tr>
-<tr><td colspan=2><img src="_document:httpiconedtchof_" border="0"></td><td>Open this page in a new window</td></tr>
-<tr><td><img src="_document:httpiconehlof_" border="0"></td><td><img
-src="_document:httpiconenhlof_" border="0"></td><td>Highlight search terms, or not</td></tr>
-</table>
-
-}
-
-_booktexthelpreadingdocs_ {
-<p>_iconblankbar_
-<a name=reading-docs>
-<h2>_textreadingdocs_</h2>
-
-<p>You can tell when you have arrived at an individual book because there
-is a photograph of its front cover at the top left of the page.  Beside the
-photograph is a table of contents with an arrow marking where you are.
-This table is expandable: click on the folders to open them or close them.
-Click on the open book at the top to close it.
-
-<p>Underneath is the text of the current section.  When you have read
-through it, there are arrows at the bottom to take you on to the next
-section or back to the previous one.
-
-<p>Below the photograph are four buttons. Click on <i>expand text</i> to
-expand out the whole text of the current section, or book.  If the book is
-large, this could take a long time and use a lot of memory! Click on
-<i>expand contents</i> to expand out the whole table of contents so that
-you can see the titles of all chapters and subsections. Click on
-<i>detach</i> to make a new browser window for this book.  (This is useful
-if you want to compare books, or read two at once.) Finally, when you do a
-search the words you search for are highlighted. Click on <i>no
-highlighting</i> to remove highlighting.
+once.) Finally, when you do a search the words you search for are
+highlighted. Click on <i>no highlighting</i> to remove highlighting.</p>
 
 <p>
@@ -999 +966 @@
 <tr><td colspan=2><img src="_httpiconmore_" border="0"></td><td>Click the arrow to go to the next section ...</td></tr>
 <tr><td colspan=2><img src="_httpiconless_" border="0"></td><td>... or back to the previous section</td></tr>
-</table>
-}
-
-_bibtexthelpreadingdocs_ {
-<p>_iconblankbar_
-<a name=reading-docs>
-<h2>_textreadingdocs_</h2>
-
-<p>Some bibliography items contain more information, such as an abstract.
-You can tell from the query response page if this is the case because they 
-are shown with the _icontext_ icon instead of the _iconblanktext_ icon.
-
-<p>Clicking on the _icontext_ icon will give you more information about the
-bibliography item.
-
-<p> Below the bibliography item are two buttons. Click on <i>detach</i> to 
-make a new browser window for this book. (This is useful if you want to compare
-bibliography items.) Finally, when you do a search the words you search for are 
-highlighted. Click on <i>no highlighting</i> to remove the highlighting.
-
-<p>
-<table cellspacing="0" cellpadding="2" border="0">
-<tr><td colspan=2><img src="_document:httpiconedtchof_" border="0"></td><td>Open this page in a new window</td></tr>
-<tr><td><img src="_document:httpiconehlof_" border="0"></td><td><img
-src="_document:httpiconenhlof_" border="0"></td><td>Highlight search terms, or not</td></tr>
 </table>
 }

trunk/gsdl/src/recpt/pageaction.cpp

@@ -660 +660 @@
     else disp.setmacro ("textbrowseoptions", "help", longtext);
 
-    if (arg_p == "help") {
-
-      // _topicreadingdocs_  _textreadingdocs_  _texthelpreadingdocs_
-          
-      // if HTML collection there's no how to read document text
-      text_tmap::const_iterator it = cinfo->format.find ("HelpNoDocs");
-      if ((it != cinfo->format.end()) && ((*it).second == "true")) {
-    disp.setmacro ("topicreadingdocs", "help", "");
-    disp.setmacro ("texthelpreadingdocs", "help", "");
-      }
-      it = cinfo->format.find ("HelpBibDocs");
-      if ((it != cinfo->format.end()) && ((*it).second == "true")) {
-    disp.setmacro ("texthelpreadingdocs", "help", "_bibtexthelpreadingdocs_");
-    disp.setmacro ("textreadingdocs", "help", "_bibtextreadingdocs_");
-      }
-      it = cinfo->format.find ("HelpBookDocs");
-      if ((it != cinfo->format.end()) && ((*it).second == "true")) {
-    disp.setmacro ("texthelpreadingdocs", "help", "_booktexthelpreadingdocs_");
-    disp.setmacro ("textreadingdocs", "help", "_booktextreadingdocs_");
-      }
-
-    }
     if (arg_p == "about") {