Changeset 27297 for main/trunk

Timestamp:

2013-05-03T21:28:37+12:00 (11 years ago)

Author:

ak19

Message:

Username field should not be cleared as it's no longer hidden and stores the logged in user. Also added a logout for the add comments feature, but there's probably a better way to do this, though the admin pages don't provide a logout and require you to log in repeatedly.

Location:

main/trunk/greenstone2

Files:

• macros/document.dm (modified) (2 diffs)
• macros/english.dm (modified) (1 diff)
• macros/style.dm (modified) (1 diff)
• web/style/style.css (modified) (1 diff)

main/trunk/greenstone2/macros/document.dm

@@ -164 +164 @@
 <input type="submit" value="_textaddcomment_" onclick="addUserComment(document.AddUserCommentForm.username.value, document.AddUserCommentForm.comment.value, document.AddUserCommentForm.d.value, document); return false;">
 <label id="usercommentfeedback"></label>
+
+<!--<div id="usercommentlogoutlink"><a href="_doc-url_&amp;un=">_text-usercomment-logout_</a></div>-->
+<div id="usercommentlogoutlink"><a href="#" onclick="javascript:logout(); return false;">_text-usercomment-logout_</a></div>
 </form>
 
@@ -260 +263 @@
 
         // GSAPI already knows the collection
-        gsapi.setMetadataArray(docArray, "accumulate", "import|archives|index");        
-        doc.AddUserCommentForm.comment.value = "";
-        doc.AddUserCommentForm.username.value = "";
+        gsapi.setMetadataArray(docArray, "accumulate", "import|archives|index");
+
+        // clear the comment field as it has now been submitted, but not the username field
+        // as the user is logged in, so they should be able to commit again under their username.
+        doc.AddUserCommentForm.comment.value = ""; 
         doc.getElementById("usercommentfeedback").innerHTML = "_textcommentsubmitted_";
 

main/trunk/greenstone2/macros/english.dm

@@ -338 +338 @@
 _textcommentusername_ {User name}
 _textaddusercomment_ {Add Comment}
+_text-usercomment-logout_ {Logout}
 _textaddcomment_ {submit comment}
 _textcommentsubmitted_ {Comment Submitted}

main/trunk/greenstone2/macros/style.dm

@@ -250 +250 @@
    \}
 
+   // Logout is the following operation
+   // _gwcgi_?e=_compressedoptions_&a=_cgiarga_&c=_cgiargc_&cl=_cgiargcl_&d=_cgiargd_&un=
+   // Maybe this is better done as a post?
+   // http://mentaljetsam.wordpress.com/2008/06/02/using-javascript-to-post-data-between-pages/
+   function logout() \{
+     var logoutForm = document.createElement("form");
+     logoutForm.method="post" ;
+     logoutForm.action = "_gwcgi_";
+
+     var params = \{
+         e: "_compressedoptions_",
+         a: "_cgiarga_", 
+         c: "_cgiargc_",
+         cl: "_cgiargcl_",
+         d: "_cgiargd_",
+         un: null
+     \};
+
+     for (var param in params) \{
+         var myInput = document.createElement("input") ;
+             myInput.setAttribute("name", param) ;
+         myInput.setAttribute("value", params[param]);
+         logoutForm.appendChild(myInput) ;
+      \}
+      document.body.appendChild(logoutForm) ;
+      logoutForm.submit() ;
+      document.body.removeChild(logoutForm) ;
+   \}
 
     function loadUserComments() \{

main/trunk/greenstone2/web/style/style.css

@@ -349 +349 @@
 }
 
-#usercommentlink {
+#usercommentlink, #usercommentlogoutlink {
     margin: 10px 0 20px 0;
 }
 
-#usercommentlink a {
+#usercommentlink a, #usercommentlogoutlink a {
  text-decoration: none;
  font-weight: bold;
 }
+#usercommentlink a:visited, #usercommentlogoutlink a:visited {
+    color: #006666;
+}