litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1393 for the external login button, put the entire text in the deploy.properties value.

Browse source
This commit is contained in:
jeb228 2010-12-07 18:41:02 +00:00
parent 6e7afb976d
commit 1bad0658cb
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java
View file

@ -120,7 +120,7 @@ public class LoginWidget extends Widget {
values.put(TemplateVariable.FORM_ACTION.toString(), getAuthenticateUrl(request));
values.put(TemplateVariable.LOGIN_NAME.toString(), bean.getUsername());
String externalAuthDisplayName = ConfigurationProperties.getProperty("externalAuth.displayName");
String externalAuthDisplayName = ConfigurationProperties.getProperty("externalAuth.buttonText");
if (externalAuthDisplayName != null) {
values.put(TemplateVariable.EXTERNAL_AUTH_URL.toString(),
UrlBuilder.getUrl(EXTERNAL_AUTH_SETUP_URL));

2
webapp/web/templates/freemarker/widgets/widget-login.ftl
View file

@ -50,7 +50,7 @@
<#if externalAuthUrl??>
<p class="external-auth">
<a class="green button" href="${externalAuthUrl}">Log in using ${externalAuthName}</a>
<a class="green button" href="${externalAuthUrl}">${externalAuthName}</a>
</p>
</#if>