Changeset 37334 for main

Timestamp:

2023-02-20T12:31:14+13:00 (14 months ago)

Author:

kjdon

Message:

now we use (un)selected_favourite_icon_url everywhere, instead of building the path each time. This now comes from interface_default.properties, instead of having hte image name hard coded in gslib. This matches other image definitions, and allows easier customization for a new interface. Note, I needed to define the gsf:variables in a couple places. at the start of gslib, can't use gsf:variable here. gsf:variable neded to make the js variable

Location:

main/trunk/greenstone3/web/interfaces/default/transform

Files:

• gslib.xsl (modified) (4 diffs)
• pages/favourites.xsl (modified) (1 diff)

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

@@ -30 +30 @@
   <xsl:param name="documentbasket"/>
   <xsl:param name="cookie_path"/>
-  <xsl:variable name="unselected_favourite_icon">favourite-star-transparent-unselected32.png</xsl:variable>
-  <xsl:variable name="selected_favourite_icon">favourite-star-transparent-selected32.png</xsl:variable>
-
+
+  <xsl:variable name="unselected_favourite_icon_url"><gsf:interfaceText name="favourite_star_image"/></xsl:variable>
+  <xsl:variable name="selected_favourite_icon_url"><gsf:interfaceText name="favourite_star_selected_image"/></xsl:variable>
+  
   <!-- every pages ....................................................................... -->
 
@@ -880 +881 @@
   -->
   <xsl:template name="gotoFavourites">
-   <xsl:if test="$favouriteBasketOn">
-     <!-- 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>     
-      <div id="berrybasket" class="hide">
-      <img src="interfaces/{$interface_name}/images/{$selected_favourite_icon}" title="click to add to favourites" width="16" height="16" border="0" />
+    <xsl:if test="$favouriteBasketOn">
+      <!-- set up these gsf variables so we have access in javascript -->
+      <gsf:variable name="selected_favourite_icon_url"><gsf:interfaceText name="favourite_star_selected_image"/></gsf:variable>
+      <gsf:variable name="unselected_favourite_icon_url"><gsf:interfaceText name="favourite_star_image"/></gsf:variable>
+    <div id="berrybasket" class="hide">  
+      <img src="{$selected_favourite_icon_url}"  width="16" height="16" border="0" />
         <span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.title')"/><xsl:text> </xsl:text></span>
     <span id="favouritesCountDisplay">...</span>
@@ -987 +988 @@
     <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">
+      <img src="{$unselected_favourite_icon_url}" 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="$collname"/>:<xsl:value-of select="@nodeID"/></xsl:attribute>
       </img>
@@ -1003 +1004 @@
     <xsl:if test="$favouriteBasketOn">
       <div id="documentberries">
-        <img id="{/page/pageResponse/collection/@name}:{$rootNode}" src="interfaces/{$interface_name}/images/{$unselected_favourite_icon}" alt="in basket" width="15" height="15" border="0"/>
+        <img id="{/page/pageResponse/collection/@name}:{$rootNode}" src="{$unselected_favourite_icon_url}" alt="in basket" width="15" height="15" border="0"/>
         <span id="{/page/pageResponse/collection/@name}:{$rootNode}:root" class="documentberry">the whole document</span>
         <!--<xsl:if test="$selectedNode != $rootNode">
-          <img id="{/page/pageResponse/collection/@name}:{$selectedNode}" src="interfaces/{$interface_name}/images/{$unselected_favourite_icon}" alt="in basket" width="15" height="15" border="0"/>
+          <img id="{/page/pageResponse/collection/@name}:{$selectedNode}" src="{$unselected_favourite_icon_url}" alt="in basket" width="15" height="15" border="0"/>
           <span id="{/page/pageResponse/collection/@name}:{$selectedNode}:section" class="documentberry">the current section</span>
         </xsl:if>-->

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

@@ -20 +20 @@
     <!-- the page content -->
     <xsl:template match="/page">
-      <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>
-
+          <!-- these two variables defined here, then used by javascript-->
+          <gsf:variable name="selected_favourite_icon_url"><gsf:interfaceText name="favourite_star_selected_image"/></gsf:variable>
+          <gsf:variable name="unselected_favourite_icon_url"><gsf:interfaceText name="favourite_star_image"/></gsf:variable>
       <gslib:langfrag name="favourites"/>
         <xsl:variable name="clusterName"><xsl:value-of select="/page/pageRequest/paramList/param[@name='c']/@value"/></xsl:variable>