From 9a103bbb7e832908657e265df1163d4da50b8f67 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 6 Aug 2012 15:13:21 +0800
Subject: [PATCH] Fix remote upload file for tinymce

---
 Gemfile                                     | 1 +
 app/assets/javascripts/new_admin.js         | 2 +-
 app/views/admin/assets/file_upload.html.erb | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9fb4c3cd6..6e07eafa6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,7 @@ gem 'mysql2'
 gem 'nokogiri'
 gem 'radius'
 gem 'rake'
+gem 'remotipart'
 gem 'resque' # background jobs
 gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js
index 949753a9f..0c9f30dfa 100644
--- a/app/assets/javascripts/new_admin.js
+++ b/app/assets/javascripts/new_admin.js
@@ -17,4 +17,4 @@
 //= require side_bar_history
 //= require rss
 //= require ajax_form
-//= require inc/ajax_setting
+//= require jquery.remotipart
diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb
index abdcfbc6c..d267b6743 100644
--- a/app/views/admin/assets/file_upload.html.erb
+++ b/app/views/admin/assets/file_upload.html.erb
@@ -3,7 +3,7 @@
 
 <%= flash_messages %>
 
-<%= form_for :asset, :url => admin_assets_path(:uploader => true), :html => {:id => 'ajaxForm', :multipart => true } do |f| %>
+<%= form_for :asset, :url => admin_assets_path(:uploader => true), :remote => true do |f| %>
     <div class="modal-header">
         <h3><%= t 'admin.file_upload' %></h3>
     </div>
@@ -51,7 +51,7 @@
     </div>
     <div style="position: absolute; width: 100%; bottom: 0;">
         <div class="modal-footer">
-            <a id='ajax_form_submit' class="btn btn-primary"><%= t(:create) %></a>
+            <%= f.submit t(:create), :class => "btn btn-primary" %>
         </div>
     </div>