Changeset 27293 for main/trunk/greenstone2/macros/style.dm

Timestamp:

2013-05-02T17:43:31+12:00 (11 years ago)

Author:

ak19

Message:

Some bugfixes and improvements to the existing Add User Comment form before committing changes for the authentication. Fixes like checking for empty strings entered for the comment which shouldn't go in the database. And after a comment is submitted, it needs to be added to the existing list of displayed user comments, instead of reloading them all.

File:

• main/trunk/greenstone2/macros/style.dm (modified) (5 diffs)

main/trunk/greenstone2/macros/style.dm

@@ -244 +244 @@
     // http://stackoverflow.com/questions/6312993/javascript-seconds-to-time-with-format-hhmmss
     // Call as: alert(timestamp.printTime());
-    String.prototype.printTime = function () \{
-      var timestamp    = parseInt(this, 10); // don't forget the second param
-      var date = new Date(timestamp);
+    function formatTime(timestamp) \{
+      var int_timestamp    = parseInt(timestamp, 10); // don't forget the second param
+      var date = new Date(int_timestamp);
       return date.toLocaleDateString() + " " + date.toLocaleTimeString();   
    \}
@@ -313 +313 @@
             
         metapos++;
-        username = gsapi.getArchivesMetadata(doc_id, "username", metapos);
+        username = gsapi.getArchivesMetadata(doc_id, "username", metapos);//, "_cgiargun_", "_cgiargpw_");
     \}
 
     // No need to sort by time, 
-    // as the array is already stored sorted and hence retrieved in the right order by using metapost counter
+    // as the array is already stored sorted and hence retrieved in the right order by using metapos counter
     // If sorting the array of comment records, which would be by timestamp, see
     // https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/sort
@@ -328 +328 @@
     
     // create the output HTML for all comments in one go now
-    // (we do this here altogether to hopefully avoid reloading the page for each comment)
+    // (we do this here for all values together to hopefully avoid reloading the page for each comment)
 
     for(var i = 0; i < metapos; i++) \{
@@ -339 +339 @@
 
         // for each usercomment, create a child div with the username, timestamp and comment
-
-        var divgroup=document.createElement("div");
-        var attr=document.createAttribute("class");
-        attr.nodeValue="usercomment";
-        divgroup.setAttributeNode(attr);
-
-        var divuser=document.createElement("div");
-        var divtime=document.createElement("div");
-        var divcomment=document.createElement("div");
-
-    
-        divgroup.appendChild(divuser);
-        var txt=document.createTextNode(username);
-        divuser.appendChild(txt);
-
-        divgroup.appendChild(divtime);
-        txt=document.createTextNode(timestamp.printTime()); // formate timestamp for date/time display
-        divtime.appendChild(txt);
-
-        divgroup.appendChild(divcomment);
-        txt=document.createTextNode(comment);
-        divcomment.appendChild(txt);
-
-        usercommentdiv.appendChild(divgroup);
+        displayInUserCommentList(usercommentdiv, username, timestamp, comment);
     \}
 
@@ -368 +345 @@
     \}
 
+    function displayInUserCommentList(usercommentdiv, username, timestamp, comment) \{
+
+        var divgroup=document.createElement("div");
+    var attr=document.createAttribute("class");
+    attr.nodeValue="usercomment";
+    divgroup.setAttributeNode(attr);
+
+    var divuser=document.createElement("div");
+    var divtime=document.createElement("div");
+    var divcomment=document.createElement("div");
+
+    
+    divgroup.appendChild(divuser);
+    var txt=document.createTextNode(username);
+    divuser.appendChild(txt);
+
+    divgroup.appendChild(divtime);
+    txt=document.createTextNode(formatTime(timestamp)); // format timestamp for date/time display
+    divtime.appendChild(txt);
+
+    divgroup.appendChild(divcomment);
+    txt=document.createTextNode(comment);
+    divcomment.appendChild(txt);
+
+    usercommentdiv.appendChild(divgroup);
+             
+    \}
 
     // http://stackoverflow.com/questions/807878/javascript-that-executes-after-page-load