Changeset 33271 for main/trunk

Timestamp:

2019-07-02T13:12:44+12:00 (5 years 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:

• classifier.xsl (modified) (2 diffs)
• query.xsl (modified) (2 diffs)

main/trunk/model-interfaces-dev/heritage-nz/transform/pages/classifier.xsl

@@ -31 +31 @@
     <xsl:variable name="floatLeftWidth">
       <xsl:choose>
-    <xsl:when test="$clName = 'CL4'">58</xsl:when>
+    <xsl:when test="$clName = 'CL4'">45</xsl:when> <!-- **** can go as low as 40 -->
     <xsl:otherwise>77</xsl:otherwise> <!-- used to be 67 -->
       </xsl:choose>
@@ -41 +41 @@
       <!-- this right sidebar -->
       <div id="rightSidebar">
+    <!-- ******** !!!!!! -->
     <xsl:comment>Filler needed for div</xsl:comment>
     <xsl:call-template name="viewOptions"/>
-    <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)))">
+    <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)))">
       <xsl:if test="$berryBasketOn">
         <!-- show the berry basket if it's turned on -->
         <div class="tableOfContentsContainer" style="position:relative; z-index: 2;"> <!-- **** -->
           <gslib:berryBasket/>
+          <xsl:text> </xsl:text>
+        </div>
+      </xsl:if>
+
+      <xsl:if test="$favouritesBasketOn">
+        <!-- show the favourites 'basket' if it's turned on -->
+        <div class="tableOfContentsContainer" style="position:relative; z-index: 2;"> <!-- **** -->
+          <gslib:gotoFavourites/>
           <xsl:text> </xsl:text>
         </div>

main/trunk/model-interfaces-dev/heritage-nz/transform/pages/query.xsl

@@ -26 +26 @@
       <xsl:call-template name="viewOptions"/>
 
-      <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)))">
+      <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)))">
     <div id="rightSidebar" style="margin: 0 0 5px 5px; width: 100%">
 <!--
@@ -45 +45 @@
         </div>
       </xsl:if>
+
+      <xsl:if test="$favouritesBasketOn">
+        <!-- show the favourites 'basket' if it's turned on -->
+        <div class="tableOfContentsContainer" style="position:relative; z-index: 2;"> <!-- **** -->
+          <gslib:gotoFavourites/>
+          <xsl:text> </xsl:text>
+        </div>
+      </xsl:if>
+
       <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))">
         <gslib:documentBasket/>