Changeset 31540

Timestamp:

2017-03-27T18:01:36+13:00 (7 years ago)

Author:

ak19

Message:

Some commits ahead of further changes: 1. Kathy came up with better name for GS2Construct.java method (to be refactored) that's more descriptive of the multiple tasks it performs. Removed unused paramter. 2. Javascript user_comments.js displays the heading for the comments section only when appropriate, which is when there is a comment history or when the form to add a comment is shown. Otherwise only the Add Comment link will be shown. 3. Changed core.css colours of links and headings in comments section to better match GS3. 4. document.xsl needs to display usercomments section not just for simple docs but also for wrapped docs.

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (2 diffs)
• web/interfaces/default/js/user_comments.js (modified) (2 diffs)
• web/interfaces/default/style/core.css (modified) (2 diffs)
• web/interfaces/default/transform/layouts/usercomments.xsl (modified) (1 diff)
• web/interfaces/default/transform/pages/document.xsl (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -331 +331 @@
         // If a user is only adding comments, they don't need to have editing powers over a collection
         // but they need to be logged in
-        String[] docids = isAddingUserComments(request, params);
+        String[] docids = getDocIDsifAddingUserComments(params); //isAddingUserComments(request, params);
         boolean isAddingUserComments = (docids == null) ? false : true;
 
@@ -1021 +1021 @@
     }
 
-
-    protected String[] isAddingUserComments(Element request, HashMap<String, Serializable> params) {
+    // getDocIdsWithOptFilter(JSONArray json, Pattern filterFields, boolean strictOrPermissible)
+    protected String[] getDocIDsifAddingUserComments(HashMap<String, Serializable> params) {
 
     String metaserver_command = (String) params.get("a"); // e.g. set-archives-metadata or set-metadata-array

main/trunk/greenstone3/web/interfaces/default/js/user_comments.js

@@ -76 +76 @@
     var i = 0;
     var looping = true;
-    var print_heading = false; // UNUSED SECTION if(print_heading) below
-    
+
+    
+    // if there's at least one existing comment OR if the form is currently being displayed
+    // (regardless of whether previous comments exist), display a heading for the comments section
+    if(metatable[0].metavals[0] != undefined || document.getElementById("usercommentform") != undefined) {
+    var heading=document.createElement("div");
+    var attr=document.createAttribute("class");
+    attr.nodeValue="usercommentheading";
+    heading.setAttributeNode(attr);
+    var txt=document.createTextNode(gs.variables["textusercommentssection"]); ///"_textusercommentssection_");
+    heading.appendChild(txt);
+    usercommentdiv.appendChild(heading);
+    }
+    
+   
     // metatable[0] = list of usernames, metatable[1] = list of timestamps, metatable[2] = list of comments 
     // the 3 lists/arrays should be of even length. Assuming this, loop as long as there's another username
@@ -86 +99 @@
         } 
     else {
-        
-// BEGIN UNUSED
-        if(print_heading) {
-        var heading=document.createElement("div");
-        var attr=document.createAttribute("class");
-        attr.nodeValue="usercommentheading";
-        heading.setAttributeNode(attr);
-        var txt=document.createTextNode(gs.variables["textusercommentssection"]); ///"_textusercommentssection_");
-        heading.appendChild(txt);
-        usercommentdiv.appendChild(heading);
-        
-        print_heading = false;
-        }
-// END UNUSED
         
             var username = metaval_rec.metavalue;

main/trunk/greenstone3/web/interfaces/default/style/core.css

@@ -1253 +1253 @@
 .usercommentheading {
     font-weight: bold;
-    color: #006666;
+    color: #3c8700;
     border-top: solid 1px black;
 }
@@ -1268 +1268 @@
  text-decoration: none;
  font-weight: bold;
- color: #006666;
+ color: #3c8700;
 }
 #usercommentlink a:visited, #usercommentlogoutlink a:visited {
-    color: #006666;
+    color: #3c8700;
 }
 

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

@@ -27 +27 @@
   <div id="commentssection" class="centrediv">    
     <div id="usercomments">
-      <!-- The div that loads the user comments that were already submitted -->
-      <div class="usercommentheading"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'usercomments.heading')"/></div>
+      <!-- A heading for the comment section will be added here dynamically either if
+       previously submitted comments exist, or if the form#usercommentform to add
+       a new comment is displayed. Otherwise only the "Add Comments" link is shown. -->
+      <xsl:comment>Existing comments will be loaded dynamically loaded into this div#usercomments</xsl:comment>
     </div>
 

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

@@ -374 +374 @@
             <xsl:otherwise> <!-- display the standard greenstone document -->
                 <xsl:call-template name="wrappedDocument"/>
+                <br /><xsl:call-template name="userCommentsSection"/>
             </xsl:otherwise>
         </xsl:choose>