<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/controllers/application_controller.rb</filename>
    </added>
    <added>
      <filename>public/panda_uploader.swf</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -23,6 +23,7 @@ class VideosController &lt; ApplicationController
   def upload
     @video = Video.find(params[:id])
     @upload_form_url = %(http://#{Panda.api_domain}:#{Panda.api_port}/videos/#{@video.panda_id}/form)
+    @upload_dest_url = %(http://#{Panda.api_domain}:#{Panda.api_port}/videos/#{@video.panda_id}/upload)
   end
   
   def done</diff>
      <filename>app/controllers/videos_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1 +1,24 @@
-&lt;iframe src=&quot;&lt;%= @upload_form_url %&gt;&quot; width=&quot;400&quot; height=&quot;100&quot; frameborder=&quot;0&quot;&gt;&lt;/iframe&gt;
\ No newline at end of file
+&lt;h2&gt;Normal upload&lt;/h2&gt;
+
+&lt;iframe src=&quot;&lt;%= @upload_form_url %&gt;&quot; width=&quot;400&quot; height=&quot;100&quot; frameborder=&quot;0&quot;&gt;&lt;/iframe&gt;
+
+&lt;h2&gt;Flash upload&lt;/h2&gt;
+
+&lt;object id=&quot;main&quot; width=&quot;500&quot; height=&quot;100&quot;
+	codebase=&quot;http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab&quot;&gt;
+	&lt;param name=&quot;movie&quot; value=&quot;/panda_uploader.swf&quot; /&gt;
+	&lt;param name=&quot;quality&quot; value=&quot;high&quot; /&gt;
+	&lt;param name=&quot;bgcolor&quot; value=&quot;#ffffff&quot; /&gt;
+	&lt;param name=&quot;allowScriptAccess&quot; value=&quot;sameDomain&quot; /&gt;
+	&lt;param name=&quot;flashVars&quot; value=&quot;uploadDest=&lt;%= @upload_dest_url %&gt;&quot; /&gt;
+	&lt;embed src=&quot;/panda_uploader.swf&quot; quality=&quot;high&quot; bgcolor=&quot;#ffffff&quot;
+	  flashVars=&quot;uploadDest=&lt;%= @upload_dest_url %&gt;&quot;
+		width=&quot;500&quot; height=&quot;100&quot; name=&quot;main&quot; align=&quot;middle&quot;
+		play=&quot;true&quot;
+		loop=&quot;false&quot;
+		quality=&quot;high&quot;
+		allowScriptAccess=&quot;sameDomain&quot;
+		type=&quot;application/x-shockwave-flash&quot;
+		pluginspage=&quot;http://www.adobe.com/go/getflashplayer&quot;&gt;
+	&lt;/embed&gt;
+&lt;/object&gt;
\ No newline at end of file</diff>
      <filename>app/views/videos/upload.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -60,4 +60,4 @@ end
 
 # Include your application configuration below
 require 'panda'
-require 'panda_config'
\ No newline at end of file
+require 'config/panda_config'
\ No newline at end of file</diff>
      <filename>config/environment.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>app/controllers/application.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>ffe4cbec1de5d1084dbdbab5e063217b0797426d</id>
    </parent>
  </parents>
  <author>
    <name>Damien Tanner</name>
    <email>damien@new-bamboo.co.uk</email>
  </author>
  <url>http://github.com/newbamboo/panda_example_rails/commit/3905e51f5c4c687a02abb2992f6dc751ffbdfcdd</url>
  <id>3905e51f5c4c687a02abb2992f6dc751ffbdfcdd</id>
  <committed-date>2009-03-30T05:07:53-07:00</committed-date>
  <authored-date>2009-03-30T05:07:53-07:00</authored-date>
  <message>Added example using Flex uploader available here: http://github.com/newbamboo/panda_flex_uploader</message>
  <tree>c1b15793375ef538138b80cbabdcc2335b1275c3</tree>
  <committer>
    <name>Damien Tanner</name>
    <email>damien@new-bamboo.co.uk</email>
  </committer>
</commit>
