2 files changed, 49 insertions, 37 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html
deleted file mode 100644
index 8b700de430..0000000000
--- a/phpBB/styles/prosilver/template/ucp_remind.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<form action="{S_PROFILE_ACTION}" method="post" id="remind">
-
-<div class="panel">
-	<div class="inner">
-
-	<div class="content">
-		<h2>{L_SEND_PASSWORD}</h2>
-
-		<fieldset>
-			{% if USERNAME_REQUIRED %}
-				<p class="error">{{ lang('EMAIL_NOT_UNIQUE') }}</p>
-			{% endif %}
-		<dl>
-			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt>
-			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" value="{{ EMAIL }}" autofocus /></dd>
-		</dl>
-		{% if USERNAME_REQUIRED %}
-		<dl>
-			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
-			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
-		</dl>
-		{% endif %}
-		<dl>
-			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd>
-		</dl>
-		{S_FORM_TOKEN}
-		</fieldset>
-	</div>
-
-	</div>
-</div>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/prosilver/template/ucp_reset_password.html b/phpBB/styles/prosilver/template/ucp_reset_password.html
new file mode 100644
index 0000000000..0a05f69aed
--- /dev/null
+++ b/phpBB/styles/prosilver/template/ucp_reset_password.html
@@ -0,0 +1,49 @@
+<!-- INCLUDE overall_header.html -->
+
+<form action="{{ U_RESET_PASSWORD_ACTION }}" method="post" id="reset_password">
+
+<div class="panel">
+	<div class="inner">
+
+	<div class="content">
+		<h2>{{ lang('RESET_PASSWORD') }}</h2>
+
+		<fieldset>
+		{% if S_IS_PASSWORD_RESET %}
+			{% if PASSWORD_RESET_ERRORS %}<p class="error">{{ PASSWORD_RESET_ERRORS | join('<br>') }}</p>{% endif %}
+			<dl>
+				<dt><label for="new_password">{{ lang('NEW_PASSWORD') ~ lang('COLON') }}</label></dt>
+				<dd><input type="password" name="new_password" id="new_password" size="25" maxlength="255" title="{{ lang('CHANGE_PASSWORD') }}" autocomplete="off" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="new_password_confirm">{{ lang('CONFIRM_PASSWORD') ~ lang('COLON') }}</label></dt>
+				<dd><input type="password" name="new_password_confirm" id="new_password_confirm" size="25" maxlength="255" title="{{ lang('CONFIRM_PASSWORD') }}" autocomplete="off" /></dd>
+			</dl>
+		{% else %}
+			{% if USERNAME_REQUIRED %}
+				<p class="error">{{ lang('EMAIL_NOT_UNIQUE') }}</p>
+			{% endif %}
+			<dl>
+				<dt><label for="email">{{ lang('EMAIL_ADDRESS') ~ lang('COLON') }}</label><br /><span>{{ lang('EMAIL_REMIND') }}</span></dt>
+				<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" value="{{ EMAIL }}" autofocus /></dd>
+			</dl>
+			{% if USERNAME_REQUIRED %}
+			<dl>
+				<dt><label for="username">{{ lang('USERNAME') ~ lang('COLON') }}</label></dt>
+				<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
+			</dl>
+			{% endif %}
+		{% endif %}
+		<dl>
+			<dt>&nbsp;</dt>
+			<dd>{{ S_HIDDEN_FIELDS }}<input type="submit" name="submit" id="submit" class="button1" value="{{ lang('SUBMIT') }}" tabindex="2" />&nbsp; <input type="reset" value="{{ lang('RESET') }}" name="reset" class="button2" /></dd>
+		</dl>
+		{{ S_FORM_TOKEN }}
+		</fieldset>
+	</div>
+
+	</div>
+</div>
+</form>
+
+<!-- INCLUDE overall_footer.html -->