Changeset 24007 for main/branches/64_bit_Greenstone/greenstone3/web/interfaces/oran/transform/pages/classifier.xsl

Timestamp:

2011-05-09T14:37:04+12:00 (13 years ago)

Author:

sjm84

Message:

Updating this branch to match the latest Greenstone3 changes

Location:

main/branches/64_bit_Greenstone/greenstone3

Files:

• . (modified) (1 prop)
• web/interfaces/oran/transform/pages/classifier.xsl (modified) (3 diffs)

main/branches/64_bit_Greenstone/greenstone3/web/interfaces/oran/transform/pages/classifier.xsl

@@ -21 +21 @@
 
         <!-- show the classifiers if more than one (title, subject, etc.) -->
-        <xsl:if test="service/classifierList/classifier[2]">
+        <!--<xsl:if test="service/classifierList/classifier[2]">
             <div id="classifierList" class="navList">
                 <ul>
@@ -30 +30 @@
                 <div class="clear"><xsl:text> </xsl:text></div>
             </div>
-        </xsl:if>
+        </xsl:if>-->
 
         <!-- this right sidebar -->
-        <div id="rightSidebar">
-            <!-- show the berry basket if it's turned on -->
-            <gslib:berryBasket/>
-            <xsl:text> </xsl:text>
-        </div>
+        <xsl:if test="$berryBasketOn">
+            <div id="rightSidebar">
+                <!-- show the berry basket if it's turned on -->
+                <gslib:berryBasket/>
+                <xsl:text> </xsl:text>
+            </div>
+        </xsl:if>
     
         <!--
@@ -61 +63 @@
 
             <a>
-                <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/>&amp;d=<xsl:value-of select="@nodeID"/>&amp;dt=<xsl:value-of select="@docType"/>&amp;p.a=b&amp;p.s=<xsl:value-of select="/page/pageResponse/service/@name"/></xsl:attribute>
+                <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/>&amp;d=<xsl:value-of select="@nodeID"/>&amp;dt=<xsl:value-of select="@docType"/>&amp;p.a=b&amp;p.s=<xsl:value-of select="/page/pageResponse/service/@name"/>&amp;ed=1</xsl:attribute>
                 <xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/>
             </a>