Changeset 26470

Timestamp:

2012-11-19T17:17:27+13:00 (11 years ago)

Author:

ak19

Message:

Fixed how turning the realistic book on in Prefs wasn't being remembered, and would get reset. The select name was book, same as a variable. Have now added references to s1.book as was done for maxdocs and hitsPerPage.

File:

• main/trunk/greenstone3/web/interfaces/default/transform/pages/pref.xsl (modified) (1 diff)

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

@@ -236 +236 @@
         <xsl:variable name="tidyoption"><xsl:value-of select="/page/pageResponse/collection/metadataList/metadata[@name='tidyoption']"/></xsl:variable>
                 <xsl:if test="$tidyoption='tidy'">
-                    <xsl:variable name="book"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='book']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='book']/@value"/></xsl:when><xsl:otherwise>off</xsl:otherwise></xsl:choose></xsl:variable>
+                    <xsl:variable name="book">
+                      <xsl:choose>
+                        <xsl:when test="/page/pageRequest/paramList/param[@name='book']">
+                          <xsl:value-of select="/page/pageRequest/paramList/param[@name='book']/@value"/>
+                        </xsl:when>
+                        <xsl:when test="/page/pageRequest/paramList/param[@name='s1.book']">
+                          <xsl:value-of select="/page/pageRequest/paramList/param[@name='s1.book']/@value"/>
+                        </xsl:when>
+                        <xsl:otherwise>off</xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:variable>
                     <div class="paramLabel">
                         <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.book')"/>
                     </div>
                     <div class="paramValue">
-                        <select name="book">
+                        <select name="s1.book">
                             <option value="on"><xsl:if test="$book='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.berrybasket.on')"/></option> 
                             <option value="off"><xsl:if test="$book='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.berrybasket.off')"/></option>