Changeset 33510

Timestamp:

2019-09-24T14:13:22+12:00 (5 years ago)

Author:

kjdon

Message:

isEditingTurnedOn renamed to isEditingAllowed, and added isMapGPSEditingAllowed

File:

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

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

@@ -24 +24 @@
   </xsl:variable>
 
-  <!-- does this collection have editing turned on - turned on by default, can turn off in config file-->
-  <xsl:variable name="isEditingTurnedOn">
+  <!-- does this collection have editing allowed? it's turned on by default, can turn off in config file-->
+  <xsl:variable name="isEditingAllowed">
     <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='allowDocumentEditing']) or /page/pageResponse/format[@type='display']/gsf:option[@name='allowDocumentEditing']/@value='true'">1</xsl:if>
   </xsl:variable>
@@ -32 +32 @@
     <xsl:choose><xsl:when test="/page/pageResponse/collection/@no_archives">0</xsl:when><xsl:otherwise>1</xsl:otherwise></xsl:choose>
   </xsl:variable>
+  <xsl:variable name="isMapGPSEditingAllowed">
+    <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">
@@ -422 +426 @@
     menu.append(settingsLink);
     
-    </xsl:text><xsl:if test="/page/pageRequest/@action = 'd' and $isEditingTurnedOn = '1'"><xsl:text disable-output-escaping="yes">
+    </xsl:text><xsl:if test="/page/pageRequest/@action = 'd' and $isEditingAllowed = '1'"><xsl:text disable-output-escaping="yes">
     var editingLink = $("&lt;a&gt;")
     .attr("href", "javascript:;");