Changeset 31749 for main

Timestamp:

2017-06-26T13:19:37+12:00 (7 years ago)

Author:

kjdon

Message:

add new documentedit_scripts and documentedit_scripts_util.js files, comment out documentmaker_scripts as not using that at the moment

File:

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

main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

@@ -251 +251 @@
         </xsl:template>
     <xsl:template name="javascriptForDocumentEditing">
-            <script type="text/javascript" src="interfaces/{$interface_name}/js/documentmaker_scripts.js"><xsl:text> </xsl:text></script>
-            <script type="text/javascript" src="interfaces/{$interface_name}/js/documentmaker_scripts_util.js"><xsl:text> </xsl:text></script>
+    <!--        <script type="text/javascript" src="interfaces/{$interface_name}/js/documentmaker_scripts.js"><xsl:text> </xsl:text></script>-->
+            <script type="text/javascript" src="interfaces/{$interface_name}/js/documentedit_scripts.js"><xsl:text> </xsl:text></script>
+            <script type="text/javascript" src="interfaces/{$interface_name}/js/documentedit_scripts_util.js"><xsl:text> </xsl:text></script>
             <script type="text/javascript" src="interfaces/{$interface_name}/js/hierarchy.js"><xsl:text> </xsl:text></script>
             <script type="text/javascript">
@@ -308 +309 @@
         
             <div id="float-anchor" style="width: 30%; min-width:180px; float:right; margin: 0 0 10px 20px;">        
-            <xsl:if test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true' 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="$canDoEditing = 'true'">
                 <xsl:call-template name="editBar"/>
             </xsl:if>