app/views/videos/get_flash_version.html.erb public/images/upload_button.png public/javascripts/flash_detect.js public/javascripts/v10/.svn/all-wcprops public/javascripts/v10/.svn/entries public/javascripts/v10/.svn/format public/javascripts/v10/.svn/text-base/fileprogress.js.svn-base public/javascripts/v10/.svn/text-base/handlers.js.svn-base public/javascripts/v10/.svn/text-base/swfupload.js.svn-base public/javascripts/v10/.svn/text-base/swfupload.queue.js.svn-base public/javascripts/v10/fileprogress.js public/javascripts/v10/handlers.js public/javascripts/v10/swfupload.js public/javascripts/v10/swfupload.queue.js public/javascripts/v9/.svn/all-wcprops public/javascripts/v9/.svn/entries public/javascripts/v9/.svn/format public/javascripts/v9/.svn/text-base/fileprogress.js.svn-base public/javascripts/v9/.svn/text-base/handlers.js.svn-base public/javascripts/v9/.svn/text-base/swfupload.js.svn-base public/javascripts/v9/.svn/text-base/swfupload.queue.js.svn-base public/javascripts/v9/fileprogress.js public/javascripts/v9/handlers.js public/javascripts/v9/swfupload.js public/javascripts/v9/swfupload.queue.js public/resources/v10/.svn/all-wcprops public/resources/v10/.svn/entries public/resources/v10/.svn/format public/resources/v10/.svn/prop-base/swfupload.swf.svn-base public/resources/v10/.svn/text-base/swfupload.swf.svn-base public/resources/v10/swfupload.swf public/resources/v9/.svn/all-wcprops public/resources/v9/.svn/entries public/resources/v9/.svn/format public/resources/v9/.svn/prop-base/swfupload.swf.svn-base public/resources/v9/.svn/text-base/swfupload.swf.svn-base public/resources/v9/swfupload.swf @@ -8,7 +8,7 @@ class VideosController < ApplicationController @upload_url = "http://api.ankoder.com/files/upload" respond_to do |want| - want.html + want.html { params[:swfv] || render(:template => 'videos/get_flash_version') } want.rss {render :layout => false} end end app/controllers/videos_controller.rb @@ -7,10 +7,7 @@ <title><%= @title || SITE_NAME %></title> <%= javascript_include_tag :defaults, 'jquery', 'thickbox', 'truncator', :cache=>true %> <%= javascript_include_tag 'swfobject' %> - <%= javascript_include_tag 'swfupload', :cache=>true %> - <%= javascript_include_tag 'swfupload.queue', :cache=>true %> - <%= javascript_include_tag 'fileprogress', :cache=>true %> - <%= javascript_include_tag 'handlers', :cache=>true %> + <%= javascript_include_tag 'flash_detect' %> <%= stylesheet_link_tag 'reset', 'ie', 'application', :cache=>true %> <%= yield :head%> app/views/layouts/application.html.erb @@ -7,9 +7,14 @@ <legend>Upload Queue</legend> </fieldset> <div id="divStatus">0 Files Uploaded</div> - <div> - <input type="button" value="Upload file (Max 100 MB)" onclick="swfu.selectFiles()" style="font-size: 8pt;" /> - <input id="btnCancel" type="button" value="Cancel All Uploads" onclick="swfu.cancelQueue();" disabled="disabled" style="font-size: 8pt;" /> + + <div class="buttons"> + <% if params[:swfv] == '10' %> + <span id="spanButtonPlaceHolder"></span> + <% else %> + <a href="javascript:return false;" class="button" id="btnUpload" onclick="swfu.selectFiles();">Upload (Max 100MB)</a> + <% end %> + <a href="javascript:return false;" class="button" id="btnCancel" onclick="swfu.cancelQueue();" disabled="disabled">Cancel All Uploads</a> </div> </form> </div> @@ -35,27 +40,37 @@ } } - window.onload = function() { - swfu = new SWFUpload({ + function init() { + var settings = { + flash_url : "/resources/v<%= params[:swfv] %>/swfupload.swf", upload_url : "<%= @upload_url %>", file_post_name : 'file', post_params: {"access_key" : "<%= Ankoder::Configuration::access_key %>", //"success_redirect" : "<%= PROTOCOL_HOST_PORT + profile_videos_path(@p) %>", "failed_redirect" : "<%= PROTOCOL_HOST_PORT %>", "postback_url" : "<%= PROTOCOL_HOST_PORT + profile_videos_path(@p) %>" }, - flash_url : "/resources/swfupload_f9.swf", - file_size_limit : "1024000", //1000MB - file_types : "*.avi;*.wmv;*.mov;*.mp4;*.mpg;*.3gp;*.flv", + file_size_limit : "100 MB", //100MB + file_types : "*.avi;*.wmv;*.mov;*.mp4;*.mpg;*.3gp;*.flv,*.rmvb,*.rm", file_types_description : "video files only", file_upload_limit : "5", - file_queue_limit : "5", + file_queue_limit : "0", custom_settings : { progressTarget : "fsUploadProgress", cancelButtonId : "btnCancel" }, + // Button settings + button_image_url: "/images/upload_button.png", // Relative to the Flash file + button_width: "150", + button_height: "20", + button_placeholder_id: "spanButtonPlaceHolder", + button_text: '<span class="theFont">Upload (Max 100MB)</span>', + button_text_style: ".theFont { font-size: 12; }", + button_text_left_padding: 12, + button_text_top_padding: 1, + file_queued_handler : fileQueued, file_queue_error_handler : fileQueueError, file_dialog_complete_handler : fileDialogComplete, @@ -70,7 +85,15 @@ // degraded_container_id : fileUIElement, // debug: true, // debug_handler: swfDebug - }); + }; + + swfu = new SWFUpload(settings); }; + if(document.addEventListener) { + document.addEventListener("DOMContentLoaded", init, false); + } else { + window.onload = init; + } + </script> app/views/videos/_form.html.erb @@ -1,5 +1,9 @@ <% content_for :head do -%> +<%= javascript_include_tag "v#{params[:swfv]}/swfupload" %> +<%= javascript_include_tag "v#{params[:swfv]}/swfupload.queue.js" %> +<%= javascript_include_tag "v#{params[:swfv]}/fileprogress" %> +<%= javascript_include_tag "v#{params[:swfv]}/handlers" %> <%= auto_discovery_link_tag :rss, formatted_profile_videos_url(@profile, :rss), :title=>"#{@profile.f}'s Videos" %> <% end -%> app/views/videos/index.html.erb @@ -14,10 +14,10 @@ config.action_controller.perform_caching = false config.action_view.debug_rjs = true # needed for Avatar::Source::RailsAssetSource -config.action_controller.asset_host = "http://localhost:3000" +config.action_controller.asset_host = "http://218.109.71.111:3000" # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = true config.action_mailer.delivery_method = :test -PROTOCOL_HOST_PORT = "http://localhost:3000" +PROTOCOL_HOST_PORT = "http://218.109.71.111:3000" config/environments/development.rb @@ -512,6 +512,40 @@ margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = d background-color: #F0F5FF; } +/* button styles */ +.buttons { + margin-top: 10px; + height: 60px; +} +a.button, a.buttonDis { + display: block; + float: left; + background-color: transparent; + background-image: url(/images/upload_button.png); + background-repeat: no-repeat; + width: 150; + height: 20; + margin: 2px auto; + padding: 2px 0 0 0; + text-align: center; + font-family: Helvetica, Calibri, Arial, sans-serif; + font-size: 100%; + font-weight: bold; + text-decoration: none; +} +a.button:link, a.button:visited { + color: #002577; +} +a.button:hover, a.button:active { + background-position: 0 -20px; + color: #FF7200; +} +a.buttonDis:link, a.buttonDis:visited, a.buttonDis:hover, a.buttonDis:active { + background-position: 0 -40px; + color: #5F5F5F; + cursor: default; +} + .progressName { font-size: 8pt; font-weight: 700; public/stylesheets/application.css ffc51e975cfa619f75afdaa8b1d10cbe1c57024f Jan X jan.h.xie@gmail.com http://github.com/janx/lovd-by-less/commit/4d60a98fd3b5f4bfb73955eceb31184c7d7fec9c 4d60a98fd3b5f4bfb73955eceb31184c7d7fec9c 2008-11-05T00:15:52-08:00 2008-11-05T00:15:52-08:00 compatible swfupload for flash v9 and v10 cfe9817b44c117e7f633f7749727f99ff64e4345 Jan X jan.h.xie@gmail.com