4 files changed, 27 insertions, 41 deletions
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
deleted file mode 100644
index 6a796b0..0000000
--- a/app/views/devise/passwords/edit.html.erb
+++ /dev/null

@@ -1,25 +0,0 @@
-<h2>Change your password</h2>
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
-  <%= f.hidden_field :reset_password_token %>
-  <div class="field">
-    <%= f.label :password, "New password" %><br />
-    <% if @minimum_password_length %>
-      <em>(<%= @minimum_password_length %> characters minimum)</em><br />
-    <% end %>
-    <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
-  </div>
-  <div class="field">
-    <%= f.label :password_confirmation, "Confirm new password" %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
-  <div class="actions">
-    <%= f.submit "Change my password" %>
-  </div>
-<% end %>
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
deleted file mode 100644
index 3d6d11a..0000000
--- a/app/views/devise/passwords/new.html.erb
+++ /dev/null

@@ -1,16 +0,0 @@
-<h2>Forgot your password?</h2>
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
-  </div>
-  <div class="actions">
-    <%= f.submit "Send me reset password instructions" %>
-  </div>
-<% end %>
-<%= render "devise/shared/links" %>
diff --git a/app/views/users/passwords/edit.html.haml b/app/views/users/passwords/edit.html.haml
new file mode 100644
index 0000000..3d2d9ee
--- /dev/null
+++ b/app/views/users/passwords/edit.html.haml

@@ -0,0 +1,16 @@
+%h2 Change your password
+= devise_error_messages!
+#principal
+  = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+    = f.hidden_field :reset_password_token
+    .field
+      = f.label :password, "New password"
+      - if @minimum_password_length
+        %em= "(#{@minimum_password_length} characters minimum)"
+      = f.password_field :password, autofocus: true, autocomplete: "off"
+    .field
+      = f.label :password_confirmation, "Confirm new password"
+      = f.password_field :password_confirmation, autocomplete: "off"
+    .submit-field
+      = f.submit "Change my password"
+.navigation= link_to "← Back to thoughts", root_url
diff --git a/app/views/users/passwords/new.html.haml b/app/views/users/passwords/new.html.haml
new file mode 100644
index 0000000..03d3854
--- /dev/null
+++ b/app/views/users/passwords/new.html.haml

@@ -0,0 +1,11 @@
+%h2 Forgot your password?
+= devise_error_messages!
+#principal
+  = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+    .field
+      = f.label :email
+      = f.email_field :email, autofocus: true
+    .submit-field
+      = f.submit "Submit"
+.navigation= link_to "Log in", new_session_path(resource_name)
+.navigation= link_to "← Back to thoughts", root_url

diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb deleted file mode 100644 index 6a796b0..0000000 --- a/app/views/devise/passwords/edit.html.erb +++ /dev/null
@@ -1,25 +0,0 @@
1	<h2>Change your password</h2>
2
3	<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do \|f\| %>
4	<%= devise_error_messages! %>
5	<%= f.hidden_field :reset_password_token %>
6
7	<div class="field">
8	<%= f.label :password, "New password" %><br />
9	<% if @minimum_password_length %>
10	<em>(<%= @minimum_password_length %> characters minimum)</em><br />
11	<% end %>
12	<%= f.password_field :password, autofocus: true, autocomplete: "off" %>
13	</div>
14
15	<div class="field">
16	<%= f.label :password_confirmation, "Confirm new password" %><br />
17	<%= f.password_field :password_confirmation, autocomplete: "off" %>
18	</div>
19
20	<div class="actions">
21	<%= f.submit "Change my password" %>
22	</div>
23	<% end %>
24
25	<%= render "devise/shared/links" %>


diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb deleted file mode 100644 index 3d6d11a..0000000 --- a/app/views/devise/passwords/new.html.erb +++ /dev/null
@@ -1,16 +0,0 @@
1	<h2>Forgot your password?</h2>
2
3	<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do \|f\| %>
4	<%= devise_error_messages! %>
5
6	<div class="field">
7	<%= f.label :email %><br />
8	<%= f.email_field :email, autofocus: true %>
9	</div>
10
11	<div class="actions">
12	<%= f.submit "Send me reset password instructions" %>
13	</div>
14	<% end %>
15
16	<%= render "devise/shared/links" %>


diff --git a/app/views/users/passwords/edit.html.haml b/app/views/users/passwords/edit.html.haml new file mode 100644 index 0000000..3d2d9ee --- /dev/null +++ b/app/views/users/passwords/edit.html.haml
@@ -0,0 +1,16 @@
		1	%h2 Change your password
		2	= devise_error_messages!
		3	#principal
		4	= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do \|f\|
		5	= f.hidden_field :reset_password_token
		6	.field
		7	= f.label :password, "New password"
		8	- if @minimum_password_length
		9	%em= "(#{@minimum_password_length} characters minimum)"
		10	= f.password_field :password, autofocus: true, autocomplete: "off"
		11	.field
		12	= f.label :password_confirmation, "Confirm new password"
		13	= f.password_field :password_confirmation, autocomplete: "off"
		14	.submit-field
		15	= f.submit "Change my password"
		16	.navigation= link_to "← Back to thoughts", root_url


diff --git a/app/views/users/passwords/new.html.haml b/app/views/users/passwords/new.html.haml new file mode 100644 index 0000000..03d3854 --- /dev/null +++ b/app/views/users/passwords/new.html.haml
@@ -0,0 +1,11 @@
		1	%h2 Forgot your password?
		2	= devise_error_messages!
		3	#principal
		4	= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do \|f\|
		5	.field
		6	= f.label :email
		7	= f.email_field :email, autofocus: true
		8	.submit-field
		9	= f.submit "Submit"
		10	.navigation= link_to "Log in", new_session_path(resource_name)
		11	.navigation= link_to "← Back to thoughts", root_url