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

Timestamp:

2019-07-02T14:43:46+12:00 (5 years ago)

Author:

kjdon

Message:

standardising the basket names. berryBasket, favouriteBasket, documentBasket. variables etc will all follow this pattern. cgi params berrybasket, favouritebasket. etc

File:

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

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

@@ -50 +50 @@
      <!-- <xsl:call-template name="encoding-param"/>-->
       <xsl:call-template name="format-edit-param"/>
-      <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'berryBaskets']/@value = 'true'">
+      <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'berryBasket']/@value = 'true'">
     <xsl:call-template name="berry-basket-param"/>
       </xsl:if>
-      <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favouritesBaskets']/@value = 'true'">
-    <xsl:call-template name="favourites-basket-param"/>
+      <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'">
+    <xsl:call-template name="favourite-basket-param"/>
       </xsl:if>
     <!--<xsl:call-template name="document-maker-param"/> not working at moment-->
@@ -173 +173 @@
 
 
-<xsl:template name="favourites-basket-param">
-                <div id="favouritesbasketprefs">
-                    <xsl:variable name="favouritesbasket"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='favouritesbasket']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='favouritesbasket']/@value"/></xsl:when><xsl:otherwise>off</xsl:otherwise></xsl:choose></xsl:variable>
+<xsl:template name="favourite-basket-param">
+                <div id="favouritebasketprefs">
+                    <xsl:variable name="favouritebasket"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='favouritebasket']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='favouritebasket']/@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.favouritesbasket')"/>
-                    </div>
-                    <div class="paramValue">
-                        <select name="favouritesbasket">
-                            <option value="on"><xsl:if test="$favouritesbasket='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.on')"/></option> 
-                            <option value="off"><xsl:if test="$favouritesbasket='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.off')"/></option>
+                        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.favouritebasket')"/>
+                    </div>
+                    <div class="paramValue">
+                        <select name="favouritebasket">
+                            <option value="on"><xsl:if test="$favouritebasket='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.on')"/></option> 
+                            <option value="off"><xsl:if test="$favouritebasket='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.off')"/></option>
                         </select>
                     </div>