3 files changed, 61 insertions, 1 deletions
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index b4d0dda31..4b06b7e05 100644
--- a/app/views/user/_signin.rhtml
+++ b/app/views/user/_signin.rhtml
@@ -16,7 +16,7 @@
     </p>
 
     <p class="form_note">
-    Forgotten your password? Tough.
+    <%= link_to "Forgotten your password?", signchange_url + "?pretoken=" + h(params[:token]) %>
     </p>
 
     <div class="form_button">
diff --git a/app/views/user/signchange.rhtml b/app/views/user/signchange.rhtml
new file mode 100644
index 000000000..8f6fe663c
--- /dev/null
+++ b/app/views/user/signchange.rhtml
@@ -0,0 +1,30 @@
+<% @title = "Change password" %>
+
+<% raise "internal error" if not @user %>
+
+<div id="change_password">
+
+<% form_tag({:action => "signchange"}, {:id => "signchange_form"}) do %>
+    <%= foi_error_messages_for :user %>
+
+    <div class="form_note">
+    <h1>Change your password</h1>
+    </div>
+
+    <label class="form_label" for="user_password">New password:</label>
+    <%= password_field 'user', 'password', { :size => 15 } %>
+    </p>
+
+    <p>
+    <label class="form_label" for="user_password_confirmation">New password: (again)</label>
+    <%= password_field 'user', 'password_confirmation', { :size => 15 } %>
+    </p>
+
+    <div class="form_button">
+    <%= hidden_field_tag 'submitted_signchange_password', 1 %>
+    <%= hidden_field_tag 'pretoken', params[:pretoken] %>
+    <%= submit_tag "Update" %>
+    </div>
+<% end %>
+
+</div>
diff --git a/app/views/user/signchange_email.rhtml b/app/views/user/signchange_email.rhtml
new file mode 100644
index 000000000..5bd545d8d
--- /dev/null
+++ b/app/views/user/signchange_email.rhtml
@@ -0,0 +1,30 @@
+<% @title = "Change password" %>
+
+<div id="change_password">
+
+<% form_tag({:action => "signchange"}, {:id => "signchange_form"}) do %>
+    <%= foi_error_messages_for :signchange %>
+
+    <div class="form_note">
+    <h1>Change your password</h1>
+    </div>
+
+    <p>
+    <label class="form_label" for="signchange_email">Your e-mail:</label>
+    <%= text_field 'signchange', 'email', { :size => 20 } %>
+    </p>
+
+    <p class="form_note">
+    <strong>Note:</strong>
+    We will send you an email. Follow the instructions in it to change
+    your password.
+    </p>
+
+    <div class="form_button">
+    <%= hidden_field_tag 'submitted_signchange_email', 1 %>
+    <%= hidden_field_tag 'pretoken', params[:pretoken] %>
+    <%= submit_tag "Submit" %>
+    </div>
+<% end %>
+
+</div>