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

Change the name of the loginName template variable to "username" so it doesn't conflict with the variable already in use in the footer.

Browse source
This commit is contained in:
jeb228 2010-10-27 20:21:42 +00:00
parent 21bbd9e881
commit ce99295729
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
View file

@ -39,7 +39,7 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
/** Show error message */ /** Show error message */
public static final String TEMPLATE_SERVER_ERROR = Template.ERROR_MESSAGE.toString(); 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_FORM_ACTION = "formAction";
public static final String BODY_INFO_MESSAGE = "infoMessage"; public static final String BODY_INFO_MESSAGE = "infoMessage";
public static final String BODY_ERROR_MESSAGE = "errorMessage"; public static final String BODY_ERROR_MESSAGE = "errorMessage";

2
webapp/web/templates/freemarker/body/login/login-form.ftl
View file

@ -27,7 +27,7 @@
<form action="${formAction}" method="post"> <form action="${formAction}" method="post">
<label for="loginName">Email or Username</label> <label for="loginName">Email or Username</label>
<input id="loginName" class="focus" name="loginName" type="text" value="${loginName}" /> <input id="loginName" class="focus" name="loginName" type="text" value="${username}" />
<label for="loginPassword">Password</label> <label for="loginPassword">Password</label>
<input id="loginPassword" type="password" name="loginPassword" /> <input id="loginPassword" type="password" name="loginPassword" />
<input name="loginForm" type="submit" class="submit" value="Log in"/> <input name="loginForm" type="submit" class="submit" value="Log in"/>