Make Devise views consistent with the existing ones

Jared Pace
1 parent 63cd8fea
Showing 16 changed files with 65 additions and 123 deletions Show diff stats
app/models/user.rb
app/views/devise/confirmations/new.html.haml
app/views/devise/mailer/confirmation_instructions.html.haml
app/views/devise/mailer/reset_password_instructions.html.haml
app/views/devise/mailer/reset_password_instructions.text.erb
app/views/devise/mailer/unlock_instructions.html.haml
app/views/devise/passwords/edit.html.haml
app/views/devise/passwords/new.html.haml
app/views/devise/registrations/edit.html.haml
app/views/devise/registrations/new.html.haml
app/views/devise/sessions/new.html.haml
app/views/devise/shared/_links.haml
app/views/devise/unlocks/new.html.haml
app/views/layouts/application.html.haml
app/views/shared/_session.html.haml
public/stylesheets/application.css
 class User
   include Mongoid::Document
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, 
+  devise :database_authenticatable,
+         :recoverable, :rememberable, :trackable,
          :validatable, :token_authenticatable
   field :name
@@ -1,9 +0,0 @@
-%h2 Resend confirmation instructions
-= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f|
-  = devise_error_messages!
-  %p
-    = f.label :email
-    %br/
-    = f.text_field :email
-  %p= f.submit "Resend confirmation instructions"
-= render :partial => "devise/shared/links"
@@ -1,4 +0,0 @@
-%p
-  Welcome #{@resource.email}!
-%p You can confirm your account through the link below:
-%p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
@@ -1,6 +0,0 @@
-%p
-  Hello #{@resource.email}!
-%p Someone has requested a link to change your password, and you can do this through the link below.
-%p= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
-%p If you didn't request this, please ignore this email.
-%p Your password won't change until you access the link above and create a new one.
@@ -0,0 +1,9 @@
+Hello,
+
+We hear you'd link to change your password. You can do that by visiting the link below.
+
+  <%= edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
+
+If you didn't request this, please ignore this email. Your password won't change unless you access the link above and create a new one.
+
+<%= render 'mailer/signature' %>
 \ No newline at end of file
@@ -1,5 +0,0 @@
-%p
-  Hello #{@resource.email}!
-%p Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
-%p Click the link below to unlock your account:
-%p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token)
-%h2 Change your password
+- content_for :title, "Change your password"
+
 = 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
-  %p
-    = f.label :password
-    %br/
+  .required
+    = f.label :password, 'New password'
     = f.password_field :password
-  %p
-    = f.label :password_confirmation
-    %br/
+  .required
+    = f.label :password_confirmation, 'One more time'
     = f.password_field :password_confirmation
-  %p= f.submit "Change my password"
-= render :partial => "devise/shared/links"
+  %div= f.submit "Change my password"
 \ No newline at end of file
-%h2 Forgot your password?
+- content_for :title, "Forget your password?"
 = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
   = devise_error_messages!
-  %p
+  .required
     = f.label :email
-    %br/
     = f.text_field :email
-  %p= f.submit "Send me reset password instructions"
-= render :partial => "devise/shared/links"
+    
+  %div= f.submit "Send me reset password instructions"
 \ No newline at end of file
@@ -1,27 +0,0 @@
-%h2
-  Edit #{resource_name.to_s.humanize}
-= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
-  = devise_error_messages!
-  %p
-    = f.label :email
-    %br/
-    = f.text_field :email
-  %p
-    = f.label :password
-    %i (leave blank if you don't want to change it)
-    %br/
-    = f.password_field :password
-  %p
-    = f.label :password_confirmation
-    %br/
-    = f.password_field :password_confirmation
-  %p
-    = f.label :current_password
-    %i (we need your current password to confirm your changes)
-    %br/
-    = f.password_field :current_password
-  %p= f.submit "Update"
-%h3 Cancel my account
-%p
-  Unhappy? #{link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete}.
-= link_to "Back", :back
@@ -1,20 +0,0 @@
-%h2 Sign up
-= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
-  = devise_error_messages!
-  %p
-    = f.label :name
-    = f.text_field :name
-  %p
-    = f.label :email
-    %br/
-    = f.text_field :email
-  %p
-    = f.label :password
-    %br/
-    = f.password_field :password
-  %p
-    = f.label :password_confirmation
-    %br/
-    = f.password_field :password_confirmation
-  %p= f.submit "Sign up"
-= render :partial => "devise/shared/links"
-%h2 Sign in
+- content_for :title, 'Sign in'
+
 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
-  %p
+  .required
     = f.label :email
-    %br/
     = f.text_field :email
-  %p
+  .required
+    = link_to 'forget it?', new_password_path(resource_name), :class => 'float-right'
     = f.label :password
-    %br/
     = f.password_field :password
+    
   - if devise_mapping.rememberable?
-    %p
+    %div.checkbox
       = f.check_box :remember_me
       = f.label :remember_me
-  %p= f.submit "Sign in"
-= render :partial => "devise/shared/links"
+      
+  %div= f.submit "Sign in"
 \ No newline at end of file
@@ -1,15 +0,0 @@
-- if controller_name != 'sessions'
-  = link_to "Sign in", new_session_path(resource_name)
-  %br/
-- if devise_mapping.registerable? && controller_name != 'registrations'
-  = link_to "Sign up", new_registration_path(resource_name)
-  %br/
-- if devise_mapping.recoverable? && controller_name != 'passwords'
-  = link_to "Forgot your password?", new_password_path(resource_name)
-  %br/
-- if devise_mapping.confirmable? && controller_name != 'confirmations'
-  = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
-  %br/
-- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
-  = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
-  %br/
@@ -1,9 +0,0 @@
-%h2 Resend unlock instructions
-= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f|
-  = devise_error_messages!
-  %p
-    = f.label :email
-    %br/
-    = f.text_field :email
-  %p= f.submit "Resend unlock instructions"
-= render :partial => "devise/shared/links"
@@ -13,8 +13,9 @@
     #header
       %div
         = link_to 'Errbit', root_path, :id => 'site-name'
+        = render 'shared/session'
-    = render :partial => 'shared/navigation'
+    = render 'shared/navigation' if current_user
     #content-wrapper
       #content-title
@@ -26,6 +27,5 @@
       #content      
         = render :partial => 'shared/flash_messages'
         = yield
-    #footer
-      Powered by Errbit.
+    #footer= "Powered by #{link_to 'Errbit', 'http://github.com/jdpace/errbit', :target => '_blank'}: the open source Hoptoad server.".html_safe
     = yield :scripts
 \ No newline at end of file
@@ -0,0 +1,3 @@
+- if current_user
+  %ul#session-links
+    %li= link_to 'Sign out', destroy_session_path(:user), :id => 'sign-out'
 \ No newline at end of file
@@ -58,9 +58,36 @@ a.action  { float: right; font-size: 0.9em;}
   text-indent: -5000em;
 }
 #header #session-links {
-  position: absolute; top: 15px; right: 0;
+  position: absolute; top: 18px; right: 0;
   font-size: 0.9em;
 }
+#header #session-links li {
+  float: right;
+  color: #FFF;
+  background-color: #000;
+  border-radius: 6px;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border: 1px solid #484B4F;
+  font-size: 14px;
+  font-weight: bold;
+}
+#header #session-links li:hover {
+  box-shadow: 0 0 3px #69c;
+  -moz-box-shadow: 0 0 3px #69c;
+  -webkit-box-shadow: 0 0 3px #69c;
+}
+#header #session-links a {
+  color: #FFF;
+  padding: 0 10px 0 30px;
+  line-height: 37px;
+}
+#header #session-links a:hover {
+  text-decoration: none;
+}
+#header #session-links #sign-out {
+  background: transparent url(images/icons/bullet-red-sm.png) 12px 50% no-repeat;
+}
 /* Navigation */
 #nav-bar {
1	class User	1	class User
2	include Mongoid::Document	2	include Mongoid::Document
3		3
4	- devise :database_authenticatable, :registerable,
5	- :recoverable, :rememberable, :trackable,	4	+ devise :database_authenticatable,
		5	+ :recoverable, :rememberable, :trackable,
6	:validatable, :token_authenticatable	6	:validatable, :token_authenticatable
7		7
8	field :name	8	field :name
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-%h2 Resend confirmation instructions
2	-= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do \|f\|
3	- = devise_error_messages!
4	- %p
5	- = f.label :email
6	- %br/
7	- = f.text_field :email
8	- %p= f.submit "Resend confirmation instructions"
9	-= render :partial => "devise/shared/links"
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	-%p
2	- Welcome #{@resource.email}!
3	-%p You can confirm your account through the link below:
4	-%p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
	@@ -1,6 +0,0 @@	@@ -1,6 +0,0 @@
1	-%p
2	- Hello #{@resource.email}!
3	-%p Someone has requested a link to change your password, and you can do this through the link below.
4	-%p= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
5	-%p If you didn't request this, please ignore this email.
6	-%p Your password won't change until you access the link above and create a new one.
	@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
		1	+Hello,
		2	+
		3	+We hear you'd link to change your password. You can do that by visiting the link below.
		4	+
		5	+ <%= edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
		6	+
		7	+If you didn't request this, please ignore this email. Your password won't change unless you access the link above and create a new one.
		8	+
		9	+<%= render 'mailer/signature' %>
0	\ No newline at end of file	10	\ No newline at end of file
	@@ -1,5 +0,0 @@	@@ -1,5 +0,0 @@
1	-%p
2	- Hello #{@resource.email}!
3	-%p Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
4	-%p Click the link below to unlock your account:
5	-%p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token)
	@@ -1,27 +0,0 @@	@@ -1,27 +0,0 @@
1	-%h2
2	- Edit #{resource_name.to_s.humanize}
3	-= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do \|f\|
4	- = devise_error_messages!
5	- %p
6	- = f.label :email
7	- %br/
8	- = f.text_field :email
9	- %p
10	- = f.label :password
11	- %i (leave blank if you don't want to change it)
12	- %br/
13	- = f.password_field :password
14	- %p
15	- = f.label :password_confirmation
16	- %br/
17	- = f.password_field :password_confirmation
18	- %p
19	- = f.label :current_password
20	- %i (we need your current password to confirm your changes)
21	- %br/
22	- = f.password_field :current_password
23	- %p= f.submit "Update"
24	-%h3 Cancel my account
25	-%p
26	- Unhappy? #{link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete}.
27	-= link_to "Back", :back
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-%h2 Sign up
2	-= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do \|f\|
3	- = devise_error_messages!
4	- %p
5	- = f.label :name
6	- = f.text_field :name
7	- %p
8	- = f.label :email
9	- %br/
10	- = f.text_field :email
11	- %p
12	- = f.label :password
13	- %br/
14	- = f.password_field :password
15	- %p
16	- = f.label :password_confirmation
17	- %br/
18	- = f.password_field :password_confirmation
19	- %p= f.submit "Sign up"
20	-= render :partial => "devise/shared/links"
	@@ -1,15 +0,0 @@	@@ -1,15 +0,0 @@
1	-- if controller_name != 'sessions'
2	- = link_to "Sign in", new_session_path(resource_name)
3	- %br/
4	-- if devise_mapping.registerable? && controller_name != 'registrations'
5	- = link_to "Sign up", new_registration_path(resource_name)
6	- %br/
7	-- if devise_mapping.recoverable? && controller_name != 'passwords'
8	- = link_to "Forgot your password?", new_password_path(resource_name)
9	- %br/
10	-- if devise_mapping.confirmable? && controller_name != 'confirmations'
11	- = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
12	- %br/
13	-- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
14	- = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
15	- %br/
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-%h2 Resend unlock instructions
2	-= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do \|f\|
3	- = devise_error_messages!
4	- %p
5	- = f.label :email
6	- %br/
7	- = f.text_field :email
8	- %p= f.submit "Resend unlock instructions"
9	-= render :partial => "devise/shared/links"