From 2904bc953246278487cb3697361c061f8c79c4bc Mon Sep 17 00:00:00 2001
From: tim madden <tim@madden-mgmt.com>
Date: Fri, 11 Mar 2011 13:50:33 -0600
Subject: [PATCH 1/2] Adding more options for deferring + shortening the one
 day so it stops wrapping

---
 app/views/todos/_todo.html.erb |   2 ++
 config/locales/en.yml          |   2 +-
 public/images/defer_2.png      | Bin 0 -> 496 bytes
 public/images/defer_2_off.png  | Bin 0 -> 425 bytes
 public/images/defer_3.png      | Bin 0 -> 501 bytes
 public/images/defer_3_off.png  | Bin 0 -> 441 bytes
 6 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 public/images/defer_2.png
 create mode 100644 public/images/defer_2_off.png
 create mode 100644 public/images/defer_3.png
 create mode 100644 public/images/defer_3_off.png

diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb
index 0f95e258..6f7edbc6 100644
--- a/app/views/todos/_todo.html.erb
+++ b/app/views/todos/_todo.html.erb
@@ -17,6 +17,8 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
           <li><%= remote_delete_menu_item(todo) %></li>
           <% unless todo.completed? || todo.deferred? -%>
             <li><%= remote_defer_menu_item(1, todo) %></li>
+            <li><%= remote_defer_menu_item(2, todo) %></li>
+            <li><%= remote_defer_menu_item(3, todo) %></li>
             <li><%= remote_defer_menu_item(7, todo) %></li>
             <li><%= remote_promote_to_project_menu_item(todo) %></li>
           <% end -%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f356bfb3..14c8dcd6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -426,7 +426,7 @@ en:
     completed_last_x_days: Completed in the last %{count} days
     no_actions_with: Currently there are no incomplete actions with the tag '%{tag_name}'
     defer_x_days:
-      one: Defer one day
+      one: Defer 1 day
       other: Defer %{count} days
     added_new_next_action_singular: Added new next action
     no_completed_actions: Currently there are no completed actions.
diff --git a/public/images/defer_2.png b/public/images/defer_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c27b735bfcb92eb0a594ab6d2153a2d8e8b391bc
GIT binary patch
literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq000yK000mO1^@s678qX}00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10c}Y{K~y-6&6K-J15pr$zsYVS;<eDQowr^=^AKvS)(R;_#a;yw
zf)_%30L2$DXd{S~t!QaL7A2rIu9wZ4O}wxkt1MZQD1;Oa9GEjReEeq)GoqBDkrrww
z4baOkB2t%JrIb_vMMN#C#ky39h$=z#zlzH(M2LR+(a<n4`QodhCIEbMi@yTrBJ*5%
zS9o}g>Z5EF*HHw!6!;X^b^~WtpY?ss(J%`pX=|TD>ww%xj_yJ?uI<)V=sY`tWP4YK
zA9HZnecS<{Q}4ux8eCh~<h^`tpl#&<NDZfG(OZayqiptVag)Cxkx2kxL=2XOmPuxk
z+&$e_w52L=`gjI_^mv-dqbWb%+t$NcY>mWOg7b%q3Ro4O9Y|)Mvwp0#sg>=qZB|ZK
zxU@2a31h$8e0ra?fv-=&9!~B}_<n3)gxi-};)8KNwtBM4#Sf)Ynq?7Dk%i`}&-lyU
mQbm7Sq<lFvV)W$SZ<}vopP}fGOssYQ0000<MNUMnLSTYq$kE0C

literal 0
HcmV?d00001

diff --git a/public/images/defer_2_off.png b/public/images/defer_2_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9ab3384965213a28279a33cd9dc70d452184479
GIT binary patch
literal 425
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq000yK000mO1^@s678qX}00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10VYXAK~y-6&6FYQ!cY{&fA>F&AmX-QS&;=lj9){9VH#VtxVmN+
zG;LiF{1z()gGrOa^@Y8E@-a|!ioui4yPS78_rkrRl;WHC`>Gqzsy{^Jqqs^bxib_I
zHJMC4N+lxdX4-lsuEQ`4hQlFMRdF~RsH*Bt^VST5Ai!}P27>`%7(UcIHS~R7bIY>W
z@AvF>JGR>`0R4XdJwwwpHNRf3Y&IJJY}=;S>roWN-Jgdu48xFiyNzwz%w{vr=QGRY
zQm67fkJV~LS(eQV<2VLjKA#gsk*+(A!+1Pqy<T%X9v^n~wB^g?qIsv&VLF|XBnf$*
z)9rRK45L}X8y1U&=C13K=Q*R%NY~Od<#akVH>@MeGO{dtsgwF~_{QqV&tIE=x!GmX
TWP+<!00000NkvXXu0mjfsamss

literal 0
HcmV?d00001

diff --git a/public/images/defer_3.png b/public/images/defer_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c8c68ee73edfddf31f6edbe557574dce1892774
GIT binary patch
literal 501
zcmV<R0Sf+!P)<h;3K|Lk000e1NJLTq000yK000mO1^@s678qX}00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10dh%1K~y-6&6K}OLQxdQKgV8V3Dsa)V^fw0(b(W#bLLumgY*};
zITYo;;Ly+ytfipMO%Q{I2rMum8tPfR9=$Blcbk0pc$gp!ec`~l_kQ_sIQO0_N-6$Q
zzCWb_TK7Uk1}ax6B_5!NsBN`9P*ozLI#8{jxm!aF5g~$&O@#_Jw#VZFep!uQfhm8A
z>-IH4nPNfaIru*CcwCoa8I~)yv@Iw1nLY|;fph(wlln1p5^>IYR%pJNuEX)*gtKR2
z^28I-K$Nvmg0tsSkKY3{^mhQVOIZS1fY5M=o!MQgA5}89833LeFBI(}@lc$@yCYh5
zt3Pn#aub03YM#W!IsgG}jERv+%K8=Mhbv<77}Kp8ZeDMC_t4M{SJd8WPTn%x>@V-p
zG@AH7M+p1Fl<rFyy5Ry!XY@ow1=B%KPr9`-w?c9;iPf~om2;FHO90f<b?0%rfd16z
rufSgV$~L^f4s;M;_vp#L|80H%u~@qhbGq<d00000NkvXXu0mjfpbXZS

literal 0
HcmV?d00001

diff --git a/public/images/defer_3_off.png b/public/images/defer_3_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fee21333b722e6a6e94c773a9ddd40b0d5a9634
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000yK000mO1^@s678qX}00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10X9iQK~y-6&6Kf<!axv)zc~Vl#KN$(t-|)cgs)(g#!3*u)<#=9
zdmCTC!p=ev1lu%eQ!J^{SO_9W_9}ySO7z6y{_0=&_hV*YMy$1bQePjX0nY71MBXab
zS}S)z5wYEF_pPc##9pD!v+%7P$3bgNp6A4IOrGa=nLo|2-|wT8LTgQ@(|MRF1r7#-
z!dI(RcDo&$&4$%#h1U9U7iGX82nv5Z9@+2rG#U-s?KbQ6`gP!NIHXdkpp;@X8j+?c
z^Z6Wr)9FMU$Fy24w%aY2%jG$6I-LSA9*>z!CIEPzhwu9sV=%_hY&NOa>m*6?<8SE<
zvn(sT=XvycJzUqNR;!_u!Wi>f%U8{2v%((^2bRkvVHk2gpIIyxckMm}{#F!4L{U_l
jk=x_&iPe*Te{H@2Qz3CU3n93s00000NkvXXu0mjfhX}h9

literal 0
HcmV?d00001


From f7faef3c91dc1e3e7eb08c6b1ace7e7d1dc3cb68 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Wed, 4 Jan 2012 16:05:11 +0100
Subject: [PATCH 2/2] fix #1203. The fix of #1152 works for IE7 too.

---
 public/javascripts/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 232ae12c..5c2302f8 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1318,7 +1318,7 @@ function enable_rich_interaction(){
 $(document).ready(function() {
 
     // fix for IE8. Without this checkboxes don't work AJAXy. See #1152
-    if($.browser.msie && ($.browser.version.substring(0, 2) == "8.")) {
+    if($.browser.msie && ( ($.browser.version.substring(0, 2) == "8.") || ($.browser.version.substring(0, 2) == "7.") ) ) {
         $('body').bind('change', function() {
             return true;
         });