From 1bad0658cb973c1d9bf11f3c61c72eebecca1c67 Mon Sep 17 00:00:00 2001 From: jeb228 Date: Tue, 7 Dec 2010 18:41:02 +0000 Subject: [PATCH] NIHVIVO-1393 for the external login button, put the entire text in the deploy.properties value. --- .../cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java | 2 +- webapp/web/templates/freemarker/widgets/widget-login.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java index acf8a0c9e..665cdfa65 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java @@ -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)); diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl index 9e7dea658..8c784dea5 100644 --- a/webapp/web/templates/freemarker/widgets/widget-login.ftl +++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl @@ -50,7 +50,7 @@ <#if externalAuthUrl??>

- Log in using ${externalAuthName} + ${externalAuthName}