app/views/file_upload/_browse.html.erb app/views/file_upload/_directory.html.erb public/images/admin/Thumbs.db public/images/admin/delete.gif public/images/admin/directory.gif public/images/admin/file.gif public/images/admin/newDirectory.gif public/images/admin/up.gif @@ -1,28 +1,108 @@ class FileUploadController < ApplicationController - protect_from_forgery :except => [:upload] + protect_from_forgery :except => [:upload, :new_folder, :destroy] skip_before_filter :authenticate skip_before_filter :set_current_user def upload + unless params[:path] =~ /public/ + render :nothing, :status => :forbidden + return false + end file_name = params[:Filename] counter = 1 while(true) begin - open("#{RAILS_ROOT}/public/uploads/File/#{file_name}", "rb") + open("#{params[:path]}/#{file_name}", "rb") rescue break end file_name = params[:Filename].reverse.sub('.', ".#{counter}_").reverse counter = counter + 1 end - open("#{RAILS_ROOT}/public/uploads/File/#{file_name}", "wb") do |f| + open("#{params[:path]}/#{file_name}", "wb") do |f| f.write params[:Filedata].read end render :nothing => true end def index + @dir = "#{RAILS_ROOT}/public/uploads" + @save_to = "/public/uploads" + @parent = "#{RAILS_ROOT}/public" + end + + def browse + unless params[:path] =~ /public/ + render :nothing, :status => :forbidden + return false + end + @dir = params[:path] + + @save_to = @dir.split('/') + i = 0 + while i < @save_to.length do + if @save_to[i] == 'public' + break + end + i = i + 1 + end + @save_to = "/" + File.join( @save_to.last(@save_to.length - i) ) + + @parent = @dir.split('/') + @parent.pop + @parent = @parent.join('/') + + render :update do |page| + page.replace 'browse_dialog', :partial => 'browse' + end + end + + def new_folder + unless params[:path] =~ /public/ + render :nothing, :status => :forbidden + return false + end + + error = false + begin + FileUtils.mkdir(File.join(params[:path], params[:folder_name])) + rescue Exception => e + render :update do |page| + error = true + page.call "alert", "an error occurred while creating the folder!!\nThe folder name might already exist" + end + end + + unless error + render :update do |page| + page.insert_html :top, 'dir_entries', :partial => 'directory', :locals => {:dir => params[:path], :filename => params[:folder_name]} + page.visual_effect :highlight, "directory_#{params[:folder_name]}" + end + end + end + + def destroy + unless params[:path] =~ /public/ + render :nothing, :status => :forbidden + return false + end + + error = false + begin + FileUtils.remove_file( File.join(params[:path], params[:file]) ) + rescue Exception => e + render :update do |page| + error = true + page.call "alert", "an error occurred while deleting this file!!" + end + end + + unless error + render :update do |page| + page.visual_effect :fade, "directory_#{params[:file]}", :afterFinish => "function(){$('directory_#{params[:file]}').remove();}" + end + end end end app/controllers/file_upload_controller.rb @@ -1,7 +1,16 @@ <script type="text/javascript" src="/swfupload/swfupload.js"></script> <script type="text/javascript" src="/swfupload/plugins/swfupload.queue.js"></script> <script type="text/javascript"> + Ajax.Responders.register({ + onCreate: function() { + document.body.style.cursor = 'progress'; + }, + onComplete: function() { + document.body.style.cursor = ''; + } + }); var uploader; + var currentPath = "#{RAILS_ROOT}/public/uploads" window.onload = function() { var settings = { @@ -19,6 +28,7 @@ debug: false, file_queued_handler : fileQueued, + file_dialog_start_handler: fileDialogStart, file_dialog_complete_handler : fileDialogComplete, upload_start_handler : uploadStart, upload_progress_handler : uploadProgress, @@ -30,6 +40,12 @@ }; + fileDialogStart = function(){ + uploader.removePostParam('path'); + uploader.addPostParam('path', currentPath); + //uploader.settings.upload_url = "/files/upload?path=" + currentPath; + } + fileDialogComplete = function(numberSelected, numberQueued){ uploader.startUpload(); $('cancel_upload').disabled = false; @@ -65,23 +81,152 @@ $('queue_entry_' + file.id).className = "done"; new Effect.Highlight("queue_entry_" + file.id); } + + browse = function(path){ + new Ajax.Request("/files/browse", { + method: 'get', + parameters: {'path': path} + }); + } + + newFolder = function(path){ + folderName = prompt("Folder name:"); + if (folderName == ""){ + return false; + } + new Ajax.Request("/files/new_folder", { + method: 'post', + parameters: {'path': path, 'folder_name': folderName}, + evalScript: true + }); + } + + deleteFile = function(path, file){ + new Ajax.Request("/files/delete", { + method: 'post', + parameters: {'path': path, 'file': file}, + evalScript: true + }); + } + </script> <style> -h3{background:#f5f1e2; margin:20px 20px 10px 20px; border:1px solid #cdc295; font-size:1.4em; padding:10px;} -.upload-content{background:#f5f1e2; margin:0px 20px; border:1px solid #cdc295;} -.upload-content p{margin:3px 5px; background:#FFFFFF; padding:10px; border:1px solid #cdc295; font-size:0.9em; clear:both} -.upload-content p.done{background:#e9ffd2; color:#2d8a00;} -.upload-content p.uploading{background:#fffee7;} -.upload-content p.cancelled{background:#fff4ef; color:#c12d00;} +body{font-family:Arial, Helvetica, sans-serif;} +h3 { +background:#f5f1e2; +margin:20px 20px 10px 20px; +border:1px solid #cdc295; +font-size:1.4em; +padding:10px; +} +.upload-content { +background:#f5f1e2; +margin:0px 20px; +border:1px solid #cdc295; +} +.upload-content p { +margin:3px 5px; +background:#FFFFFF; +padding:10px; +border:1px solid #cdc295; +font-size:0.9em; +clear:both +} +.upload-content p.done { +background:#e9ffd2; +color:#2d8a00; +} +.upload-content p.uploading { +background:#fffee7; +} +.upload-content p.cancelled { +background:#fff4ef; +color:#c12d00; +} +.upload-fileName { +font-weight:bold; +} +.upload-fileSize { +width:100px; +text-align:right; +color:#666666; +font-size:0.9em; +} +.upload-fileStatus { +width:180px; +text-align:right; +float:right; +margin:-20px 10px 0px 0px; +display:inline; +} +.upload-message { +padding:10px 0px 10px 20px; +clear:both; +background:#feffce; +border:1px solid #fff177; +margin:10px 20px; +} +#parent_dir{ +margin:3px 20px; +border-bottom:1px solid #CCCCCC; +font-size:0.9em; +} +#parent_dir A{ +background:url(../../images/admin/up.gif) no-repeat 5px 5px; +padding:5px 0px 5px 25px; +display:block; +color:#000000; +text-decoration:none; +font-weight:bold; +} +#parent_dir A:hover{ +background:url(../../images/admin/up.gif) no-repeat 5px 5px #F0F0F0; +} + +#new_dir{ +margin:20px 20px; +border-top:1px solid #CCCCCC; +font-size:0.9em; +} +#new_dir A{ +background:url(../../images/admin/newDirectory.gif) no-repeat 5px 5px; +padding:5px 0px 5px 25px; +display:block; +color:#000000; +text-decoration:none; +font-weight:bold; +} +#new_dir A:hover{ +background:url(../../images/admin/newDirectory.gif) no-repeat 5px 5px #F0F0F0; +} -.upload-fileName{font-weight:bold;} -.upload-fileSize{ width:100px; text-align:right;color:#666666; font-size:0.9em;} -.upload-fileStatus{ width:180px; text-align:right; float:right; margin:-20px 10px 0px 0px; display:inline;} -.upload-message{ padding:10px 0px 10px 20px; clear:both; background:#feffce;border:1px solid #fff177; margin:10px 20px;} +#dir_entries p{ +margin:5px 20px; +font-size:0.9em; +} +#dir_entries p a{ +background:url(../../images/admin/directory.gif) no-repeat 2px 3px; +padding:2px 5px 2px 22px; +font-weight:bold; +} +#dir_entries p a:hover{ +text-decoration:none; +background:url(../../images/admin/directory.gif) no-repeat 2px 3px #F0F0F0; +} +#dir_entries p span{ +display:block; +background:url(../../images/admin/file.gif) no-repeat 2px 3px; +padding:2px 5px 2px 22px; +} +#dir_entries p span img{ +vertical-align:middle; +cursor:pointer; +margin:1px 0px 0px 4px; </style> -<div id="content"> +<%= render :partial => 'browse' %> +<div> <div> <h3>Upload Queue</h3> <div id="upload_queue" class="upload-content"></div> app/views/file_upload/index.html.erb @@ -2,7 +2,10 @@ class UploadManagerExtension < Radiant::Extension define_routes do |map| + map.connect 'files/browse', :controller => 'file_upload', :action => 'browse' map.connect 'files/upload', :controller => 'file_upload', :action => 'upload' + map.connect 'files/new_folder', :controller => 'file_upload', :action => 'new_folder' + map.connect 'files/delete', :controller => 'file_upload', :action => 'destroy' map.connect 'admin/upload_manager', :controller => 'file_upload', :action => 'index' end upload_manager_extension.rb 7a210c61d844b4d3b5a8013d5b8119c8114d1e69 unknown haitham.mohammad@espace.com.eg http://github.com/espace/radiant-upload-manager/commit/01f14379f9d93088263678b2e2dd7dc0398f996c 01f14379f9d93088263678b2e2dd7dc0398f996c 2008-10-07T04:51:38-07:00 2008-10-07T04:51:38-07:00 added a dialog for browsing the server and creating new folders and deleting existing files eb4f81cab20c87b2bbd57b79d8a0b2d6b3091f99 unknown haitham.mohammad@espace.com.eg