Changeset 36072


Ignore:
Timestamp:
2022-02-22T14:06:56+13:00 (2 years ago)
Author:
kjdon
Message:

tidying up for getting rid of berry basket, leaving only favourite basket. favouritebasket and documentbasket are now servlet params.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r35322 r36072  
    2525  <xsl:param name="google_tracking_id"/>
    2626  <xsl:param name="googlesignin_client_id"/>
    27 
    28   <xsl:variable name="berry_icon">berry.png</xsl:variable>
     27  <xsl:param name="favouritebasket"/>
     28  <xsl:param name="documentbasket"/>
     29
    2930  <xsl:variable name="unselected_favourite_icon">favourite-star-transparent-unselected32.png</xsl:variable>
    3031  <xsl:variable name="selected_favourite_icon">favourite-star-transparent-selected32.png</xsl:variable>
    … …  
    5354  <xsl:variable name="collections" select="/page/pageResponse/collectionList/collection"/>
    5455 
    55   <xsl:variable name="berrybasketswitch">
    56     <xsl:value-of select="/page/pageRequest/paramList/param[@name='berrybasket']/@value"/>
    57   </xsl:variable>
    58   <xsl:variable name="favouritebasketswitch">
    59     <xsl:value-of select="/page/pageRequest/paramList/param[@name='favouritebasket']/@value"/>
    60   </xsl:variable>
    61  
    62   <xsl:variable name="berryBasketOn" select="/page/pageRequest/paramList/param[@name='berrybasket' and @value='on']"/>
    63   <xsl:variable name="favouriteBasketOn" select="/page/pageRequest/paramList/param[@name='favouritebasket' and @value='on']"/>
    64   <xsl:variable name="documentBasketOn" select="/page/pageRequest/paramList/param[@name='documentbasket' and @value='on']"/>
     56  <xsl:variable name="favouriteBasketOn" select="$favouritebasket = 'true' and /page/pageRequest/paramList/param[@name='favouritebasket' and @value='on']"/>
     57  <xsl:variable name="documentBasketOn" select="$documentbasket = 'true' and /page/pageRequest/paramList/param[@name='documentbasket' and @value='on']"/>
    6558 
    6659    <xsl:variable name="thisCollectionEditor">
    … …  
    811804 
    812805  <!--
    813 BERRY BASKET TEMPLATES
    814 These get used on many different pages to add the
    815 berry basket function to the site
     806BASKET TEMPLATES
     807These get used on many different pages to add the favourites basket or
     808document basket to the site
    816809  -->
    817810 
    818811  <xsl:template name="displayBaskets">
    819       <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)))">
    820 
    821           <xsl:if test="$berryBasketOn">
    822         <!-- show the berry basket if it's turned on -->
    823         <gslib:berryBasket/>
    824         <xsl:text> </xsl:text>
    825           </xsl:if>
    826812
    827813          <xsl:if test="$favouriteBasketOn">
    … …  
    829815        <gslib:gotoFavourites/>
    830816        <xsl:text> </xsl:text>
    831           </xsl:if>
    832 
     817          </xsl:if>
     818
     819              <!-- is the document basket facility turned on, and does the user have premission to use it? -->
    833820          <xsl:if test="$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))">
    834         <!-- show the document basket if its turned on and the user has permission-->
     821       
    835822        <gslib:documentBasket/>
    836823        <xsl:text> </xsl:text>
    837824          </xsl:if>
    838       </xsl:if>
    839   </xsl:template>
    840 
    841   <!-- put the drag&drop berry basket on the page -->
    842   <xsl:template name="berryBasket">
    843     <xsl:if test="$berryBasketOn">
    844       <div id="berrybasket" class="hide">
    845         <span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.title')"/><xsl:text> </xsl:text></span>
    846         <span id="berryBasketExpandCollapseLinks" style="display: none;">
    847           <a id="berryBasketExpandLink" href="javascript:showBasket()"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'basket.expand')"/></a>
    848           <a id="berryBasketCollapseLink" style="display: none;" href="javascript:hideBasket()"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'basket.collapse')"/></a>
    849         </span>
    850         <div id="baskethandle">
    851           <span>
    852             <xsl:text> </xsl:text>
    853           </span>
    854         </div>
    855         <div id="berries">
    856           <span>
    857             <xsl:text> </xsl:text>
    858           </span>
    859     </div>
    860     <div><a id="berryFullViewLink" style="display: none;"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.full')"/></a></div>
    861     <div id="berryHelpMsg"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.help')"/></div>
    862       </div>
    863      
    864     </xsl:if>
    865   </xsl:template>
     825      <!--</xsl:if>-->
     826  </xsl:template>
     827
    866828 
    867829  <!--
    … …  
    871833  -->
    872834  <xsl:template name="gotoFavourites">
    873     <!-- set up these gsf variables so we have access in javascript -->
     835   <xsl:if test="$favouriteBasketOn">
     836     <!-- set up these gsf variables so we have access in javascript -->
    874837    <gsf:variable name="selected_favourite_icon_url">interfaces/<xsl:value-of select="$interface_name"/>/images/<xsl:value-of select="$selected_favourite_icon"/></gsf:variable>
    875     <gsf:variable name="unselected_favourite_icon_url">interfaces/<xsl:value-of select="$interface_name"/>/images/<xsl:value-of select="$unselected_favourite_icon"/></gsf:variable>
    876     <xsl:if test="$favouriteBasketOn">
     838    <gsf:variable name="unselected_favourite_icon_url">interfaces/<xsl:value-of select="$interface_name"/>/images/<xsl:value-of select="$unselected_favourite_icon"/></gsf:variable>     
    877839      <div id="berrybasket" class="hide">
    878840      <img src="interfaces/{$interface_name}/images/{$selected_favourite_icon}" title="click to add to favourites" width="16" height="16" border="0" />
    … …  
    880842    <span id="favouritesCountDisplay">...</span>
    881843
    882     <div><a id="favouritesFullViewLink" style="display: block;"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'berry.full')"/></a></div>
     844    <div><a id="favouritesFullViewLink" style="display: block;"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.full')"/></a></div>
    883845      </div>
    884846      <gsf:script>
    … …  
    899861    }
    900862   
    901     fullView.setAttribute("href",gs.xsltParams.library_name + "?a=g&amp;sa=berry&amp;c=&amp;s=DisplayList&amp;rt=r&amp;p.c=" + collectionName);
     863    fullView.setAttribute("href",gs.xsltParams.library_name + "?a=g&amp;sa=fav&amp;c=&amp;s=DisplayList&amp;rt=r&amp;p.c=" + collectionName);
    902864        fullView.style.display='block';
    903865
    … …  
    912874    <xsl:template name="documentBasket">
    913875        <xsl:if test="$documentBasketOn and /page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true' 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))">
    914             <div id="documentbasket" class="hide">
     876            <div id="documentbasket" class="show">
    915877                <span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'db.doc_basket')"/><xsl:text> </xsl:text></span>
    916878                <span id="documentBasketExpandCollapseLinks" style="display: none;">
    … …  
    934896        </xsl:if>
    935897    </xsl:template>
    936  
    937   <!-- include the required javascript and css for berry baskets -->
    938   <xsl:template name="basketHeadTags">
     898
     899        <!-- include the required js and css for favourites-->
     900        <xsl:template name="favouritesHeadTags">
     901          <script type="text/javascript" src="interfaces/{$interface_name}/js/yui/yahoo-min.js"><xsl:text> </xsl:text></script>
     902          <script type="text/javascript" src="interfaces/{$interface_name}/js/yui/event-min.js"><xsl:text> </xsl:text></script>
     903          <script type="text/javascript" src="interfaces/{$interface_name}/js/yui/connection-min.js"><xsl:text> </xsl:text></script>
     904          <script type="text/javascript" src="interfaces/{$interface_name}/js/yui/dom-min.js"><xsl:text> </xsl:text></script>
     905          <script type="text/javascript" src="interfaces/{$interface_name}/js/favouritebasket/favouritebasket.js"><xsl:text> </xsl:text></script>
     906    <link rel="stylesheet" href="interfaces/{$interface_name}/style/favourites.css" type="text/css"/>
     907        </xsl:template>
     908       
     909  <!-- include the required javascript and css for document baskets
     910       Note, this may have unneeded things in it -->
     911  <xsl:template name="documentBasketHeadTags">
    939912    <script type="text/javascript" src="interfaces/{$interface_name}/js/yui/yahoo-min.js"><xsl:text> </xsl:text></script>
    940913    <script type="text/javascript" src="interfaces/{$interface_name}/js/yui/event-min.js"><xsl:text> </xsl:text></script>
    … …  
    944917    <script type="text/javascript" src="interfaces/{$interface_name}/js/yui/cookie-min.js"><xsl:text> </xsl:text></script>
    945918    <script type="text/javascript" src="interfaces/{$interface_name}/js/yui/animation-min.js"><xsl:text> </xsl:text></script>
    946     <script type="text/javascript" src="interfaces/{$interface_name}/js/berrybasket/berryvariables.js"><xsl:text> </xsl:text></script>
    947919    <script type="text/javascript" src="interfaces/{$interface_name}/js/berrybasket/ygDDPlayer.js"><xsl:text> </xsl:text></script>
    948920    <script type="text/javascript" src="interfaces/{$interface_name}/js/berrybasket/ygDDOnTop.js"><xsl:text> </xsl:text></script>
    … …  
    967939  </xsl:template>
    968940 
    969   <!--
    970 create a little berry which can be drag&dropped onto the berry basket
    971 used on classifier and search result pages
    972 -->
    973   <xsl:template name="documentBerryForClassifierOrSearchPage">
    974     <xsl:if test="$berryBasketOn">
    975       <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>
    976       <img class="pick" src="interfaces/{$interface_name}/images/{$berry_icon}" alt="in basket" width="15" height="15" border="0">
    977         <xsl:attribute name="id"><xsl:value-of select="$collname"/>:<xsl:value-of select="@nodeID"/></xsl:attribute>
    978       </img>
    979     </xsl:if>
    980   </xsl:template>
    981 
    982  
    983941  <xsl:template name="documentFavouriteForClassifierOrSearchPage">
    984942    <xsl:if test="$favouriteBasketOn">
    … …  
    990948  </xsl:template>
    991949 
    992   <!--
    993 create little berrys which can be drag&dropped onto the berry basket
    994 used on the document page
    995 -->
    996   <xsl:template name="documentBerryForDocumentPage">
    997     <xsl:variable name="selectedNode">
    998       <xsl:value-of select="/page/pageResponse/document/@selectedNode"/>
    999     </xsl:variable>
    1000     <xsl:variable name="rootNode">
    1001       <xsl:value-of select="/page/pageResponse/document/documentNode[@nodeType='root']/@nodeID"/>
    1002     </xsl:variable>
    1003     <xsl:if test="$berryBasketOn">
    1004       <div id="documentberries">
    1005         <img class="pick" id="{/page/pageResponse/collection/@name}:{$rootNode}" src="interfaces/{$interface_name}/images/{$berry_icon}" alt="in basket" width="15" height="15" border="0"/>
    1006         <span id="{/page/pageResponse/collection/@name}:{$rootNode}:root" class="documentberry">the whole document</span>
    1007         <!--<xsl:if test="$selectedNode != $rootNode">
    1008           <img class="pick" id="{/page/pageResponse/collection/@name}:{$selectedNode}" src="interfaces/{$interface_name}/images/{$berry_icon}" alt="in basket" width="15" height="15" border="0"/>
    1009           <span id="{/page/pageResponse/collection/@name}:{$selectedNode}:section" class="documentberry">the current section</span>
    1010         </xsl:if>-->
    1011       </div>
    1012     </xsl:if>
    1013   </xsl:template>
    1014 
     950 
    1015951  <xsl:template name="documentFavouriteForDocumentPage">
    1016952    <xsl:variable name="selectedNode">
Note: See TracChangeset for help on using the changeset viewer.