Changeset 31523 for main/trunk/greenstone3

Timestamp:

2017-03-20T11:33:00+13:00 (7 years ago)

Author:

kjdon

Message:

we want to keep p.s arg in the expand/contract contents links so that search term highlighting still works if we have got to that document from a search.

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

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

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

@@ -471 +471 @@
         url += "&a=d&d=&alb=1&rl=1&href=" + gs.cgiParams.href;
     }
+    // later on we want this arg p.s so we can keep search term highlighting for expand document link
+    if (gs.cgiParams.p_s && gs.cgiParams.p_s.length > 0) {
+    url += "&p.s=" + gs.cgiParams.p_s;
+    }
     
     if (gs.xsltParams.use_client_side_xslt == "true") { // note xsltParams are of type string, so test needs to be in quotes

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

@@ -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>
+                              <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:if test="/page/pageRequest/paramList/param[@name='p.s']">p.s=<xsl:value-of select="/page/pageRequest/paramList/param[@name='p.s']/@value"/>&amp;</xsl:if></xsl:variable>
                                 <div id="tableOfContents">
                                     <xsl:attribute name="class">
@@ -135 +134 @@
                                         </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>
+                                    <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"/>