Changeset 36113 for main

Timestamp:

2022-03-14T14:58:18+13:00 (2 years ago)

Author:

kjdon

Message:

use servlet_url_prefix for base href if it is defined - comes from servlet init-param

File:

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

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

@@ -37 +37 @@
     <xsl:choose><xsl:when test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='allowMapGPSEditing']) or /page/pageResponse/format[@type='display']/gsf:option[@name='allowMapGPSEditing']/@value='true'">1</xsl:when><xsl:otherwise>0</xsl:otherwise></xsl:choose>
   </xsl:variable>
-  
+
   <!-- is a user logged in, and do they have editing rights for this collection? -->
   <xsl:variable name="userHasEditPermission">
@@ -50 +50 @@
       <xsl:attribute name="href">
     <xsl:choose>
+          <xsl:when test="$servlet_url_prefix">
+            <xsl:value-of select="$servlet_url_prefix"/>
+          </xsl:when>
+          <!-- don't need this one anymore, keep for backwards compat-->
       <xsl:when test="/page/pageResponse/metadataList/metadata[@name = 'siteURL']">
         <xsl:value-of select="/page/pageResponse/metadataList/metadata[@name = 'siteURL']"/>