Fix remote upload file for tinymce
This commit is contained in:
		
							parent
							
								
									73b2cd1035
								
							
						
					
					
						commit
						9a103bbb7e
					
				
							
								
								
									
										1
									
								
								Gemfile
								
								
								
								
							
							
						
						
									
										1
									
								
								Gemfile
								
								
								
								
							| 
						 | 
					@ -26,6 +26,7 @@ gem 'mysql2'
 | 
				
			||||||
gem 'nokogiri'
 | 
					gem 'nokogiri'
 | 
				
			||||||
gem 'radius'
 | 
					gem 'radius'
 | 
				
			||||||
gem 'rake'
 | 
					gem 'rake'
 | 
				
			||||||
 | 
					gem 'remotipart'
 | 
				
			||||||
gem 'resque' # background jobs
 | 
					gem 'resque' # background jobs
 | 
				
			||||||
gem 'resque-scheduler' # job scheduling
 | 
					gem 'resque-scheduler' # job scheduling
 | 
				
			||||||
gem 'resque-restriction'
 | 
					gem 'resque-restriction'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,4 +17,4 @@
 | 
				
			||||||
//= require side_bar_history
 | 
					//= require side_bar_history
 | 
				
			||||||
//= require rss
 | 
					//= require rss
 | 
				
			||||||
//= require ajax_form
 | 
					//= require ajax_form
 | 
				
			||||||
//= require inc/ajax_setting
 | 
					//= require jquery.remotipart
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<%= flash_messages %>
 | 
					<%= 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">
 | 
					    <div class="modal-header">
 | 
				
			||||||
        <h3><%= t 'admin.file_upload' %></h3>
 | 
					        <h3><%= t 'admin.file_upload' %></h3>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
| 
						 | 
					@ -51,7 +51,7 @@
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <div style="position: absolute; width: 100%; bottom: 0;">
 | 
					    <div style="position: absolute; width: 100%; bottom: 0;">
 | 
				
			||||||
        <div class="modal-footer">
 | 
					        <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>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue