about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-11-13 17:33:35 -0800
committerEric Wong <normalperson@yhbt.net>2009-11-13 17:33:35 -0800
commit9ad5760a68b07fcc0df79e9ae8e31c56873476ce (patch)
tree1e29a9d7bae527eb0564926498b505223ccfc394
parent73ebdaf0445beb90a8397ca4a3ac05885b6b89fc (diff)
downloadupr-9ad5760a68b07fcc0df79e9ae8e31c56873476ce.tar.gz
examples/rails_app-2.3.4: show links to different interfaces
-rw-r--r--examples/rails_app-2.3.4/app/views/files/index.html.erb15
-rw-r--r--examples/rails_app-2.3.4/app/views/files/new.html.erb15
-rw-r--r--examples/rails_app-2.3.4/app/views/files/pull.html.erb14
3 files changed, 41 insertions, 3 deletions
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 4982076..01d2a25 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
@@ -43,9 +43,18 @@ opt = {
 }
 -%>
 <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.
+  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>
+  Also, see the <a href="/files/new">jQuery-compatible interface</a>
+  that's also compatible with upload progress modules for nginx and lighttpd.
+</p>
+<p>
+  Last but not least, check out the <a href="/files/pull">Ajax.Pull</a>
+  example that uses a single, streaming HTTP response to interatively
+  send progress updates.
 </p>
 <p><%= link_to upid, :action => 'status', :upload_id => upid %></p>
 <% form_tag(act, opt) do %>
diff --git a/examples/rails_app-2.3.4/app/views/files/new.html.erb b/examples/rails_app-2.3.4/app/views/files/new.html.erb
index 42f5f27..f5ecb5b 100644
--- a/examples/rails_app-2.3.4/app/views/files/new.html.erb
+++ b/examples/rails_app-2.3.4/app/views/files/new.html.erb
@@ -41,6 +41,21 @@
     <% if flash[:notice] %>
     <h1><%= flash[:notice] %></h1>
     <% end %>
+<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
+  <a href="http://github.com/drogus/jquery-upload-progress"
+  >jQuery-upload-progress</a>
+</p>
+<p>
+  Also, see the <a href="/">mongrel_upload_progress-compatible</a> version
+</p>
+<p>
+  Last but not least, check out the <a href="/files/pull">Ajax.Pull</a>
+  example that uses a single, streaming HTTP response to interatively
+  send progress updates.
+</p>
+
           <form id="upload" enctype="multipart/form-data" action="/files/new" method="post">
         <input name="data" type="file"/>
         <input type="submit" value="Upload"/>
diff --git a/examples/rails_app-2.3.4/app/views/files/pull.html.erb b/examples/rails_app-2.3.4/app/views/files/pull.html.erb
index 275704d..cf0958a 100644
--- a/examples/rails_app-2.3.4/app/views/files/pull.html.erb
+++ b/examples/rails_app-2.3.4/app/views/files/pull.html.erb
@@ -21,6 +21,20 @@ opt = {
     <% if flash[:notice] %>
       <div class="notice"><%= flash[:notice] %></div>
     <% end %>
+<p>
+  This is a demo of <a href="http://upr.bogomips.org/">upr</a> in action
+  with Ajax.Pull.  It only uses a single, streaming AJAX request instead
+  of pulling.  It is based on <a
+  href="http://rubyforge.org/pipermail/mongrel-users/2007-July/003747.html"
+  >mongrel_<b>streaming</b>_upload_progress</a>
+</p>
+<p>
+  This is different from the polling
+  <a href="/">mongrel_upload_progress-compatible</a> version
+  and also different from the polling
+  <a href="/files/new">jQuery+nginx/lighttpd-compatible</a> version
+</p>
+
     <p><%= link_to "#{upid} (single)",
           :action => 'status', :upload_id => upid %></p>
     <p><%= link_to "#{upid} (stream)",