Merge branch 'master' of github.com:TracksApp/tracks

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

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.

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;
         });