Devise routes

app/views/devise/passwords/edit.html.haml

@@ -10,5 +10,6 @@
     = f.label :password_confirmation
     %br/
     = f.password_field :password_confirmation
-  %p= f.submit "Change my password"
+  %p
+  = f.submit "Change my password"
 = render :partial => "devise/shared/links"

app/views/devise/passwords/new.html.haml

@@ -5,5 +5,6 @@
     = f.label :email
     %br/
     = f.text_field :email
-  %p= f.submit "Send me reset password instructions"
+  %p
+  = f.submit "Send me reset password instructions"
 = render :partial => "devise/shared/links"

app/views/devise/registrations/edit.html.haml

@@ -20,7 +20,8 @@
     %i (we need your current password to confirm your changes)
     %br/
     = f.password_field :current_password
-  %p= f.submit "Update"
+  %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}.

app/views/devise/unlocks/new.html.haml

@@ -5,5 +5,6 @@
     = f.label :email
     %br/
     = f.text_field :email
-  %p= f.submit "Resend unlock instructions"
+  %p
+  = f.submit "Resend unlock instructions"
 = render :partial => "devise/shared/links"

config/routes.rb

@@ -19,11 +19,11 @@ Diaspora::Application.routes.draw do |map|
 
   #routes for devise, not really sure you will need to mess with this in the future, lets put default,
   #non mutable stuff in anohter file
-  devise_for :users, :path_names  => {:sign_up  => "get_to_the_choppa", :sign_in  => "login", :sign_out  => "logout", :confirmation => 'confirmation'}
-    match 'login',  :to => 'devise/sessions#new',      :as => "new_user_session"
-    match 'logout', :to => 'devise/sessions#destroy',  :as => "destroy_user_session"
-    match 'get_to_the_choppa', :to => 'devise/registrations#new', :as => "new_user_registration"
-  
+  devise_for :users do
+    match 'login',  :to => 'devise/sessions#new'
+    match 'logout', :to => 'devise/sessions#destroy'
+    match 'get_to_the_choppa', :to => 'devise/registrations#new'
+  end
   #public routes
   #
   match 'webfinger', :to => 'publics#webfinger'