From 33d7341b6d3b41ffeba2a52d9473c6bda27d0dda Mon Sep 17 00:00:00 2001 From: lukemelia Date: Tue, 10 Jul 2007 03:54:53 +0000 Subject: [PATCH] Integrated protoload.js to facilitate easier ajax indicators. Use it on the Add New Action form, and also prevent use of the form while an action is being added via Ajax. The latter aspect fixes #339. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@562 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/views/layouts/standard.rhtml | 1 + .../app/views/shared/_add_new_item_form.rhtml | 12 +-- tracks/public/images/bigBlackWaiting.gif | Bin 0 -> 3236 bytes tracks/public/images/bigWaiting.gif | Bin 0 -> 3236 bytes tracks/public/images/blackWaiting.gif | Bin 0 -> 1877 bytes tracks/public/images/waiting.gif | Bin 0 -> 1877 bytes tracks/public/javascripts/protoload.js | 82 ++++++++++++++++++ tracks/public/stylesheets/standard.css | 27 ++++++ 8 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 tracks/public/images/bigBlackWaiting.gif create mode 100644 tracks/public/images/bigWaiting.gif create mode 100644 tracks/public/images/blackWaiting.gif create mode 100644 tracks/public/images/waiting.gif create mode 100644 tracks/public/javascripts/protoload.js diff --git a/tracks/app/views/layouts/standard.rhtml b/tracks/app/views/layouts/standard.rhtml index a06a0283..e59ab075 100644 --- a/tracks/app/views/layouts/standard.rhtml +++ b/tracks/app/views/layouts/standard.rhtml @@ -14,6 +14,7 @@ <%= javascript_include_tag "accesskey-hints" %> <%= javascript_include_tag "todo-items" %> <%= javascript_include_tag "niftycube" %> + <%= javascript_include_tag "protoload" %> <%= auto_discovery_link_tag(:rss,{:controller => "feed", :action => "na_feed", :name => "#{@user.login}", :token => "#{@user.word}"}, {:title => "RSS feed of next actions"}) %> diff --git a/tracks/app/views/shared/_add_new_item_form.rhtml b/tracks/app/views/shared/_add_new_item_form.rhtml index be16896c..0b0d279e 100644 --- a/tracks/app/views/shared/_add_new_item_form.rhtml +++ b/tracks/app/views/shared/_add_new_item_form.rhtml @@ -20,10 +20,12 @@
- <% form_remote_tag( :url => todos_path, :method => :post, - :html=> { :id=>'todo-form-new-action', :name=>'todo', :class => 'inline-form' }) do -%> + :html=> { :id=>'todo-form-new-action', :name=>'todo', :class => 'inline-form' }, + :before => "$('todo_new_action_submit').startWaiting()", + :complete => "$('todo_new_action_submit').stopWaiting()", + :condition => "!$('todo_new_action_submit').isWaiting()") do -%>
<%= error_messages_for("item", :object_name => 'action') %>
@@ -83,16 +85,16 @@ if (contextNamesForAutoComplete.length > 1 || contextNamesForAutoComplete[0].len
-
-<% end -%> +<% end -%> <%= calendar_setup( "todo_due" ) %> <%= calendar_setup( "todo_show_from" ) %> -
+ \ No newline at end of file diff --git a/tracks/public/images/bigBlackWaiting.gif b/tracks/public/images/bigBlackWaiting.gif new file mode 100644 index 0000000000000000000000000000000000000000..f12cca47ffa5b9bbb30ac972607b4bbf823ed7f9 GIT binary patch literal 3236 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 literal 0 HcmV?d00001 diff --git a/tracks/public/images/waiting.gif b/tracks/public/images/waiting.gif new file mode 100644 index 0000000000000000000000000000000000000000..5e62d01af9e52f328d4bae7018d881773d914290 GIT binary patch literal 1877 zcma*oYfw{H9suy`z31lM+(&YWkp@KP5`rcnApt^&V%?kYe#in&%`v14+=VU>~!I#pEg&B$QT4YOLW%R#ynA&WON7xSAk$N^O zCzCzU+-|e7SyoFctBcnLCTu%kIc#NXUT2LBmd^ZU%i(z2t98v#^fSOG0z0UJ=LatU zp&cv>!~E#arr~rGe#baElO5$*z3ZP9UA<+QL*7bv`kBu;_GdT5#>Zt(M+>L8jo(QR zxtv#vV)%c0XmV7hp1()lPPiz?6sBmRMr8C>u#Z!8JIG&2!qd%a9DlxB(LSak5tV|(@` z96!g*buMPY4u9KA9x>zE(izi-(g675Z+_xF{<64kI1J>&)lvi{>_n2uRq6l?AP1_t z^Lcco{^T3oU1tsFQYunHQaXc_kEj3zq~jSYnYb_OW@+evEC2O;Xe z8noF!zmXUhnn*et4qtj{baDj zb1k9a=cT~P9cjzfXgbV4>GRa}#GLe;){mcx2?^*40)DRw0Gv|XwGp|jB#x(2_TsCt zuzM~>%bPlDzQ`^`?!H|+A)g9I#&bC?YUj-tZe16NBQ*)PY>18-@S7J)u0(nOV*1oq z0)%wiQMa@f!%$0sO+#T-7^P4QsWBYNw>BQ*V`P)YpZT`9nJ3$mJ0@IhH<&1OMw zYG9@61S?-w`s6>Dk}E_Bk}V7DZ_5|{l4Gfl=4G9^Z0(eEEj-E94p?vMm;78w_n{dS zZ0O#*k>0e>7b_Fo`_-3r2}STLF*FN8I{AG1D8$8qZa`765PLC>z!FZW`5BgExKR<> zvKbl0l(E=k70@NJhpTPJ4F5vcXYf);)f8YA5NRHq}7R znm=?#`B2sTtp{NdzOf7QABOwxZCzWD^F`R*#kn0UAaPzSu^+)`93?3tQ3)_1?1gzk zo08;fP;@Ud5hp{C_RyNP;H%lxG*(=eJtP)#nU;#*_*N?x=yn`_tCflwscf ziOAu;FLp`x5q*xqYyXH4)z4F