Changeset 23519 for main/trunk/greenstone2/macros
- Timestamp:
- 2010-12-21T23:19:21+13:00 (13 years ago)
- Location:
- main/trunk/greenstone2/macros
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/macros/authen.dm
r22560 r23519 11 11 _content_ { 12 12 <br><br><br><br> 13 <form name="login" method="post" action="_gwcgi_"> 13 _If_("_activateweb20_" eq "1", 14 <form name="login" method="get" action="_gwcgi_"> 15 , 16 <form name="login" method="post" action="_gwcgi_"> 17 ) 14 18 <input type=hidden name="e" value="_If_(_cgiarger_,_cgiarger_,_decodedcompressedoptions_)"> 15 19 _hiddenargs_ -
main/trunk/greenstone2/macros/english.dm
r22051 r23519 75 75 _textdescrhelp_ {Help page} 76 76 _textdescrpref_ {Preferences page} 77 _textdescrlogin_ {Login page} 78 _textdescrlogout_ {Logout as _cgiargun_} 79 77 80 _textdescrgreenstone_ {Greenstone Digital Library Software} 78 81 _textdescrusab_ {What did you find hard to use?} … … 211 214 _linktextHELP_ {HELP} 212 215 _linktextPREFERENCES_ {PREFERENCES} 216 _linktextLOGIN_ {LOGIN} 217 _linktextLOGGEDIN_ {(logged in as _cgiargun_)} 218 _linktextLOGOUT_ {LOGOUT} 213 219 214 220 -
main/trunk/greenstone2/macros/nav_css.dm
r20611 r23519 14 14 ####################################################################### 15 15 16 _globallinks_ {_If_("_cgiargu_" ne "1",_homelink_) _helplink_ _preflink_} 17 _homelink_ {_navtaborig_(_httppagehome_,_linktextHOME_,_textdescrhome_)} 18 _helplink_ {_navtaborig_(_httppagehelp_,_linktextHELP_,_textdescrhelp_)} 19 _preflink_ {_navtaborig_(_httppagepref_,_linktextPREFERENCES_,_textdescrpref_)} 16 _globallinks_ {_If_("_cgiargu_" ne "1",_homelink_) _helplink_ _preflink__optloginlink_} 17 _homelink_ {_navtaborig_(_httppagehome_,_linktextHOME_,_textdescrhome_)} 18 _helplink_ {_navtaborig_(_httppagehelp_,_linktextHELP_,_textdescrhelp_)} 19 _preflink_ {_navtaborig_(_httppagepref_,_linktextPREFERENCES_,_textdescrpref_)} 20 21 _optloginlink_ { 22 _If_("_activateweb20_" >= "1",_If_("x_cgiargun__cgiarguan_" ne "x1",_loginlink_)) 23 } 24 25 _loginlink_ { 26 27 _If_(_cgiargun_, 28 _navtablogoutorig_(_linktextLOGOUT_,_textdescrlogout_) _linktextLOGGEDIN_ 29 <script type="text/javascript"> 30 appendUsernameArgs("logout","uan=&un=") 31 </script> 32 , 33 _navtabloginorig_(_linktextLOGIN_,_textdescrlogin_) 34 <script type="text/javascript"> 35 appendUsernameArgs("login","uan=1") 36 </script> 37 ) 38 } 20 39 21 40 … … 41 60 # 4. optional "selected" or not if it is the current tab 42 61 _navtaborig_ {<a _If_("_4_" eq "selected",class="navlink_sel">_2_,class="navlink" href="_1_" title="_3_">_2_)</a>} 62 63 # same sa above, but without _1_ as there is no hyperlink to go to (want to say on the same page) 64 _navtabloginorig_ {<a _If_("_3_" eq "selected",class="navlink_sel postit">_1_,class="navlink postit" id="login" href="" title="_2_">_1_)</a>} 65 66 # same sa above, but without _1_ as there is no hyperlink to go to (want to say on the same page) 67 _navtablogoutorig_ {<a _If_("_3_" eq "selected",class="navlink_sel postit">_1_,class="navlink postit" id="logout" href="" title="_2_">_1_)</a>} 43 68 44 69 # parameters are -
main/trunk/greenstone2/macros/seaweed.dm
r23502 r23519 1 1 package Global 2 2 3 _seaweed _ {3 _seaweedscript_ { 4 4 5 5 … … 27 27 28 28 <script type="text/javascript" src="_httpscript_/seaweed.js"></script> 29 <script type="text/javascript" src="_httpscript_/gsajaxapi.js"></script>30 29 31 30 … … 126 125 127 126 window.onload=function()\{ 128 //try \{127 try \{ 129 128 de.init(); 130 129 if (window.addEventListener) \{ … … 141 140 \}); 142 141 143 /*\}142 \} 144 143 catch(err) \{ 145 144 alert("SeaWeed failed to initialise: " + err.message); 146 145 \} 147 */148 146 \} 149 147 … … 197 195 198 196 197 198 function seaweedReindexCollection() \{ 199 var arc = document.getElementById("seaweedRC"); 200 arc.innerHTML = "reindexing ..."; 201 gsapi.reindexCollection("incremental",seaweedReindexCallback); 202 \} 203 204 function seaweedReindexCallback(xmlHttp) \{ 205 var arc = document.getElementById("seaweedRC"); 206 arc.innerHTML = "reindexing done."; 207 \} 208 209 199 210 </script> 200 211 201 202 212 } 213 214 _first-metadata-spanwrap_ {<span metapos="0" metaname="_1_" docoid="_2_" class="editable-metadata">} 215 _/first-metadata-spanwrap_ {</span>} 216 217 _first-metadata-divwrap_ {<div metapos="0" metaname="_1_" docoid="_2_" class="editable-metadata">} 218 _/first-metadata-divwrap_ {</div>} -
main/trunk/greenstone2/macros/style.dm
r23501 r23519 151 151 <div class="bannerextra">_pagebannerextra_</div> 152 152 <!-- end of page banner --> 153 _If_("_cgiargtalkback_" eq "1",_talkback:uploadForm_) 153 _If_("_activateweb20_" eq "2", 154 _If_("_activatetalkback_" eq "1",_talkback:uploadForm_) 155 ) 154 156 } 155 157 … … 162 164 <p> 163 165 <!-- end of page banner --> 164 _If_("_cgiargtalkback_" eq "1",_talkback:uploadForm_) 166 _If_("_activateweb20_" eq "2", 167 _If_("_activatetalkback_" eq "1",_talkback:uploadForm_) 168 ) 165 169 } 166 170 … … 191 195 } 192 196 197 _loginscript_ { 198 function appendUsernameArgs(id,addOn) 199 \{ 200 var a=document.getElementById(id); 201 var url = a.getAttribute("href"); 202 if (url == "") \{ 203 url = document.location.toString(); 204 \} 205 206 //alert("url before = " + url); 207 208 // clear out any earlier user name/authentication values 209 url = url.replace(/(&|\\\\?)uan=\\d\{0,1\}/g,""); 210 url = url.replace(/(&|\\\\?)un=[a-z0-9:\\-]*/g,""); 211 url = url.replace(/(&|\\\\?)pw=[a-z0-9:\\-]*/g,""); 212 213 //alert("url after = " + url); 214 215 var gwcgi = "_gwcgi_"; 216 217 var tailUrl = url.substr(url.length-gwcgi.length); 218 219 url += (tailUrl == "_gwcgi_") ? "?" : "&"; 220 url += addOn; 221 222 //alert("url with add on = " + url); 223 224 a.setAttribute("href",url); 225 \} 226 } 227 228 193 229 # imagescript only used in nav_ns4.dm 194 230 _globalscripts_{ 195 196 _If_("_activateseaweed_" eq "1",_seaweed_) 231 _If_("_activateweb20_" eq "2", 232 <script type="text/javascript" src="_httpscript_/gsajaxapi.js"></script> 233 _If_("_activateseaweed_" eq "1",_seaweedscript_) 234 _If_("_activatetalkback_" eq "1",_talkbackscript_) 235 ) 197 236 _If_(_pagescriptfileextra_,_pagescriptfileextra_) 198 237 <script language="javascript" type="text/javascript"> 238 _loginscript_ 199 239 _If_(_pagescriptextra_,_pagescriptextra_) 200 240 _collectionspecificscript_ … … 205 245 206 246 _globalscripts_ [v=1] { 247 _If_("_activateweb20_" eq "2", 248 <script type="text/javascript" src="_httpscript_/gsajaxapi.js"></script> 249 _If_("_activateseaweed_" eq "1",_seaweedscript_) 250 _If_("_activatetalkback_" eq "1",_talkbackscript_) 251 ) 252 _If_(_pagescriptfileextra_,_pagescriptfileextra_) 207 253 <script language="javascript" type="text/javascript"> 208 254 <!-- 255 _loginscript_ 209 256 _If_(_cgiargx_,_scriptdetach_) 210 _ pagescriptextra_257 _If_(_pagescriptextra_,_pagescriptextra_) 211 258 _collectionspecificscript_ 212 259 // -->
Note:
See TracChangeset
for help on using the changeset viewer.