diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index 6ea93b780..8e268c926 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -1,3 +1,6 @@ += image_tag "http://needcoffee.cachefly.net/needcoffee/uploads/2009/02/predator-arnold-schwarzenegger.jpg" + + %h2 Sign up = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| = devise_error_messages! diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 367dc3b5f..a36917c7b 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -1,11 +1,13 @@ = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %p = f.text_field :email - %br + %br = f.password_field :password + /%p /- if devise_mapping.rememberable? - /= f.check_box :remember_me - /= f.label :remember_me - = f.submit "Sign in" -/= render :partial => "devise/shared/links" + / = f.check_box :remember_me + / = f.label :remember_me + %p + = f.submit "Sign in" += render :partial => "devise/shared/links" diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml index 72603fbce..95d0f7e34 100644 --- a/app/views/layouts/session_wall.html.haml +++ b/app/views/layouts/session_wall.html.haml @@ -40,12 +40,10 @@ - - - flash.each do |name, msg| = content_tag :div, msg, :id => "flash_#{name}" %div#huge_text diaspora = yield - = link_to "signup", "/signup" + /= link_to "signup", "/signup" diff --git a/config/routes.rb b/config/routes.rb index 6ac6330a0..8a2a972ee 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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, #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 '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 # diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 994d77872..59d324306 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -81,8 +81,6 @@ $(document).ready(function(){ }); //buttons////// - - pane_toggler_button("album"); pane_toggler_button("group"); pane_toggler_button("photo");