From aabc85f82e1ae5465a700bcd0d1cc85224a5666b Mon Sep 17 00:00:00 2001
From: Mischa Berger <mischa78@xs4all.nl>
Date: Tue, 10 May 2011 23:12:56 +0900
Subject: [PATCH] Removed 'Sign in' link from menu and added 'Back' links to
 reset password views

---
 app/views/reset_password/edit.html.erb | 3 ++-
 app/views/reset_password/new.html.erb  | 3 ++-
 app/views/shared/_menu.html.erb        | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/reset_password/edit.html.erb b/app/views/reset_password/edit.html.erb
index 4e91493..20245b4 100644
--- a/app/views/reset_password/edit.html.erb
+++ b/app/views/reset_password/edit.html.erb
@@ -12,6 +12,7 @@
 		<%= f.password_field :password_confirmation, { :class => 'text_input' } %>
 	</p>
 	<p>
-		<%= f.submit t(:reset_password) %>
+		<%= f.submit t(:reset_password) %> &nbsp; &mdash; &nbsp;
+		<%= link_to t(:back), new_session_path %>
 	</p>
 <% end %>
diff --git a/app/views/reset_password/new.html.erb b/app/views/reset_password/new.html.erb
index 1003cae..bded53b 100644
--- a/app/views/reset_password/new.html.erb
+++ b/app/views/reset_password/new.html.erb
@@ -20,6 +20,7 @@
 		<%= text_field_tag :email, nil, :class => 'text_input' %>
 	</p>
 	<p>
-		<%= submit_tag t(:send_email) %>
+		<%= submit_tag t(:send_email) %> &nbsp; &mdash; &nbsp;
+		<%= link_to t(:back), new_session_path %>
 	</p>
 <% end %>
diff --git a/app/views/shared/_menu.html.erb b/app/views/shared/_menu.html.erb
index 6d16620..b641462 100644
--- a/app/views/shared/_menu.html.erb
+++ b/app/views/shared/_menu.html.erb
@@ -6,8 +6,7 @@
 		<%= link_to t(:users), users_path %> &nbsp; &nbsp;
 		<%= link_to t(:groups), groups_path %> &nbsp; &nbsp;
 	<% end -%>
-	<% else -%>
-		<%= link_to t(:sign_in), new_session_path %> &nbsp; &nbsp;
 	<% end -%>
+		&nbsp;
 	</p>
 </div>