Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor

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!

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"
 

app/views/js/_websocket_js.haml

@@ -79,7 +79,7 @@
         if (location.href.indexOf(photoHash['album_id']) == -1){
           return ;
         }
-        html =  "<div class=\'image_thumb\' id=\'"+photoHash['id']+"\'> \
+        html =  "<div class=\'image_thumb\' id=\'"+photoHash['id']+"\' style=\'padding-right:3px;\'> \
           <a href=\"/photos/"+ photoHash['id'] +"\"> \
           <img alt=\"New thumbnail\" src=\""+ photoHash['thumb_url'] +"\" /> \
           </a> </div>"  

app/views/layouts/session_wall.html.haml

@@ -40,12 +40,10 @@
         </div>
         <![endif]-->
     
-    
-    
       - 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"

app/views/photos/_new_photo.haml

@@ -10,11 +10,13 @@
       onFinish: function(event, total){
         $("#add_photo_button .button").html( "Add Photos" );
         $("#add_photo_loader").fadeOut(400);
+        pane_toggler_button("photo");
       },
       onStart: function(event, total){
         $("#add_photo_pane").fadeOut(400);
         $("#add_photo_button .button").html( "Uploading Photos" );
         $("#add_photo_loader").fadeIn(400);
+        $("#add_photo_button").unbind();
         return true;
       }
     });

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
   #

public/javascripts/view.js

@@ -81,18 +81,6 @@ $(document).ready(function(){
   });
 
   //buttons//////
-  function pane_toggler_button( name ) {
-    $("#add_" + name + "_button").toggle(
-    function(evt){
-      evt.preventDefault();
-      $("#add_" + name + "_pane").fadeIn(300);
-    },function(evt){
-      evt.preventDefault();
-      $("#add_" + name +"_pane").fadeOut(200);
-    }
-  );
-  }
-
   pane_toggler_button("album");
   pane_toggler_button("group");
   pane_toggler_button("photo");
@@ -113,3 +101,16 @@ $(document).ready(function(){
   });
 
 });//end document ready
+
+
+function pane_toggler_button( name ) {
+    $("#add_" + name + "_button").toggle(
+    function(evt){
+      evt.preventDefault();
+      $("#add_" + name + "_pane").fadeIn(300);
+    },function(evt){
+      evt.preventDefault();
+      $("#add_" + name +"_pane").fadeOut(200);
+    }
+  );
+}