From ce992957298a3fa1abbfd261a8b53fecf11e612d Mon Sep 17 00:00:00 2001 From: jeb228 Date: Wed, 27 Oct 2010 20:21:42 +0000 Subject: [PATCH] Change the name of the loginName template variable to "username" so it doesn't conflict with the variable already in use in the footer. --- .../vitro/webapp/controller/login/LoginTemplateHelper.java | 2 +- webapp/web/templates/freemarker/body/login/login-form.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java index 0729fad0c..070b811bf 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java @@ -39,7 +39,7 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase { /** Show error message */ public static final String TEMPLATE_SERVER_ERROR = Template.ERROR_MESSAGE.toString(); - public static final String BODY_LOGIN_NAME = "loginName"; + public static final String BODY_LOGIN_NAME = "username"; public static final String BODY_FORM_ACTION = "formAction"; public static final String BODY_INFO_MESSAGE = "infoMessage"; public static final String BODY_ERROR_MESSAGE = "errorMessage"; diff --git a/webapp/web/templates/freemarker/body/login/login-form.ftl b/webapp/web/templates/freemarker/body/login/login-form.ftl index f37a65503..4e42b728f 100644 --- a/webapp/web/templates/freemarker/body/login/login-form.ftl +++ b/webapp/web/templates/freemarker/body/login/login-form.ftl @@ -27,7 +27,7 @@
- +