DG IZ; fixed photos.

app/controllers/photos_controller.rb

@@ -30,7 +30,7 @@ class PhotosController < ApplicationController
   def new
     @photo = Photo.new
     @album = current_user.album_by_id(params[:album_id])
-    render :partial => "new_photo"
+    render :partial => 'new_photo'
   end
   
   def destroy

app/views/photos/_new_photo.haml

+:javascript
+  $(function() {
+    $("#photo_image").html5_upload({
+      // WE INSERT ALBUM_ID PARAM HERE
+      url: "/photos?album_id=#{@album.id}",   
+      sendBoundary: window.FormData || $.browser.mozilla,
+      onStart: function(event, total) {
+        return confirm("You are about to upload " + total + " photos. Are you sure?");
+      },
+      onFinish: function(event, total){
+        $("#add_photo_button .button").html( "Add Photos" );
+        $("#add_photo_loader").fadeOut(400);
+      },
+      onStart: function(event, total){
+        $("#add_photo_pane").fadeOut(400);
+        $("#add_photo_button .button").html( "Uploading Photos" );
+        $("#add_photo_loader").fadeIn(400);
+        return true;
+      }
+    });
+  });
+
 %h1
   %span{:id=>"photo_title_status"}
     Add photos to

public/javascripts/photos.js

@@ -17,35 +17,9 @@ $(document).ready(function(){
 });//end document ready
 
 function reset_photo_fancybox(){
-        album_id = $(".album_id")[0].id;
-        ajax = $.get("/photos/new?album_id=" + album_id, function(){
-          $("#new_photo_pane").html(ajax.responseText)
-        });
+    album_id = $(".album_id")[0].id;
+    ajax = $.get("/photos/new?album_id=" + album_id, function(){
+      $("#new_photo_pane").html(ajax.responseText)
+    });
 }
 
-$("#photo_image").html5_upload({
-  // WE INSERT ALBUM_ID PARAM HERE
-  url: "/photos?album_id="+$(".album_id")[0].id,   
-  sendBoundary: window.FormData || $.browser.mozilla,
-  setName: function(text) {
-    $("#progress_report_name").text(text);
-  },
-  onFinish: function(event, total){
-    $("#add_photo_button").html( "Add Photos" );
-    $("#add_photo_loader").fadeOut(400);
-
-    $("#photo_title_status").text("Done!");
-    $("#progress_report").html("Good job me!");
-
-    $("#add_photo_button").addClass("uploading_complete");
-   },
-  onStart: function(event, total){
-    $("#add_photo_button").html( "Uploading Photos" );
-    $("#add_photo_loader").fadeIn(400);
-
-    $("form.new_photo").fadeOut(0);
-    $("#progress_report").fadeIn(0);
-    $("#photo_title_status").text("Uploading...");
-    return true;
-  }
-});

public/stylesheets/application.css

@@ -412,6 +412,8 @@ h1.big_text {
   float: right; }
 
 .back {
+  margin: 0;
+  padding: 0;
   font-size: 12px;
   font-weight: normal; }