Changeset 26084 for main/trunk/greenstone3/web/interfaces/default/transform/pages/query.xsl

Timestamp:

2012-08-08T16:17:00+12:00 (12 years ago)

Author:

sjm84

Message:

Changed the way we hide the search area when a user performs a text search as the previous approach was causing the next and previous buttons to stop working

File:

• main/trunk/greenstone3/web/interfaces/default/transform/pages/query.xsl (modified) (4 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/pages/query.xsl

@@ -21 +21 @@
     <!-- the page content -->
     <xsl:template match="/page">
-        <xsl:call-template name="queryPage"/>
+        <xsl:if test="not(/page/pageRequest/paramList/param[@name = 'qs']) or /page/pageRequest/paramList/param[@name = 'qs']/@value = ''">
+            <xsl:call-template name="queryPage"/>
+        </xsl:if>
         <xsl:call-template name="resultsPage"/>
     </xsl:template>
@@ -309 +311 @@
             <td id="prevArrowTD">
                 <xsl:if test="$currentPage != 1">
-                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage - 1}">
+                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage - 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}">
                         <img src="interfaces/default/images/previous.png"/>
                     </a>
@@ -316 +318 @@
             <td id="prevTD">
                 <xsl:if test="$currentPage != 1">
-                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage - 1}">Previous</a>
+                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage - 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}">Previous</a>
                 </xsl:if>
             </td>
@@ -373 +375 @@
             <td id="nextTD">
                 <xsl:if test="($currentPage * $docsPerPage + 1) &lt; $docMax">
-                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage + 1}">Next</a>
+                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage + 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}">Next</a>
                 </xsl:if>
             </td>
             <td id="nextArrowTD">
                 <xsl:if test="($currentPage * $docsPerPage + 1) &lt; $docMax">
-                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage + 1}">
+                    <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage + 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}">
                         <img src="interfaces/default/images/next.png"/>
                     </a>