0
@@ -7,7 +7,7 @@ class BookmarksController < Base::ProjectSubpage
0
         flash[:success] = "#{@project.title} is now bookmarked."
0
         redirect_to @project 
0
       end
0
-      format.js { render_bookmark_control }
0
+      format.ajax { render_bookmark_control }
0
     end
0
   end
0
   
0
@@ -19,7 +19,7 @@ class BookmarksController < Base::ProjectSubpage
0
         flash[:success] = "#{@project.title} is no longer bookmarked."
0
         redirect_to @project         
0
       end
0
-      format.js { render_bookmark_control }
0
+      format.ajax { render_bookmark_control }
0
     end
0
   end
0
   

0
@@ -3,12 +3,9 @@ class ProjectsController < ApplicationController
0
     build_gallery(gallery_projects)
0
     @upcoming = Project.upcoming(:limit => AppConfig.project_list_max)
0
     respond_to do |format|
0
-      format.html do
0
-        if params[:ajax]
0
-          render :partial => "projects/parts/grid", :locals => {:projects => @projects}, :layout => false
0
-        else
0
-          render
0
-        end
0
+      format.html
0
+      format.ajax do
0
+        render :partial => "projects/parts/grid.html.haml", :locals => {:projects => @projects}, :layout => false
0
       end
0
       format.atom
0
     end
0
@@ -22,13 +19,11 @@ class ProjectsController < ApplicationController
0
       format.html do
0
         @grid_title = "Upcoming Projects"
0
         @grid_rss = formatted_upcoming_projects_url(:atom)
0
-
0
         @hide_upcoming = true
0
-        if params[:ajax]
0
-          render :partial => "projects/parts/grid", :locals => {:projects => @projects}, :layout => false
0
-        else
0
-          render :action => "index"
0
-        end
0
+        render :action => "index"
0
+      end
0
+      format.ajax do
0
+        render :partial => "projects/parts/grid.html.haml", :locals => {:projects => @projects}, :layout => false
0
       end
0
       format.atom
0
     end
0
@@ -95,7 +90,7 @@ class ProjectsController < ApplicationController
0
     return unless verify_owner(@project)
0
     
0
     respond_to do |format|
0
-      format.js do
0
+      format.ajax do
0
         render :partial => "projects/form.html.haml", :layout => false, :locals => {:ajax => true}
0
       end
0
       format.html
0
@@ -111,7 +106,7 @@ class ProjectsController < ApplicationController
0
     flash[:success] = %("#{@project.title}" has been updated. )
0
     
0
     respond_to do |format|
0
-      format.js do
0
+      format.ajax do
0
         render :partial => "projects/parts/ajax_result.html.haml", :locals => {:message => flash[:success]}
0
         flash.discard
0
       end
0
@@ -176,7 +171,7 @@ class ProjectsController < ApplicationController
0
       format.html do
0
         redirect_to @project
0
       end
0
-      format.js do 
0
+      format.ajax do 
0
         render :text => "", :layout => false
0
       end
0
     end
0
@@ -198,7 +193,7 @@ class ProjectsController < ApplicationController
0
         flash.keep
0
         redirect_to @project
0
       end
0
-      format.js do
0
+      format.ajax do
0
         render :partial => "projects/parts/about_project.html.haml", :locals => {:project => @project, :hidden => true}, :layout => false
0
       end
0
     end
0
@@ -213,7 +208,7 @@ class ProjectsController < ApplicationController
0
       format.html do
0
         redirect_to root_url
0
       end
0
-      format.js do
0
+      format.ajax do
0
         render :partial => "bookmarks/bookmark_list.html.haml", :layout => false, :locals => {:projects => @my_projects}        
0
       end
0
     end    
0
@@ -294,7 +289,7 @@ class ProjectsController < ApplicationController
0
       # render an output
0
       respond_to do |format|        
0
         flash[:error] = "You don't have access to edit this application."
0
-        format.js do
0
+        format.ajax do
0
           render :text => flash[:error], :layout => false
0
           flash.discard
0
         end

0
@@ -44,15 +44,14 @@ class UsersController < ApplicationController
0
     respond_to do |format|
0
       format.html do
0
         @grid_title = helpers.pluralize(@user.projects.count, "Bookmarked Project")
0
-        if params[:ajax]
0
-          render :partial => "projects/parts/grid", :locals => {:projects => @bookmarked_projects}, :layout => false
0
+      end
0
+      format.ajax do
0
+        if params[:show] == "about"
0
+          render :partial => "users/parts/about_user.html.haml", :locals => {:user => @user}, :layout => false
0
         else
0
-          render
0
+          render :partial => "projects/parts/grid.html.haml", :locals => {:projects => @bookmarked_projects}, :layout => false
0
         end
0
       end
0
-      format.js do
0
-        render :partial => "users/parts/about_user", :locals => {:user => @user}, :layout => false
0
-      end
0
     end
0
   end
0
   
0
@@ -60,24 +59,14 @@ class UsersController < ApplicationController
0
     @user = find_user
0
     return unless verify_owner(@user)
0
     
0
-    respond_to do |format|
0
-      format.html
0
-      format.js do
0
-        render :partial => "users/form", :locals => {:user => @user, :ajax => true}, :layout => false
0
-      end
0
-    end
0
+    render :partial => "users/form.html.haml", :locals => {:user => @user, :ajax => true}, :layout => false
0
   end
0
   
0
   def edit_password
0
     @user = find_user
0
     return unless verify_owner(@user)
0
 
0
-    respond_to do |format|
0
-      format.html
0
-      format.js do
0
-        render :partial => "users/parts/password_form", :locals => {:user => @user, :ajax => true}, :layout => false
0
-      end
0
-    end
0
+    render :partial => "users/parts/password_form.html.haml", :locals => {:user => @user, :ajax => true}, :layout => false
0
   end
0
   
0
   def update
0
@@ -106,15 +95,8 @@ class UsersController < ApplicationController
0
       flash[:error] = error_msg
0
     end
0
     
0
-    respond_to do |format|
0
-      format.js do
0
-        render :partial => "users/parts/ajax_result.html.haml", :locals => {:message => (flash[:error] || flash[:success])}
0
-        flash.discard
0
-      end
0
-      format.html do
0
-        redirect_to @user
0
-      end
0
-    end
0
+    render :partial => "users/parts/ajax_result.html.haml", :locals => {:message => (flash[:error] || flash[:success])}
0
+    flash.discard
0
   end
0
 
0
   
0
@@ -217,7 +199,7 @@ class UsersController < ApplicationController
0
       # render an output
0
       respond_to do |format|        
0
         flash[:error] = "You don't have access to edit this profile."
0
-        format.js do
0
+        format.ajax do
0
           render :text => flash[:error], :layout => false
0
           flash.discard
0
         end

0
@@ -22,5 +22,5 @@
0
   .actions
0
     = f.submit "Update Information"
0
     or
0
-    = link_to "cancel", @project, :class => "cancel"
0
+    = link_to "cancel", formatted_project_url(@project, :ajax), :class => "cancel"
0
     = progress
0
\ No newline at end of file

0
@@ -4,7 +4,7 @@
0
   .reload
0
     #about_project{hide_if(hidden)}
0
       - if true or project.owned_by?(current_or_anon_user)
0
-        .top-actions= link_to "Edit...", edit_project_url(project), :class => "edit"
0
+        .top-actions= link_to "Edit...", formatted_edit_project_url(project, :ajax), :class => "edit"
0
 
0
       %h3== #{project.title} Details
0
       .display

0
@@ -1,2 +1,2 @@
0
 = local_assigns[:message]
0
-= link_to "Continue...", details_project_url(@project), :class => "restore"
0
\ No newline at end of file
0
+= link_to "Continue...", formatted_details_project_url(@project, :ajax), :class => "restore"
0
\ No newline at end of file

0
@@ -19,5 +19,5 @@
0
   .actions
0
     = f.submit "Update Information"
0
     or
0
-    = link_to "cancel", formatted_user_url(user, local_assigns[:ajax] ? :js : :html), :class => "restore"
0
+    = link_to "cancel", user_url(:id => user, :show => "about", :format => local_assigns[:ajax] ? :ajax : :html), :class => "restore"
0
     = progress
0
\ No newline at end of file

0
@@ -11,7 +11,6 @@
0
           %strong Name:
0
           =h default(user.name, "[Not Entered]")
0
           
0
-          
0
           = br      
0
           %strong Email:
0
           =h default(user.email, "[Not Entered]")
0
@@ -32,9 +31,9 @@
0
             = br
0
           
0
           %strong
0
-            = link_to "Edit Profile", edit_user_url(user), :class => "edit"
0
+            = link_to "Edit Profile", formatted_edit_user_url(user, :ajax), :class => "edit"
0
             |
0
-            = link_to "Change Password", edit_password_user_url(user), :class => "edit"
0
+            = link_to "Change Password", formatted_edit_password_user_url(user, :ajax), :class => "edit"
0
 
0
       .form-container.hidden
0
       = clear

0
@@ -1,2 +1,2 @@
0
 = local_assigns[:message]
0
-= link_to "Continue...", formatted_user_url(@user, :js), :class => "restore"
0
\ No newline at end of file
0
+= link_to "Continue...", user_url(:id => @user, :show => "about", :format => :ajax), :class => "restore"
0
\ No newline at end of file

0
@@ -14,5 +14,5 @@
0
   .actions
0
     = f.submit "Change Password"
0
     or
0
-    = link_to "cancel", formatted_user_url(user, local_assigns[:ajax] ? :js : :html), :class => "restore"
0
+    = link_to "cancel", user_url(:id => user, :show => "about", :format => :ajax ), :class => "restore"
0
     = progress
0
\ No newline at end of file

0
@@ -3,3 +3,5 @@
0
 # Add new mime types for use in respond_to blocks:
0
 # Mime::Type.register "text/richtext", :rtf
0
 # Mime::Type.register_alias "text/html", :iphone
0
+
0
+Mime::Type.register_alias "text/html", :ajax

0
@@ -67,7 +67,7 @@ $j(document).ready(function() {
0
   
0
   // wire up ajax-forms
0
   $j('form.ajax-form').livequery(function(){
0
-    $j(this).ajaxForm({target: $j(this).parents(".form-container")});
0
+    $j(this).ajaxForm({data: {format: "ajax"}, target: $j(this).parents(".form-container")});
0
   }, function(){ });
0
 
0
   $j('form.ajax-form').livequery("submit", function(){
0
@@ -87,7 +87,7 @@ $j(document).ready(function() {
0
 
0
   // update bookmarks
0
   function updateBookmarkPanel() {
0
-    $j("#my_bookmarks").load("/bookmarks?format=js");
0
+    $j("#my_bookmarks").load("/bookmarks?format=ajax");
0
   };
0
   
0
   // hook up bookmarking minipanel
0
@@ -101,7 +101,7 @@ $j(document).ready(function() {
0
       if($button.is(".add"))
0
       {
0
         // handle add bookmark ajax call
0
-        $j.post($button.attr("href"), "format=js", function(data) {
0
+        $j.post($button.attr("href"), "format=ajax", function(data) {
0
           $button.parents(".bookmark-mini").replaceWith($j(data));
0
           updateBookmarkPanel();
0
         });
0
@@ -109,7 +109,7 @@ $j(document).ready(function() {
0
       else
0
       {
0
         // handle remvoe ajax call
0
-        $j.post($button.attr("href"), "format=js&_method=delete", function(data) {
0
+        $j.post($button.attr("href"), "format=ajax&_method=delete", function(data) {
0
           $button.parents(".bookmark-mini").replaceWith($j(data));
0
           updateBookmarkPanel();
0
         });        

0
@@ -11,7 +11,7 @@ $j(document).ready(function() {
0
     $this = $j(this);
0
 
0
     $j("#project_info .display").slideUp('slow')
0
-    $j("#project_info .form-container").load($this.attr("href")+"?format=js", null, function() {
0
+    $j("#project_info .form-container").load($this.attr("href"), null, function() {
0
       $j(this).slideDown('slow');
0
     });
0
     $this.fadeOut();

0
@@ -12,7 +12,7 @@ $j(document).ready(function() {
0
     $this = $j(this);
0
 
0
     $j("#about_user .display").slideUp('slow')
0
-    $j("#about_user .form-container").load($this.attr("href")+"?format=js", null, function() {
0
+    $j("#about_user .form-container").load($this.attr("href"), function() {
0
       $j(this).slideDown('slow');
0
     });
0
     $this.fadeOut();
0
@@ -27,7 +27,7 @@ $j(document).ready(function() {
0
     var reload_url = $this.attr("href");
0
     $reload.find("#about_user").slideUp('slow', function() {
0
       $reload.empty();
0
-      $reload.load(reload_url, null, function() {
0
+      $reload.load(reload_url, function() {
0
         $j("#about_user").slideDown('slow');        
0
       });
0
     })

0
@@ -7,7 +7,7 @@ $j(document).ready(function() {
0
 
0
   // hook up ajax paging
0
   $j("#project_grid .pagination a").livequery('click', function() {
0
-    $j("#project_grid").load($j(this).attr("href")+"&ajax=true");    
0
+    $j("#project_grid").load($j(this).attr("href")+"&format=ajax");
0
     return false;
0
   });
0