Add spinners to all AJAX requests and prevent accidental double-clicks

app/controllers/addresses_controller.rb

@@ -1,12 +1,10 @@
 class AddressesController < ApplicationController
-  respond_to :json
-
   def show
     @address = Address.find_lat_lng("#{params[:address]}, #{params[:city_state]}")
     unless @address.blank?
-      respond_with @address
+      render(:json => @address)
     else
-      render :json => {"errors" => {"address" => ["Could not find address."]}}
+      render(:json => {"errors" => {"address" => ["Could not find address."]}})
     end
   end
 end

app/controllers/hydrants_controller.rb

@@ -3,15 +3,15 @@ def show
     @hydrant = Hydrant.find_by_id(params[:hydrant_id])
     if @hydrant.adopted?
       if user_signed_in? && current_user.id == @hydrant.user_id
-        render(:partial => "users/thank_you")
+        render("users/thank_you", :layout => "info_window")
       else
-        render(:partial => "users/profile")
+        render("users/profile", :layout => "info_window")
       end
     else
       if user_signed_in?
-        render(:partial => "adopt")
+        render("adopt", :layout => "info_window")
       else
-        render(:partial => "users/new")
+        render("users/new", :layout => "info_window")
       end
     end
   end

app/controllers/passwords_controller.rb

@@ -1,10 +1,7 @@
 class PasswordsController < Devise::PasswordsController
-  respond_to :json, :only => [:create, :update]
-
   # POST /resource/password
   def create
     self.resource = resource_class.send_reset_password_instructions(params[resource_name])
-
     if resource.errors.empty?
       render(:json => {"success" => true})
     else
@@ -22,7 +19,6 @@ def edit
   # PUT /resource/password
   def update
     self.resource = resource_class.reset_password_by_token(params[resource_name])
-
     if resource.errors.empty?
       render(:json => {"success" => true})
     else

app/controllers/users_controller.rb

@@ -1,12 +1,12 @@
 class UsersController < Devise::RegistrationsController
   def edit
-    render_with_scope :edit
+    render("edit", :layout => "info_window")
   end
 
   def update
     if resource.update_with_password(params[resource_name])
-      sign_in resource_name, resource, :bypass => true
-      redirect_to :controller => "hydrants", :action => "show", :hydrant_id => params[:hydrant_id]
+      sign_in(resource_name, resource, :bypass => true)
+      redirect_to(:controller => "hydrants", :action => "show", :hydrant_id => params[:hydrant_id])
     else
       clean_up_passwords(resource)
       render(:json => {"errors" => resource.errors})

app/views/hydrants/_adopt.html.erb → app/views/hydrants/adopt.html.erb

@@ -2,7 +2,7 @@
   <h2>Adopt this Hydrant</h2>
   <%= f.hidden_field "id" %>
   <%= f.hidden_field "user_id", :value => current_user.id %>
-  <%= f.label "name", "Give your hydrant a name", :id => "hydrant_name_label" %>
+  <%= f.label "name", "Give this hydrant a name", :id => "hydrant_name_label" %>
   <%= f.text_field "name", :tabindex => 1 %>
   <%= f.submit "Adopt!", :tabindex => 2, :id => "adoption_form_submit" %>
   <p>By adopting this hydrant, you agree to the <%= link_to "Terms of Service", "#", :tabindex => 3 %>.</p>

app/views/layouts/info_window.html.erb

@@ -0,0 +1,6 @@
+<div id="loader" style="display: none;">
+  <img src="/images/ajax-loader.gif" />
+</div>
+<div id="info_window">
+  <%= yield %>
+</div>