From 86a22b397dac1de7bad562d9c4e169a6d0fa4db8 Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 17 Jun 2011 17:31:23 +0000 Subject: [PATCH] Rename email templates to clarify their purpose. --- .../controller/accounts/admin/UserAccountsEditPageStrategy.java | 2 +- .../controller/accounts/user/UserAccountsResetPasswordPage.java | 2 +- .../controller/accounts/user/UserAccountsUserController.java | 2 -- ...setEmail.ftl => userAccounts-passwordResetCompleteEmail.ftl} | 0 ...wordEmail.ftl => userAccounts-passwordResetPendingEmail.ftl} | 0 5 files changed, 2 insertions(+), 4 deletions(-) rename webapp/web/templates/freemarker/body/accounts/{userAccounts-passwordResetEmail.ftl => userAccounts-passwordResetCompleteEmail.ftl} (100%) rename webapp/web/templates/freemarker/body/accounts/{userAccounts-resetPasswordEmail.ftl => userAccounts-passwordResetPendingEmail.ftl} (100%) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java index b043c2422..163d3cdda 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java @@ -57,7 +57,7 @@ public abstract class UserAccountsEditPageStrategy extends UserAccountsPage { private static class EmailStrategy extends UserAccountsEditPageStrategy { private static final String PARAMETER_RESET_PASSWORD = "resetPassword"; - private static final String EMAIL_TEMPLATE = "userAccounts-resetPasswordEmail.ftl"; + private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetPendingEmail.ftl"; public static final String RESET_PASSWORD_URL = "/accounts/resetPassword"; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java index 3bd511b83..f1ec8ed52 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java @@ -26,7 +26,7 @@ public class UserAccountsResetPasswordPage extends UserAccountsPasswordBasePage private static final String TEMPLATE_NAME = "userAccounts-resetPassword.ftl"; - private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetEmail.ftl"; + private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetCompleteEmail.ftl"; protected UserAccountsResetPasswordPage(VitroRequest vreq) { super(vreq); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java index 3dafd87f9..4437e35cb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.accounts.user; import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.EXTERNAL; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -18,7 +17,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginRedirector; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean; /** * Parcel out the different actions required of the UserAccounts GUI. diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl similarity index 100% rename from webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetEmail.ftl rename to webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPasswordEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl similarity index 100% rename from webapp/web/templates/freemarker/body/accounts/userAccounts-resetPasswordEmail.ftl rename to webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl