Revision 3732
Added by ben leinfelder almost 17 years ago
| lib/style/skins/default/include_header.jsp | ||
|---|---|---|
| 48 | 48 |
|
| 49 | 49 |
<td align="left" valign="middle" class="sectionheader" style="text-align: left"> |
| 50 | 50 |
    |
| 51 |
<a target="_top" href="./index.jsp"
|
|
| 51 |
<a target="_top" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/index.jsp"
|
|
| 52 | 52 |
class="toollink">Home</a></td> |
| 53 | 53 |
</tr> |
| 54 | 54 |
</table> |
| lib/style/skins/default/include_login.jsp | ||
|---|---|---|
| 90 | 90 |
cellspacing="0"> |
| 91 | 91 |
<tr> |
| 92 | 92 |
<td width="10"> |
| 93 |
<img src="./images/transparent1x1.gif" width="10" height="10">
|
|
| 93 |
<img src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/images/transparent1x1.gif" width="10" height="10">
|
|
| 94 | 94 |
</td> |
| 95 | 95 |
<td class="text_example"> |
| 96 | 96 |
<a name="loginanchor"></a> |
| ... | ... | |
| 129 | 129 |
<img src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/images/transparent1x1.gif" width="10"> |
| 130 | 130 |
</td> |
| 131 | 131 |
<td align="left" class="text_plain"> |
| 132 |
<a href="http://ldap.ecoinformatics.org/cgi-bin/ldapweb.cgi" target="_top">
|
|
| 132 |
<a href="<%=LDAP_CGI_PREFIX%>/ldapweb.cgi" target="_top">
|
|
| 133 | 133 |
create a new account</a> |
| 134 | 134 |
</td> |
| 135 | 135 |
</tr> |
| ... | ... | |
| 155 | 155 |
<img src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/images/transparent1x1.gif" width="10" > |
| 156 | 156 |
</td> |
| 157 | 157 |
<td align="left" class="text_plain"> |
| 158 |
<a href="http://ldap.ecoinformatics.org/cgi-bin/ldapweb.cgi?stage=resetpass" target="_top">forgot your password?</a>
|
|
| 158 |
<a href="<%=LDAP_CGI_PREFIX%>/ldapweb.cgi?stage=resetpass" target="_top">forgot your password?</a>
|
|
| 159 | 159 |
</td> |
| 160 | 160 |
</tr> |
| 161 | 161 |
<tr valign="middle"> |
| ... | ... | |
| 172 | 172 |
<img src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/images/transparent1x1.gif" width="10"> |
| 173 | 173 |
</td> |
| 174 | 174 |
<td align="left" class="text_plain"> |
| 175 |
<a href="http://ldap.ecoinformatics.org/cgi-bin/ldapweb.cgi?stage=changepass" target="_top">change your password</a>
|
|
| 175 |
<a href="<%=LDAP_CGI_PREFIX%>/ldapweb.cgi?stage=changepass" target="_top">change your password</a>
|
|
| 176 | 176 |
</td> |
| 177 | 177 |
</tr> |
| 178 | 178 |
<tr> |
| lib/style/skins/default/settings.jsp | ||
|---|---|---|
| 1 |
<%@page import="edu.ucsb.nceas.metacat.MetaCatUtil"%> |
|
| 1 | 2 |
<%@ page errorPage="jsperrorpage.html" import="javax.servlet.http.*" %> |
| 2 | 3 |
<!-- |
| 3 | 4 |
* '$RCSfile$' |
| ... | ... | |
| 42 | 43 |
|
| 43 | 44 |
// URL of metacat to be used for login & searching: |
| 44 | 45 |
String METACAT_URL = SERVER_URL_WITH_CONTEXT+ "/metacat"; |
| 46 |
|
|
| 47 |
// URL for LDAP login |
|
| 48 |
String LDAP_CGI_PREFIX = MetaCatUtil.getOption("cgi-prefix");
|
|
| 45 | 49 |
|
| 46 | 50 |
// label for logout form button when user *is* logged in: |
| 47 | 51 |
String LOGOUT_LABEL = "Logout"; |
| lib/metacat.properties | ||
|---|---|---|
| 108 | 108 |
|
| 109 | 109 |
httpserver=@systemidserver@ |
| 110 | 110 |
|
| 111 |
cgi-prefix=@cgi-prefix@ |
|
| 112 |
|
|
| 111 | 113 |
junittesturl=@systemidserver@@servlet-path@ |
| 112 | 114 |
|
| 113 | 115 |
authclass=edu.ucsb.nceas.metacat.AuthLdap |
Also available in: Unified diff
use cgi-prefix from build properties to configure the default skin for login.
removed hardcoded "ldap.ecoinformatics.org" reference in the jsp and reads it from the metacat.properties file.
Note: still uses ant token from the build.properties file, but at least centralizes the spot where the token needs to be dealt with.