Changeset 33285 for main/trunk/greenstone3/web/interfaces/default/transform/pages/query.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/query.xsl (modified) (3 diffs)

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

@@ -59 +59 @@
 
     <xsl:template name="displayBaskets">
-      <xsl:if test="$berryBasketOn or $favouritesBasketOn or ($documentBasketOn and (util:contains(/page/pageRequest/userInformation/@groups, 'administrator') or util:contains(/page/pageRequest/userInformation/@groups, 'all-collections-editor') or util:contains(/page/pageRequest/userInformation/@groups, $thisCollectionEditor)))">
+      <xsl:if test="$berryBasketOn or $favouriteBasketOn or ($documentBasketOn and (util:contains(/page/pageRequest/userInformation/@groups, 'administrator') or util:contains(/page/pageRequest/userInformation/@groups, 'all-collections-editor') or util:contains(/page/pageRequest/userInformation/@groups, $thisCollectionEditor)))">
         <div id="rightSidebar">
           <xsl:if test="$berryBasketOn">
@@ -67 +67 @@
           </xsl:if>
 
-          <xsl:if test="$favouritesBasketOn">
+          <xsl:if test="$favouriteBasketOn">
         <!-- show the favourites 'basket' if it's turned on -->
         <gslib:gotoFavourites/>
@@ -95 +95 @@
                         <!-- The berry/favourite (optional) -->
                         <td valign="top">
-                          <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="documentBerryForClassifierOrSearchPage"/>
                           </xsl:if>
-                          <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favouritesBaskets']/@value = 'true'">
+                          <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'">
                             <xsl:call-template name="documentFavouriteForClassifierOrSearchPage"/>
                           </xsl:if>