Changeset 23523 for main/branches/64_bit_Greenstone/greenstone2/macros/style.dm

Timestamp:

2011-01-05T09:18:04+13:00 (13 years ago)

Author:

sjm84

Message:

Merging the latest trunk changes into this branch

Location:

main/branches/64_bit_Greenstone/greenstone2

Files:

• . (modified) (1 prop)
• macros/style.dm (modified) (4 diffs)

main/branches/64_bit_Greenstone/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_
 // -->