Changeset 27307 for main/trunk/greenstone2/macros

Timestamp:

2013-05-06T16:30:00+12:00 (11 years ago)

Author:

ak19

Message:

Removed the javascript for logout, and put back the basic logout link that was commented out.

Location:

main/trunk/greenstone2/macros

Files:

• document.dm (modified) (1 diff)
• style.dm (modified) (2 diffs)

main/trunk/greenstone2/macros/document.dm

@@ -165 +165 @@
 <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>
+<div id="usercommentlogoutlink"><a href="_doc-url_&amp;un=">_text-usercomment-logout_</a></div>
 </form>
 

main/trunk/greenstone2/macros/style.dm

@@ -240 +240 @@
     \}
 
+    var un = "_cgiargun_";
+    var pw = "_cgiargpw_";
+    var ky = "_cgiargky_";
+    alert ("Username : " + un);
+//    alert ("Password : " + pw);
+    alert ("Key : " + ky);
+
     var gsapi = new GSAjaxAPI("_gwcgi_","_cgiargc_");
     
@@ -248 +255 @@
       var date = new Date(int_timestamp);
       return date.toLocaleDateString() + " " + date.toLocaleTimeString();   
-   \}
-
-   // 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) ;
    \}