Changeset 33493 for main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl

Timestamp:

2019-09-19T14:24:13+12:00 (5 years ago)

Author:

kjdon

Message:

if we are on a cross collection search page, the collection for each documentNode comes from collection attribute - not from a collection element in page response. also moved to gsf:variables to different template, so they can be declared once, not for each docNode

File:

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

main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl

@@ -763 +763 @@
   -->
   <xsl:template name="gotoFavourites">
+    <!-- set up these gsf variables so we have access in javascript -->
+    <gsf:variable name="selected_favourite_icon_url">interfaces/<xsl:value-of select="$interface_name"/>/images/<xsl:value-of select="$selected_favourite_icon"/></gsf:variable>
+    <gsf:variable name="unselected_favourite_icon_url">interfaces/<xsl:value-of select="$interface_name"/>/images/<xsl:value-of select="$unselected_favourite_icon"/></gsf:variable>
     <xsl:if test="$favouriteBasketOn">
       <div id="berrybasket" class="hide">
@@ -862 +865 @@
   <xsl:template name="documentBerryForClassifierOrSearchPage">
     <xsl:if test="$berryBasketOn">
+      <xsl:variable name="collname"><xsl:choose><xsl:when test="@collection"><xsl:value-of select="@collection"/></xsl:when><xsl:otherwise><xsl:value-of select="/page/pageResponse/collection/@name"/></xsl:otherwise></xsl:choose></xsl:variable>
       <img class="pick" src="interfaces/{$interface_name}/images/{$berry_icon}" alt="in basket" width="15" height="15" border="0">
-        <xsl:attribute name="id"><xsl:value-of select="/page/pageResponse/collection/@name"/>:<xsl:value-of select="@nodeID"/></xsl:attribute>
+        <xsl:attribute name="id"><xsl:value-of select="$collname"/>:<xsl:value-of select="@nodeID"/></xsl:attribute>
       </img>
     </xsl:if>
   </xsl:template>
 
+ 
   <xsl:template name="documentFavouriteForClassifierOrSearchPage">
-
-    <gsf:variable name="selected_favourite_icon_url">interfaces/<xsl:value-of select="$interface_name"/>/images/<xsl:value-of select="$selected_favourite_icon"/></gsf:variable>
-    <gsf:variable name="unselected_favourite_icon_url">interfaces/<xsl:value-of select="$interface_name"/>/images/<xsl:value-of select="$unselected_favourite_icon"/></gsf:variable>
-
     <xsl:if test="$favouriteBasketOn">
+     <xsl:variable name="collname"><xsl:choose><xsl:when test="@collection"><xsl:value-of select="@collection"/></xsl:when><xsl:otherwise><xsl:value-of select="/page/pageResponse/collection/@name"/></xsl:otherwise></xsl:choose></xsl:variable>
       <img src="interfaces/{$interface_name}/images/{$unselected_favourite_icon}" title="click to add to favourites" width="20" height="20" border="0" onclick="toggleFavourite(this)" data-is-favourite="false">
-        <xsl:attribute name="id"><xsl:value-of select="/page/pageResponse/collection/@name"/>:<xsl:value-of select="@nodeID"/></xsl:attribute>
+        <xsl:attribute name="id"><xsl:value-of select="$collname"/>:<xsl:value-of select="@nodeID"/></xsl:attribute>
       </img>
     </xsl:if>