Changeset 36073 for main

Timestamp:

2022-02-22T14:08:25+13:00 (2 years ago)

Author:

kjdon

Message:

tidying up for getting rid of berry basket, leaving only favourite basket.

File:

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

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

@@ -12 +12 @@
     <xsl:include href="layouts/main.xsl"/>
 
-    <xsl:variable name="basketType"><xsl:choose><xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'">favourites</xsl:when><xsl:otherwise>berry</xsl:otherwise></xsl:choose></xsl:variable>
-    <xsl:variable name="basketType">favourites</xsl:variable>
     <!-- set page title -->
-    <xsl:template name="pageTitle"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, concat($basketType, '.title'))"/></xsl:template>
+    <xsl:template name="pageTitle"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.title')"/></xsl:template>
 
     <!-- set page breadcrumbs -->
@@ -25 +23 @@
       <gsf:variable name="unselected_favourite_icon_url">interfaces/<xsl:value-of select="$interface_name"/>/images/<xsl:value-of select="$unselected_favourite_icon"/></gsf:variable>
 
-      <gslib:langfrag name="berry"/>
       <gslib:langfrag name="favourites"/>
         <xsl:variable name="clusterName"><xsl:value-of select="/page/pageRequest/paramList/param[@name='c']/@value"/></xsl:variable>
-        <script type="text/javascript" src="interfaces/{$interface_name}/js/berrybasket/berrycheckout.js"><xsl:text> </xsl:text></script>
+        <script type="text/javascript" src="interfaces/{$interface_name}/js/favouritebasket/favouritecheckout.js"><xsl:text> </xsl:text></script>
         <xsl:call-template name="customJavascript"/>
         <xsl:call-template name="customCSS"/>
@@ -36 +33 @@
                 var docList = new Array();
             </xsl:text>
-            <xsl:for-each select="/page/pageResponse/berryList/item">
+            <xsl:for-each select="/page/pageResponse/favouriteList/item">
                 <xsl:text disable-output-escaping="yes">doc = new Array();</xsl:text>
                 <xsl:for-each select="@*">
@@ -53 +50 @@
         <table class="navList" id="berryCheckoutOptions">
             <tr>
-                <td id="fullview" class="current"><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.full_view')"/></span></td>
-                <td id="textview"><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.text_view')"/></span></td>
-                <td id="email"><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.email_view')"/></span></td>
+                <td id="fullview" class="current"><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.full_view')"/></span></td>
+                <td id="textview"><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.text_view')"/></span></td>
+                <td id="email"><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.email_view')"/></span></td>
             </tr>
             <div class="clear"><xsl:text> </xsl:text></div>
@@ -63 +60 @@
         
         <div id="delOptions"> 
-
-          <!-- showing favourites help text takes priority over berryBasket help text -->
-          <xsl:choose>
-            <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'">
-              <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.delete_help')"/> <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.delete_else')"/><xsl:text>  </xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.delete_help')"/> <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.delete_else')"/><xsl:text>  </xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-
+                  <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.delete_help')"/> <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.delete_else')"/><xsl:text>  </xsl:text>
           
           <style> #bbdeleteallbutton:hover { background-color: #773030;}</style>
           <div id="bbdeleteallbutton" class="ui-button ui-widget ui-state-default ui-corner-all" 
                style="color: white; padding: 5px;" onclick="deleteAll()">
-            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.delete_all')"/>
+            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.delete_all')"/>
           </div>
         </div>