Changeset 33382

Timestamp:

2019-08-05T12:14:28+12:00 (4 years ago)

Author:

kjdon

Message:

don't add collection/collname to pref and help link if collname is empty

File:

• main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -352 +352 @@
   
   <xsl:template name="PrefsLink">
-    <a href="{$library_name}/collection/{$collNameChecked}/page/pref">
+    <a><xsl:attribute name="href"><xsl:value-of select="$library_name"/>/<xsl:if test="not($collNameChecked = '')">collection/<xsl:value-of select="$collNameChecked"/>/</xsl:if>page/pref</xsl:attribute>
       <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_tip')"/></xsl:attribute>
       <span id="preferencesButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_b')"/></span>
@@ -359 +359 @@
   
   <xsl:template name="HelpLink">
-    <a href="{$library_name}/collection/{$collNameChecked}/page/help">
+    <a><xsl:attribute name="href"><xsl:value-of select="$library_name"/>/<xsl:if test="not($collNameChecked = '')">collection/<xsl:value-of select="$collNameChecked"/>/</xsl:if>page/help</xsl:attribute>
       <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_tip')"/></xsl:attribute>
       <span id="helpButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/></span>