about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-11-10 16:50:32 -0800
committerEric Wong <normalperson@yhbt.net>2009-11-10 16:58:17 -0800
commit5968b5e5518f2f743cdbfed7d58a4cbe8f0d1e5e (patch)
tree0e885a3fc870b565b86023af9fc24706ef1ce0b7
parent08eb440031f388687a1e2bf93b7232cc0955664f (diff)
downloadupr-5968b5e5518f2f743cdbfed7d58a4cbe8f0d1e5e.tar.gz
demo: links to and from the demo site, cleanup output
Explain what the user will be seeing.
-rw-r--r--README6
-rw-r--r--examples/rails_app-2.3.4/app/controllers/files_controller.rb2
-rw-r--r--examples/rails_app-2.3.4/app/views/files/index.html.erb8
3 files changed, 13 insertions, 3 deletions
diff --git a/README b/README
index ca41e10..d743e7d 100644
--- a/README
+++ b/README
@@ -5,6 +5,12 @@ monitoring.  It is based on the "mongrel_upload_progress" module, but
 allows any Moneta-backing store in additon to DRb.  There is also a
 packaged example for using an ActiveRecord model for Rails.
 
+== Demo
+
+You can see upr it in action at http://upr-demo.bogomips.org/
+It will report the size and SHA1 of the file you've uploaded.
+Much of the demo was stolen from mongrel_upload_progress.
+
 == Web Server Compatibility
 
 While upr is completely Rack::Lint-compatible, upr is only compatible
diff --git a/examples/rails_app-2.3.4/app/controllers/files_controller.rb b/examples/rails_app-2.3.4/app/controllers/files_controller.rb
index 4efc115..6509a71 100644
--- a/examples/rails_app-2.3.4/app/controllers/files_controller.rb
+++ b/examples/rails_app-2.3.4/app/controllers/files_controller.rb
@@ -33,10 +33,8 @@ class FilesController < ApplicationController
     end
     size = file.stat.size
     File.unlink(file.path)
-    dump = Rack::Utils.escape_html(params.inspect)
     render :text => "sha1: #{digest.hexdigest}<br />" \
                     "size: #{size}<br />" \
-                    "params: #{dump}<br />" \
                     '<script type="text/javascript">' \
                     'window.parent.UploadProgress.finish();</script>'
   end
diff --git a/examples/rails_app-2.3.4/app/views/files/index.html.erb b/examples/rails_app-2.3.4/app/views/files/index.html.erb
index b604ee0..fe7cfc5 100644
--- a/examples/rails_app-2.3.4/app/views/files/index.html.erb
+++ b/examples/rails_app-2.3.4/app/views/files/index.html.erb
@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <title>upr test</title>
+    <title>upr test, http://upr.bogomips.org/</title>
     <%= javascript_include_tag :all %>
 <style type="text/css">
 #progress-bar {
@@ -41,6 +41,11 @@ opt = {
   :onsubmit => "UploadProgress.monitor('#{escape_javascript(upid)}')"
 }
 -%>
+<p>
+This is a demo of <a href="http://upr.bogomips.org/">upr</a> in action.
+Much of this (including all JS) was stolen from the mongrel_upload_progress
+examples.
+</p>
 <p><%= link_to upid, :action => 'status', :upload_id => upid %></p>
 <% form_tag(act, opt) do %>
   <div id="file-fields">
@@ -54,6 +59,7 @@ opt = {
 <div id="results"></div>
 <div id="progress-bar"></div>
 
+<p>The size and SHA1 of the file you uploaded should appear here</p>
 <iframe id="upload" name="upload" src="about:blank"></iframe>
 
   </body>