Changeset 31520 for main/trunk/greenstone3

Timestamp:

2017-03-16T14:42:01+13:00 (7 years ago)

Author:

kjdon

Message:

a couple of small but significant changes. when getting the table of contents and using excerptid, just use ec=1 (expand contents) rather than ed=1 (expand document). the prevents us having to retrieve all the text sections of the document just to get the table of contents out. add the expand document and collapse document links into the toc when ed=1 or ec=1. they weren't there before. So then we don't need to add them to toc after retrieving toc, as they are already present. Lastly, changed the expand and collapse doc links to be standard html links - a full reload of the document - rather than javascript. HOpefully this will mean that google can follow these links and index the pages. need to test this out as the toc is not part of the original page source.

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/document_scripts.js (modified) (2 diffs)
• transform/layouts/toc.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js

@@ -440 +440 @@
     
     //Add the "Expand document"/"Collapse document" links
-    newTOC = "<table style=\"width:100%; text-align:center;\"><tr><td><a href=\"javascript:expandOrCollapseAll(true);\">"+gs.text.doc.expand_doc+"</a></td><td><a href=\"javascript:expandOrCollapseAll(false);\">"+gs.text.doc.collapse_doc+"</a></td></tr></table>" + newTOC;
+    //newTOC = "<table style=\"width:100%; text-align:center;\"><tr><td><a href=\"javascript:expandOrCollapseAll(true);\">"+gs.text.doc.expand_doc+"</a></td><td><a href=\"javascript:expandOrCollapseAll(false);\">"+gs.text.doc.collapse_doc+"</a></td></tr></table>" + newTOC;
+    //newTOC = "<table style=\"width:100%; text-align:center;\"><tr><td><a href=\""+window.location.href+"?ed=1\">"+gs.text.doc.expand_doc+"</a></td><td><a href=\""+window.location.href+"?ed=0\">"+gs.text.doc.collapse_doc+"</a></td></tr></table>" + newTOC;
     
     //Collapse the TOC
@@ -461 +462 @@
 function retrieveFullTableOfContents()
 {
-    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "?excerptid=tableOfContents&ed=1";
+    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "?excerptid=tableOfContents&ec=1";
     if(gs.cgiParams.d && gs.cgiParams.d.length > 0)
     {

main/trunk/greenstone3/web/interfaces/default/transform/layouts/toc.xsl

@@ -110 +110 @@
                                 </tbody></table>-->
                             </xsl:when>
-                            <xsl:when test="not(/page/pageRequest/paramList/param[@name = 'ed']/@value = '1')">
+                            <xsl:when test="not(/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or /page/pageRequest/paramList/param[@name = 'ec']/@value = '1')">
                                 <div id="tableOfContents">
                                     <div id="tocLoadingImage" style="text-align:center;">
@@ -126 +126 @@
                             </xsl:when>
                             <xsl:otherwise>
+                              <!-- *TODO *********-->
+                              <xsl:variable name="doc_url"><xsl:value-of select='$library_name'/>/collection/<xsl:value-of select='/page/pageResponse/collection/@name'/>/document/<xsl:value-of select='/page/pageResponse/document/documentNode/@nodeID'/>?<!--<xsl:value-of select='/page/pageRequest/@fullURL'/>--></xsl:variable>
                                 <div id="tableOfContents">
                                     <xsl:attribute name="class">
                                         <xsl:choose>
-                                            <xsl:when test="count(//documentNode) > 1 and not(/page/pageResponse/format[@type='display']/gsf:option[@name='TOC']) or /page/pageResponse/format[@type='display']/gsf:option[@name='TOC']/@value='true'">visible</xsl:when>
+                                            <xsl:when test="count(//documentNode) > 1">visible</xsl:when>
                                             <xsl:otherwise>hidden</xsl:otherwise>
                                         </xsl:choose>
                                     </xsl:attribute>
+                                    <table style="width:100%; text-align:center;"><tr><td><a href="{$doc_url}ed=1"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.expand_doc')"/></a></td><td><a href="{$doc_url}ed=0\"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.collapse_doc')"/></a></td></tr></table>
                                     <xsl:for-each select="documentNode">
                                         <xsl:call-template name="documentNodeTOC"/>