added title to devise views, fixed sign in form styles

dominic · dominic · commit 1bac80450915 · 2011-10-21T01:08:35.000-04:00
diff --git a/app/assets/stylesheets/forms.css.scss b/app/assets/stylesheets/forms.css.scss
@@ -1,13 +1,20 @@
-input, textarea {
-  width: 350px;
-}
+form {
+  input, textarea {
+    width: 350px;
+  }
 
-.help-inline {
-  display: block;
-  padding-top: 5px;
-  margin-left: 150px;
-}
+  input.boolean {
+    margin: 0.75em 0 0 1.5em;
+  }
 
-textarea {
-  height: 200px;
+  .help-inline {
+    display: block;
+    padding-top: 5px;
+    margin-left: 150px;
+  }
+
+  textarea {
+    height: 200px;
+  }
+  
 }
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
@@ -1,4 +1,6 @@
-<h2>Resend confirmation instructions</h2>
+<% content_for :title do %>
+  Resend confirmation instructions
+<% end %>
 
 <%= simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= f.error_notification %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
@@ -1,4 +1,6 @@
-<h2>Change your password</h2>
+<% content_for :title do %>
+  Change Your Password
+<% end %>
 
 <%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= f.error_notification %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
@@ -1,4 +1,6 @@
-<h2>Forgot your password?</h2>
+<% content_for :title do %>
+  Forgot Your Password?
+<% end %>
 
 <%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= f.error_notification %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
@@ -1,4 +1,6 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
+<% content_for :title do %>
+Edit <%= resource_name.to_s.humanize %>
+<% end %>
 
 <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= f.error_notification %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -1,4 +1,6 @@
-<h2>Sign up</h2>
+<% content_for :title do %>
+  Sign Up
+<% end %>
 
 <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= f.error_notification %>
@@ -8,7 +10,7 @@
     <%= f.input :email %>
     <%= f.input :password %>
     <%= f.input :password_confirmation %>
-    <%= f.input :about %>	
+    <%= f.input :about, :as => :text %>	
   </div>
 
   <div class="actions">
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
@@ -1,4 +1,6 @@
-%h2 Sign in
+- content_for :title do
+  Sign In
+
 .sign-in
   = simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
     .inputs
diff --git a/app/views/devise/shared/_links.html.haml b/app/views/devise/shared/_links.html.haml
@@ -0,0 +1,14 @@
+= semantic_menu :class => "pills devise" do |root|
+  - if controller_name != 'sessions'
+    - root.add "Sign in", new_session_path(resource_name)
+  - if devise_mapping.registerable? && controller_name != 'registrations'
+    - root.add "Sign up", new_registration_path(resource_name)
+  - if devise_mapping.recoverable? && controller_name != 'passwords'
+    - root.add "Forgot your password?", new_password_path(resource_name)
+  - if devise_mapping.confirmable? && controller_name != 'confirmations'
+    - root.add "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
+  - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+    - root.add "Didn't receive unlock instructions?", new_unlock_path(resource_name)
+  - if devise_mapping.omniauthable?
+    - resource_class.omniauth_providers.each do |provider|
+      - root.add "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
@@ -1,4 +1,6 @@
-<h2>Resend unlock instructions</h2>
+<% content_for :title do %>
+  Resend unlock instructions
+<% end %>
 
 <%= simple_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= f.error_notification %>
