Changeset 23519 for main

Timestamp:

2010-12-21T23:19:21+13:00 (13 years ago)

Author:

davidb

Message:

Introduction of 'web-2.0' capabilities, triggered by setting the macro _activateweb20_ to 1. This in turn adds in a 'login' and 'logout' feature in the main navigation bar.

Location:

main/trunk/greenstone2/macros

Files:

• authen.dm (modified) (1 diff)
• english.dm (modified) (2 diffs)
• nav_css.dm (modified) (2 diffs)
• seaweed.dm (modified) (5 diffs)
• style.dm (modified) (4 diffs)

main/trunk/greenstone2/macros/authen.dm

@@ -11 +11 @@
 _content_ {
 <br><br><br><br>
-<form name="login" method="post" action="_gwcgi_">
+_If_("_activateweb20_" eq "1",
+  <form name="login" method="get" action="_gwcgi_">
+,
+  <form name="login" method="post" action="_gwcgi_">
+)
 <input type=hidden name="e" value="_If_(_cgiarger_,_cgiarger_,_decodedcompressedoptions_)">
 _hiddenargs_

main/trunk/greenstone2/macros/english.dm

@@ -75 +75 @@
 _textdescrhelp_ {Help page}
 _textdescrpref_ {Preferences page}
+_textdescrlogin_ {Login page}
+_textdescrlogout_ {Logout as _cgiargun_}
+
 _textdescrgreenstone_ {Greenstone Digital Library Software}
 _textdescrusab_ {What did you find hard to use?}
@@ -211 +214 @@
 _linktextHELP_ {HELP}
 _linktextPREFERENCES_ {PREFERENCES}
+_linktextLOGIN_ {LOGIN}
+_linktextLOGGEDIN_ {(logged in as _cgiargun_)}
+_linktextLOGOUT_ {LOGOUT}
 
 

main/trunk/greenstone2/macros/nav_css.dm

@@ -14 +14 @@
 #######################################################################
 
-_globallinks_ {_If_("_cgiargu_" ne "1",_homelink_) _helplink_ _preflink_}
-_homelink_ {_navtaborig_(_httppagehome_,_linktextHOME_,_textdescrhome_)}
-_helplink_ {_navtaborig_(_httppagehelp_,_linktextHELP_,_textdescrhelp_)}
-_preflink_ {_navtaborig_(_httppagepref_,_linktextPREFERENCES_,_textdescrpref_)}
+_globallinks_ {_If_("_cgiargu_" ne "1",_homelink_) _helplink_ _preflink__optloginlink_}
+_homelink_  {_navtaborig_(_httppagehome_,_linktextHOME_,_textdescrhome_)}
+_helplink_  {_navtaborig_(_httppagehelp_,_linktextHELP_,_textdescrhelp_)}
+_preflink_  {_navtaborig_(_httppagepref_,_linktextPREFERENCES_,_textdescrpref_)}
+
+_optloginlink_ {
+  _If_("_activateweb20_" >= "1",_If_("x_cgiargun__cgiarguan_" ne "x1",_loginlink_))
+}
+
+_loginlink_ {
+
+    _If_(_cgiargun_,
+      _navtablogoutorig_(_linktextLOGOUT_,_textdescrlogout_) _linktextLOGGEDIN_
+      <script type="text/javascript">
+        appendUsernameArgs("logout","uan=&un=")
+      </script>
+    ,
+      _navtabloginorig_(_linktextLOGIN_,_textdescrlogin_)
+      <script type="text/javascript">
+        appendUsernameArgs("login","uan=1")
+      </script>
+    )
+}
 
 
@@ -41 +60 @@
 # 4. optional "selected" or not if it is the current tab
 _navtaborig_ {<a _If_("_4_" eq "selected",class="navlink_sel">_2_,class="navlink" href="_1_" title="_3_">_2_)</a>}
+
+# same sa above, but without _1_ as there is no hyperlink to go to (want to say on the same page)
+_navtabloginorig_ {<a _If_("_3_" eq "selected",class="navlink_sel postit">_1_,class="navlink postit" id="login" href="" title="_2_">_1_)</a>}
+
+# same sa above, but without _1_ as there is no hyperlink to go to (want to say on the same page)
+_navtablogoutorig_ {<a _If_("_3_" eq "selected",class="navlink_sel postit">_1_,class="navlink postit" id="logout" href="" title="_2_">_1_)</a>}
 
 # parameters are

main/trunk/greenstone2/macros/seaweed.dm

@@ -1 +1 @@
 package Global
 
-_seaweed_ {
+_seaweedscript_ {
 
 
@@ -27 +27 @@
 
 <script type="text/javascript" src="_httpscript_/seaweed.js"></script>
-<script type="text/javascript" src="_httpscript_/gsajaxapi.js"></script>
 
 
@@ -126 +125 @@
 
   window.onload=function()\{
-//      try \{
+      try \{
       de.init();
       if (window.addEventListener) \{
@@ -141 +140 @@
        \});
         
-/*      \} 
+      \} 
       catch(err) \{
         alert("SeaWeed failed to initialise: " + err.message);
       \}
-*/
   \}
 
@@ -197 +195 @@
 
 
+    
+  function seaweedReindexCollection() \{
+    var arc = document.getElementById("seaweedRC");
+    arc.innerHTML = "reindexing ...";
+    gsapi.reindexCollection("incremental",seaweedReindexCallback);
+  \}
+
+  function seaweedReindexCallback(xmlHttp) \{
+    var arc = document.getElementById("seaweedRC");
+    arc.innerHTML = "reindexing done.";
+  \}            
+    
+
 </script>
 
-
 }
+
+_first-metadata-spanwrap_ {<span metapos="0" metaname="_1_" docoid="_2_" class="editable-metadata">}
+_/first-metadata-spanwrap_ {</span>}
+
+_first-metadata-divwrap_ {<div metapos="0" metaname="_1_" docoid="_2_" class="editable-metadata">}
+_/first-metadata-divwrap_ {</div>}

main/trunk/greenstone2/macros/style.dm

@@ -151 +151 @@
 <div class="bannerextra">_pagebannerextra_</div>
 <!-- end of page banner -->
-_If_("_cgiargtalkback_" eq "1",_talkback:uploadForm_)
+_If_("_activateweb20_" eq "2",
+  _If_("_activatetalkback_" eq "1",_talkback:uploadForm_)
+)
 }
 
@@ -162 +164 @@
 <p>
 <!-- end of page banner -->
-_If_("_cgiargtalkback_" eq "1",_talkback:uploadForm_)
+_If_("_activateweb20_" eq "2",
+  _If_("_activatetalkback_" eq "1",_talkback:uploadForm_)
+)
 }
 
@@ -191 +195 @@
 }
 
+_loginscript_ {
+   function appendUsernameArgs(id,addOn)
+   \{
+     var a=document.getElementById(id);
+     var url = a.getAttribute("href");
+     if (url == "") \{
+       url = document.location.toString();
+     \}
+
+     //alert("url before = " + url);
+
+     // clear out any earlier user name/authentication values
+     url = url.replace(/(&|\\\\?)uan=\\d\{0,1\}/g,"");
+     url = url.replace(/(&|\\\\?)un=[a-z0-9:\\-]*/g,"");
+     url = url.replace(/(&|\\\\?)pw=[a-z0-9:\\-]*/g,"");
+
+     //alert("url after = " + url);
+
+     var gwcgi = "_gwcgi_";
+
+     var tailUrl = url.substr(url.length-gwcgi.length);
+
+     url += (tailUrl == "_gwcgi_") ? "?" : "&";
+     url += addOn;
+
+     //alert("url with add on = " + url);
+
+     a.setAttribute("href",url);
+   \}
+}
+
+
 # imagescript only used in nav_ns4.dm
 _globalscripts_{
-
-_If_("_activateseaweed_" eq "1",_seaweed_)
+_If_("_activateweb20_" eq "2",
+  <script type="text/javascript" src="_httpscript_/gsajaxapi.js"></script>
+  _If_("_activateseaweed_" eq "1",_seaweedscript_)
+  _If_("_activatetalkback_" eq "1",_talkbackscript_)
+)
 _If_(_pagescriptfileextra_,_pagescriptfileextra_)
 <script language="javascript" type="text/javascript">
+_loginscript_
 _If_(_pagescriptextra_,_pagescriptextra_)
 _collectionspecificscript_
@@ -205 +245 @@
 
 _globalscripts_ [v=1] {
+_If_("_activateweb20_" eq "2",
+  <script type="text/javascript" src="_httpscript_/gsajaxapi.js"></script>
+  _If_("_activateseaweed_" eq "1",_seaweedscript_)
+  _If_("_activatetalkback_" eq "1",_talkbackscript_)
+)
+_If_(_pagescriptfileextra_,_pagescriptfileextra_)
 <script language="javascript" type="text/javascript">
 <!--
+_loginscript_
 _If_(_cgiargx_,_scriptdetach_)
-_pagescriptextra_
+_If_(_pagescriptextra_,_pagescriptextra_)
 _collectionspecificscript_
 // -->