From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 2 Jun 2010 21:36:34 +0000 (+0000)
Subject: Undouble these elements of password-reset that somehow doubled up during the forward...
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=67978756612685ac08b5304d33fc8c34a7c83350;p=contrib%2FConifer.git
Undouble these elements of password-reset that somehow doubled up during the forward-porting from rel_1_6
git-svn-id: svn://svn.open-ils.org/ILS/trunk@16565 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
diff --git a/Open-ILS/src/templates/password-reset/request-form.tt2 b/Open-ILS/src/templates/password-reset/request-form.tt2
index 4618775a3d..9f4382b648 100644
--- a/Open-ILS/src/templates/password-reset/request-form.tt2
+++ b/Open-ILS/src/templates/password-reset/request-form.tt2
@@ -30,20 +30,3 @@
dojo.require("dijit.form.ValidationTextBox");
</script>
</html>
-<html>
-<head>
- <title>[% i18n.REQUEST_TITLE %]</title>
-</head>
-<body>
- <h1>[% i18n.REQUEST_TITLE %]</h1>
-<p class='[% status.style %]'>[% status.msg %]</p>
-<form method="post" action="[% uri %]">
- <div>
- <label for="barcode">[% i18n.BARCODE_PROMPT %] </label><input type="text" name="barcode"/></br>
- <label for="username">[% i18n.USERNAME_PROMPT %] </label><input type="text" name="username"/></br>
- <!--<label for="email">[% i18n.EMAIL_PROMPT %] </label><input type="text" name="email"/></br>-->
- <input type="submit"/>
- </div>
-</form>
-</body>
-</html>
diff --git a/Open-ILS/src/templates/password-reset/reset-form.tt2 b/Open-ILS/src/templates/password-reset/reset-form.tt2
index c76d5d7052..9542cb2403 100644
--- a/Open-ILS/src/templates/password-reset/reset-form.tt2
+++ b/Open-ILS/src/templates/password-reset/reset-form.tt2
@@ -9,21 +9,7 @@
<div>
<label for="pwd1">[% password_prompt %] </label><input type="password" name="pwd1"/></br>
<label for="pwd2">[% password_prompt2 %] </label><input type="password" name="pwd2"/></br>
- </div>
-</form>
-</body>
-</html>
-<html>
-<head>
- <title>[% title %]</title>
-</head>
-<body>
- <h1>[% title %]</h1>
-<p class='[% status.style %]'>[% status.msg %]</p>
-<form method="post" action="[% uri %]">
- <div>
- <label for="pwd1">[% password_prompt %] </label><input type="password" name="pwd1"/></br>
- <label for="pwd2">[% password_prompt2 %] </label><input type="password" name="pwd2"/></br>
+ <button name="submit" id="submitButton" type="submit">[% i18n.BUTTON_SUBMIT %]</button>
</div>
</form>
</body>
diff --git a/Open-ILS/src/templates/password-reset/strings.en-US b/Open-ILS/src/templates/password-reset/strings.en-US
index f19bc429be..9b85980243 100644
--- a/Open-ILS/src/templates/password-reset/strings.en-US
+++ b/Open-ILS/src/templates/password-reset/strings.en-US
@@ -13,16 +13,3 @@ SUCCESS=Password has been reset.
TITLE=Library system password reset
PASSWORD_PROMPT=New password:
PASSWORD_PROMPT2=Re-enter new password:
-REQUEST_TITLE=Library system password reset request form
-IDENTIFY_YOURSELF=Please enter your user name or barcode to identify your library account and request a password reset.
-REQUEST_SUCCESS=Your user name or barcode has been submitted for a password reset. If a matching account with an email address is found, you will soon receive an email at that address with further instructions for resetting your password.
-BARCODE_PROMPT=Barcode:
-USERNAME_PROMPT=User name:
-EMAIL_PROMPT=Email address associated with the account:
-NO_SESSION=Could not find the requested password reset session.
-NO_MATCH=Passwords did not match. Please try again
-NOT_ACTIVE=This was not an active password reset request. Your password has not been reset.
-SUCCESS=Password has been reset.
-TITLE=Library system password reset
-PASSWORD_PROMPT=New password:
-PASSWORD_PROMPT2=Re-enter new password: