Merge branch 'nccu_fix' of github.com:Rulingcom/NCCU into nccu_fix_matt

app/views/admin/assets/file_upload.html.erb

@@ -3,7 +3,7 @@
 
 <%= flash_messages %>
 
-<%= form_for :asset, :url => admin_assets_path(:uploader => true), :remote => true do |f| %>
+<%= form_for :asset, :url => admin_assets_path(:uploader => true), :html => {:id => 'ajaxForm', :multipart => 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">
-            <%= f.submit t(:create), :class => "btn btn-primary" %>
+            <a id='ajax_form_submit' class="btn btn-primary"><%= t(:create) %></a>
         </div>
     </div>