Changeset 26470

Show
Ignore:
Timestamp:
19.11.2012 17:17:27 (7 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/default/transform/pages/pref.xsl

    r26367 r26470  
    236236        <xsl:variable name="tidyoption"><xsl:value-of select="/page/pageResponse/collection/metadataList/metadata[@name='tidyoption']"/></xsl:variable> 
    237237                <xsl:if test="$tidyoption='tidy'"> 
    238                     <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> 
     238                    <xsl:variable name="book"> 
     239                      <xsl:choose> 
     240                        <xsl:when test="/page/pageRequest/paramList/param[@name='book']"> 
     241                          <xsl:value-of select="/page/pageRequest/paramList/param[@name='book']/@value"/> 
     242                        </xsl:when> 
     243                        <xsl:when test="/page/pageRequest/paramList/param[@name='s1.book']"> 
     244                          <xsl:value-of select="/page/pageRequest/paramList/param[@name='s1.book']/@value"/> 
     245                        </xsl:when> 
     246                        <xsl:otherwise>off</xsl:otherwise> 
     247                      </xsl:choose> 
     248                    </xsl:variable> 
    239249                    <div class="paramLabel"> 
    240250                        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.book')"/> 
    241251                    </div> 
    242252                    <div class="paramValue"> 
    243                         <select name="book"> 
     253                        <select name="s1.book"> 
    244254                            <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>  
    245255                            <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>