renamed the route for signup. also, removed the link from the login page: get_to_the_choppa

This commit is contained in:
Raphael 2010-08-10 17:14:58 -07:00
parent 4b102de1db
commit bd7ce5250f
5 changed files with 13 additions and 12 deletions

View file

@ -1,3 +1,6 @@
= image_tag "http://needcoffee.cachefly.net/needcoffee/uploads/2009/02/predator-arnold-schwarzenegger.jpg"
%h2 Sign up %h2 Sign up
= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
= devise_error_messages! = devise_error_messages!

View file

@ -1,11 +1,13 @@
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
%p %p
= f.text_field :email = f.text_field :email
%br %br
= f.password_field :password = f.password_field :password
/%p
/- if devise_mapping.rememberable? /- if devise_mapping.rememberable?
/= f.check_box :remember_me / = f.check_box :remember_me
/= f.label :remember_me / = f.label :remember_me
= f.submit "Sign in" %p
/= render :partial => "devise/shared/links" = f.submit "Sign in"
= render :partial => "devise/shared/links"

View file

@ -40,12 +40,10 @@
</div> </div>
<![endif]--> <![endif]-->
- flash.each do |name, msg| - flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}" = content_tag :div, msg, :id => "flash_#{name}"
%div#huge_text %div#huge_text
diaspora diaspora
= yield = yield
= link_to "signup", "/signup" /= link_to "signup", "/signup"

View file

@ -18,10 +18,10 @@ 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, #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 #non mutable stuff in anohter file
devise_for :users, :path_names => {:sign_up => "signup", :sign_in => "login", :sign_out => "logout"} devise_for :users, :path_names => {:sign_up => "get_to_the_choppa", :sign_in => "login", :sign_out => "logout"}
match 'login', :to => 'devise/sessions#new', :as => "new_user_session" match 'login', :to => 'devise/sessions#new', :as => "new_user_session"
match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session" match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session"
match 'signup', :to => 'devise/registrations#new', :as => "new_user_registration" match 'get_to_the_choppa', :to => 'devise/registrations#new', :as => "new_user_registration"
#public routes #public routes
# #

View file

@ -81,8 +81,6 @@ $(document).ready(function(){
}); });
//buttons////// //buttons//////
pane_toggler_button("album"); pane_toggler_button("album");
pane_toggler_button("group"); pane_toggler_button("group");
pane_toggler_button("photo"); pane_toggler_button("photo");