From 9ad5760a68b07fcc0df79e9ae8e31c56873476ce Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 13 Nov 2009 17:33:35 -0800 Subject: examples/rails_app-2.3.4: show links to different interfaces --- examples/rails_app-2.3.4/app/views/files/index.html.erb | 15 ++++++++++++--- examples/rails_app-2.3.4/app/views/files/new.html.erb | 15 +++++++++++++++ examples/rails_app-2.3.4/app/views/files/pull.html.erb | 14 ++++++++++++++ 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 = { } -%>

-This is a demo of upr in action. -Much of this (including all JS) was stolen from the mongrel_upload_progress -examples. + This is a demo of upr in action. + Much of this (including all JS) was stolen from the mongrel_upload_progress + examples. +

+

+ Also, see the jQuery-compatible interface + that's also compatible with upload progress modules for nginx and lighttpd. +

+

+ Last but not least, check out the Ajax.Pull + example that uses a single, streaming HTTP response to interatively + send progress updates.

<%= link_to upid, :action => 'status', :upload_id => upid %>

<% 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] %>

<%= flash[:notice] %>

<% end %> +

+ This is a demo of upr in action. + Much of this (including all JS) was stolen from the + jQuery-upload-progress +

+

+ Also, see the mongrel_upload_progress-compatible version +

+

+ Last but not least, check out the Ajax.Pull + example that uses a single, streaming HTTP response to interatively + send progress updates. +

+
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] %>
<%= flash[:notice] %>
<% end %> +

+ This is a demo of upr in action + with Ajax.Pull. It only uses a single, streaming AJAX request instead + of pulling. It is based on mongrel_streaming_upload_progress +

+

+ This is different from the polling + mongrel_upload_progress-compatible version + and also different from the polling + jQuery+nginx/lighttpd-compatible version +

+

<%= link_to "#{upid} (single)", :action => 'status', :upload_id => upid %>

<%= link_to "#{upid} (stream)", -- cgit v1.2.3-24-ge0c7