Changeset 31537 for main/trunk/greenstone3/web/interfaces/default/transform

Timestamp:

2017-03-24T21:37:12+13:00 (7 years ago)

Author:

ak19

Message:

First commit for getting user comments working for GS3. It all works, but there's debugging statements still and haven't cleaned up commented out code. After that, would like to make POST rather than GET AJAX calls, so more refactoring required. 1. config_format.xsl is just minor spelling corrections. 2. header.xsl has a new function generateLogoutURL. 3. document.xsl imports and calls new usercomments.xsl to set up the user comments area. 4. New usercomments.js is imported by new usercomments.xsl, and sets up the interaction of the usercomments area. 5. javascript-global-functions.js now contains setMetadataArray and getMetadataArray functions to parallel what GS2 used in gsajaxapi.js, but for GS3 need to go through GS2Construct.processModifyMetadata() service in java code. 5. GS2Construct.java does different checking for users adding user comments versus users doing document editing. For the latter, the user needs to have editing permissions for the document. But any user is allowed to add comments on any accessible document. But ModifyMetadata should not allow any other metadata to be modified other than meta fields. 6. New language strings for usercomment area and GS2Construct errors in the 2 changed properties files.

Location:

main/trunk/greenstone3/web/interfaces/default/transform

Files:

• config_format.xsl (modified) (2 diffs)
• layouts/header.xsl (modified) (2 diffs)
• layouts/usercomments.xsl (added)
• pages/document.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

@@ -110 +110 @@
          when the XSLT processes it (which would then result in it
          being changed into a self-closing element, which then is
-         incorrectly rendered as HTML).  Doing thing with the
+         incorrectly rendered as HTML).  Doing this with the
          value-of is better then injecting an xsl:comment in
          (another approach we have used in the past) as the
@@ -116 +116 @@
          HTML.  This can lead to further complications if
          Javascript using the 'empty' div truely expects it to
-         have no connent of any form. 
+         have no content of any form. 
     -->
 

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

@@ -409 +409 @@
     
   </xsl:template>
+
   <xsl:template name="generateLoginURL">
     <xsl:value-of select="$library_name"/>
@@ -431 +432 @@
     </xsl:for-each>
     
+  </xsl:template>
+
+  <!-- Writing the reverse of generateLoginURL since the toggleUserMenuScript does a lot more than I want. -->
+  <!-- https://www.w3schools.com/xml/xsl_functions.asp#string -->  
+  <xsl:template name="generateLogoutURL">
+    
+    <xsl:variable name="url" select="/page/pageRequest/@fullURL"/>
+    <xsl:variable name="tmpURL" select="substring-before($url, '&amp;amp;logout=')"/>
+    <xsl:variable name="beforeHash" select="substring-before($url, '#')"/>
+    <xsl:variable name="afterHash" select="substring-after($url, '#')"/>
+    <!-- Get rid of any lingering &amp;logout= already in the URL.
+     Can't use fn:replace() as it's only been defined since XSLT 2.0. We use XSLT 1.x -->
+    <xsl:variable name="fullURL">
+      <xsl:choose>
+    <xsl:when test="$tmpURL != ''"><xsl:value-of select="$tmpURL" /></xsl:when>
+    <xsl:otherwise><xsl:value-of select="$url" /></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <!-- Output the logout link: the current page's URL (with any lingering logout suffix removed) 
+     followed by ?logout= or &amp;logout= followed by any # portion of the current page's URL -->
+    <xsl:choose>
+      <xsl:when test="$beforeHash != ''"><xsl:value-of select="$beforeHash" /></xsl:when>
+      <xsl:otherwise><xsl:value-of select="$fullURL" /></xsl:otherwise>
+    </xsl:choose>
+    <xsl:choose>
+      <xsl:when test="contains($fullURL, '?')"><xsl:text>&amp;logout=</xsl:text></xsl:when>
+      <xsl:otherwise>?logout=</xsl:otherwise>
+    </xsl:choose>
+    <xsl:if test="$afterHash != ''">#<xsl:value-of select="$afterHash" /></xsl:if>   
   </xsl:template>
   

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

@@ -12 +12 @@
     <xsl:import href="layouts/main.xsl"/>
     <xsl:import href="layouts/toc.xsl"/>
+
+    <!-- templates for adding user comments -->
+    <xsl:import href="layouts/usercomments.xsl"/>
     
     <xsl:variable name="bookswitch">
@@ -367 +370 @@
                 <xsl:call-template name="documentHeading"/><br/>
                 <xsl:call-template name="documentContent"/>
+                <br /><xsl:call-template name="userCommentsSection"/>
             </xsl:when> 
             <xsl:otherwise> <!-- display the standard greenstone document -->