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

Timestamp:

2019-06-22T11:07:07+12:00 (5 years ago)

Author:

davidb

Message:

Introduction of fix-to-the-side option for berry-basket, similar to TOC feature in documents

File:

• main/trunk/model-interfaces-dev/heritage-nz/transform/pages/classifier.xsl (modified) (5 diffs)

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

@@ -42 +42 @@
       <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">
-        <xsl:call-template name="viewOptions"/>
         <!-- show the berry basket if it's turned on -->
         <div class="tableOfContentsContainer" style="position:relative; z-index: 2;"> <!-- **** -->
@@ -53 +53 @@
       
       <xsl:if test="$documentBasketOn">
-      <gslib:documentBasket/>
-      <xsl:text> </xsl:text>
+        <gslib:documentBasket/>
+        <xsl:text> </xsl:text>
       </xsl:if>
     </xsl:if>
@@ -129 +129 @@
 
           <!-- Floating TOC on/off button -->
+      <xsl:if test="$berryBasketOn">
         <li id="floatingTOCOptions">
 <!--
@@ -135 +136 @@
           <xsl:attribute name="title">Fix the berry basket to the right side of the screen</xsl:attribute>
           <img id="floatTOCToggleImage">
-        <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'float_toc_image')"/></xsl:attribute>
+        <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'float_berrybasket_image')"/></xsl:attribute>
           </img>
 
@@ -166 +167 @@
           </script>
         </xsl:if>
+      </xsl:if>
       </ul>
       <div style="clear:both;"><xsl:text> </xsl:text></div>