Changeset 33271 for main

Show
Ignore:
Timestamp:
02.07.2019 13:12:44 (8 weeks ago)
Author:
davidb
Message:

Weaving in of Favourites; small width adjustment for classifer CL4 display within iframe

Location:
main/trunk/model-interfaces-dev/heritage-nz/transform/pages
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/model-interfaces-dev/heritage-nz/transform/pages/classifier.xsl

    r33200 r33271  
    3131    <xsl:variable name="floatLeftWidth"> 
    3232      <xsl:choose> 
    33     <xsl:when test="$clName = 'CL4'">58</xsl:when> 
     33    <xsl:when test="$clName = 'CL4'">45</xsl:when> <!-- **** can go as low as 40 --> 
    3434    <xsl:otherwise>77</xsl:otherwise> <!-- used to be 67 --> 
    3535      </xsl:choose> 
     
    4141      <!-- this right sidebar --> 
    4242      <div id="rightSidebar"> 
     43    <!-- ******** !!!!!! --> 
    4344    <xsl:comment>Filler needed for div</xsl:comment> 
    4445    <xsl:call-template name="viewOptions"/> 
    45     <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)))"> 
     46    <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)))"> 
    4647      <xsl:if test="$berryBasketOn"> 
    4748        <!-- show the berry basket if it's turned on --> 
    4849        <div class="tableOfContentsContainer" style="position:relative; z-index: 2;"> <!-- **** --> 
    4950          <gslib:berryBasket/> 
     51          <xsl:text> </xsl:text> 
     52        </div> 
     53      </xsl:if> 
     54 
     55      <xsl:if test="$favouritesBasketOn"> 
     56        <!-- show the favourites 'basket' if it's turned on --> 
     57        <div class="tableOfContentsContainer" style="position:relative; z-index: 2;"> <!-- **** --> 
     58          <gslib:gotoFavourites/> 
    5059          <xsl:text> </xsl:text> 
    5160        </div> 
  • main/trunk/model-interfaces-dev/heritage-nz/transform/pages/query.xsl

    r33200 r33271  
    2626      <xsl:call-template name="viewOptions"/> 
    2727 
    28       <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)))"> 
     28      <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)))"> 
    2929    <div id="rightSidebar" style="margin: 0 0 5px 5px; width: 100%"> 
    3030<!-- 
     
    4545        </div> 
    4646      </xsl:if> 
     47 
     48      <xsl:if test="$favouritesBasketOn"> 
     49        <!-- show the favourites 'basket' if it's turned on --> 
     50        <div class="tableOfContentsContainer" style="position:relative; z-index: 2;"> <!-- **** --> 
     51          <gslib:gotoFavourites/> 
     52          <xsl:text> </xsl:text> 
     53        </div> 
     54      </xsl:if> 
     55 
    4756      <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))"> 
    4857        <gslib:documentBasket/>