Changeset 14644 for greenstone3/trunk/web/interfaces

Timestamp:

2007-10-10T17:53:08+13:00 (16 years ago)

Author:

anna

Message:

Fixed broken links in GotoForm in paged navigation

File:

• greenstone3/trunk/web/interfaces/classic/transform/document.xsl (modified) (6 diffs)

greenstone3/trunk/web/interfaces/classic/transform/document.xsl

@@ -157 +157 @@
         <xsl:with-param name="collName" select="$collName"/>
       </xsl:call-template></div>-->
-
+ 
     <xsl:if test="string($doTOC) != 'false'">
        <div id="toc">
@@ -418 +418 @@
     <xsl:variable name="length" select="nodeStructureInfo/info[@name='numSiblings']/@value"/>
     <xsl:variable name="children" select="nodeStructureInfo/info[@name='numChildren']/@value"/>
-      <xsl:choose>
+    <!-- parameters for the bookicon to work properly -->
+    <xsl:variable name="p.s" select="/page/pageRequest/paramList/param[@name='p.s']/@value"/>
+    <xsl:variable name="p.sa" select="/page/pageRequest/paramList/param[@name='p.sa']/@value"/>
+    <xsl:variable name="p.a" select="/page/pageRequest/paramList/param[@name='p.a']/@value"/>
+    <xsl:variable name="p.c"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='p.c']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='p.c']/@value"/></xsl:when><xsl:otherwise><xsl:value-of select="$collName"/></xsl:otherwise></xsl:choose></xsl:variable>
+
+    <xsl:choose>
     <xsl:when test="$pos=-1"><!-- a doc -->
       <tr valign="top">
@@ -427 +433 @@
           </center></td>
         <td align="right">
-          <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@selectedNode}.fc"><img src="interfaces/default/images/more.gif" border="0" align="absbottom" /></a>
+          <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@selectedNode}.fc&amp;p.s={$p.s}&amp;p.sa={$p.sa}&amp;p.a={$p.a}&amp;p.c={$p.c}"><img src="interfaces/default/images/more.gif" border="0" align="absbottom" /></a>
         </td>
       </tr>
@@ -436 +442 @@
         <td align="left">
           <xsl:if test=" not ( $pos = 1 )">
-        <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@selectedNode}.ps"><img src="interfaces/default/images/less.gif" border="0" align="absbottom" /></a>
+        <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@selectedNode}.ps&amp;p.s={$p.s}&amp;p.sa={$p.sa}&amp;p.a={$p.a}&amp;p.c={$p.c}"><img src="interfaces/default/images/less.gif" border="0" align="absbottom" /></a>
           </xsl:if>
         </td>
@@ -444 +450 @@
         <td align="right">
           <xsl:if test=" not($pos = $length)">
-        <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@selectedNode}.ns"><img src="interfaces/default/images/more.gif" border="0" align="absbottom" /></a>
+        <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@selectedNode}.ns&amp;p.s={$p.s}&amp;p.sa={$p.sa}&amp;p.a={$p.a}&amp;p.c={$p.c}"><img src="interfaces/default/images/more.gif" border="0" align="absbottom" /></a>
           </xsl:if>
         </td>
@@ -455 +461 @@
         <input type='hidden' name='a' value='d'/>
         <input type='hidden' name='c' value='{$collName}'/>
-        <input type='hidden' name='d' value='{@selectedNode}'/>
+        <!--<input type='hidden' name='d' value='{@selectedNode}'/>-->
+        <input type='hidden' name='d'>
+            <xsl:attribute name='value'>
+                <xsl:if test="contains(@selectedNode, '.')"><xsl:value-of select="@selectedNode"/></xsl:if>
+                <xsl:if test="not(contains(@selectedNode, '.'))"><xsl:value-of select="@selectedNode"/>.0</xsl:if>
+            </xsl:attribute>
+        </input>                
+        
+        <input type='hidden' name='p.s' value='{$p.s}'/>
+        <input type='hidden' name='p.sa' value='{$p.sa}'/>
+        <input type='hidden' name='p.a' value='{$p.a}'/>
+        <input type='hidden' name='p.c' value='{$p.c}'/>    
+        
         <input type="text" name="gp" size="3" maxlength="4"/>
         <input type="submit"><xsl:attribute name='value'><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'document.gotopage')"/></xsl:attribute></input>