Changeset 33261 for main/trunk/greenstone3/web/interfaces/default/transform/pages/classifier.xsl

Timestamp:

2019-07-02T12:01:22+12:00 (5 years ago)

Author:

davidb

Message:

XSL changes to support for either berries or favourites

File:

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

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

@@ -29 +29 @@
     <script type="text/javascript" src="interfaces/{$interface_name}/js/classifier_scripts.js"><xsl:text> </xsl:text></script>
     <script type="text/javascript">$(window).load(openStoredClassifiers);</script>
-    
     <!-- this right sidebar -->
-    <xsl:if test="$berryBasketOn 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 $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)))">
       <div id="rightSidebar">
     <xsl:if test="$berryBasketOn">
       <!-- show the berry basket if it's turned on -->
       <gslib:berryBasket/>
+      <xsl:text> </xsl:text>
+    </xsl:if>
+
+    <xsl:if test="$favouritesBasketOn">
+      <!-- show the favourites 'basket' if it's turned on -->
+      <gslib:gotoFavourites/>
       <xsl:text> </xsl:text>
     </xsl:if>
@@ -261 +266 @@
       <xsl:with-param name="serviceName" select="$serviceName"/>
     </xsl:apply-templates>
-    <!-- The berry (optional) -->
-    <td>
-      <xsl:call-template name="documentBerryForClassifierOrSearchPage"/>
+    <!-- The berry/favourite (optional) -->
+    <td valign="top">
+      <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'berryBaskets']/@value = 'true'">
+    <xsl:call-template name="documentBerryForClassifierOrSearchPage"/>
+      </xsl:if>
+      <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favouritesBaskets']/@value = 'true'">
+    <xsl:call-template name="documentFavouriteForClassifierOrSearchPage"/>
+      </xsl:if>
+
     </td>
     <xsl:call-template name="documentNodePost"/>