diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1f931324..af183104 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -189,26 +189,26 @@ class ProjectsController < ApplicationController
update_state_counts
init_data_for_sidebar
- template = 'projects/update.js.erb'
+ template = 'projects/update'
# TODO: are these params ever set? or is this dead code?
elsif boolean_param('update_status')
- template = 'projects/update_status.js.rjs'
+ template = 'projects/update_status'
elsif boolean_param('update_default_context')
@initial_context_name = @project.default_context.name
- template = 'projects/update_default_context.js.rjs'
+ template = 'projects/update_default_context'
elsif boolean_param('update_default_tags')
- template = 'projects/update_default_tags.js.rjs'
+ template = 'projects/update_default_tags'
elsif boolean_param('update_project_name')
@projects = current_user.projects
- template = 'projects/update_project_name.js.rjs'
+ template = 'projects/update_project_name'
else
render :text => success_text || 'Success'
return
end
else
init_data_for_sidebar
- template = 'projects/update.js.erb'
+ template = 'projects/update'
end
respond_to do |format|
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 227ea004..95fa8b6f 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -30,8 +30,8 @@ class StatsController < ApplicationController
# convert to array and fill in non-existing months
@actions_done_last12months_array = convert_to_months_from_today_array(@actions_done_last12months, 13, :completed_at)
@actions_created_last12months_array = convert_to_months_from_today_array(@actions_created_last12months, 13, :created_at)
- @actions_done_last12monthsPlus3_array = convert_to_months_from_today_array(@actions_done_last12monthsPlus3, 13, :completed_at)
- @actions_created_last12monthsPlus3_array = convert_to_months_from_today_array(@actions_created_last12monthsPlus3, 15, :created_at)
+ @actions_done_last12monthsPlus3_array = convert_to_months_from_today_array(@actions_done_last12monthsPlus3, 16, :completed_at)
+ @actions_created_last12monthsPlus3_array = convert_to_months_from_today_array(@actions_created_last12monthsPlus3, 16, :created_at)
# find max for graph in both arrays
@max = [@actions_done_last12months_array.max, @actions_created_last12months_array.max].max
@@ -446,8 +446,8 @@ class StatsController < ApplicationController
@seconds_per_day = 60*60*24
# define cut_off date and discard the time for a month, 3 months and a year
- @cut_off_year = 13.months.ago.beginning_of_day
- @cut_off_year_plus3 = 16.months.ago.beginning_of_day
+ @cut_off_year = 12.months.ago.beginning_of_day
+ @cut_off_year_plus3 = 15.months.ago.beginning_of_day
@cut_off_month = 1.month.ago.beginning_of_day
@cut_off_3months = 3.months.ago.beginning_of_day
end
diff --git a/app/helpers/recurring_todos_helper.rb b/app/helpers/recurring_todos_helper.rb
index b972abf3..ce78a1a8 100644
--- a/app/helpers/recurring_todos_helper.rb
+++ b/app/helpers/recurring_todos_helper.rb
@@ -26,7 +26,7 @@ module RecurringTodosHelper
edit_recurring_todo_path(@recurring_todo),
:class => "icon edit_icon", :id => "link_edit_recurring_todo_#{@recurring_todo.id}")
else
- str = '' + image_tag("blank.png") + " "
+ str = content_tag(:a, image_tag("blank.png"), :class => "icon")
end
str
end
diff --git a/app/views/projects/_project_state_group.html.erb b/app/views/projects/_project_state_group.html.erb
index b90371b2..ad33de3b 100644
--- a/app/views/projects/_project_state_group.html.erb
+++ b/app/views/projects/_project_state_group.html.erb
@@ -10,7 +10,7 @@
<%= t('common.last' ) unless ( ['review','stalled','blocked','current'].include?(state) )%>
<%= t('states.'+state+'_plural' )%>
- <%= t('common.projects') %><%= total_count==-1 ? "" : " ("+link_to(t('common.show_all'), done_projects_path)+")"%>
+ <%= t('common.projects') %><%= total_count==-1 ? "" : " (#{link_to(t('common.show_all'), done_projects_path)})".html_safe%>
<% unless suppress_sort_menu %>
diff --git a/app/views/projects/update.js.erb b/app/views/projects/update.js.erb
index eeaf7021..6d166252 100644
--- a/app/views/projects/update.js.erb
+++ b/app/views/projects/update.js.erb
@@ -87,7 +87,7 @@ function html_for_project_listing() {
}
function html_for_sidebar() {
- return "<%= source_view_is(:project) ? escape_javascript(render(:file => 'sidebar/sidebar.html.erb')) : "" %>";
+ return "<%= source_view_is(:project) ? escape_javascript(render(:file => 'sidebar/sidebar')) : "" %>";
}
function html_for_project_settings() {
diff --git a/app/views/stats/actions_done_last_years.html.erb b/app/views/stats/actions_done_last_years.html.erb
index 0b67a545..105a7356 100644
--- a/app/views/stats/actions_done_last_years.html.erb
+++ b/app/views/stats/actions_done_last_years.html.erb
@@ -1,2 +1,2 @@
<%= render :partial => 'chart', :locals => {:width => @chart_width, :height => @chart_height, :data => url_for(:action => :actions_done_lastyears_data)} -%>
-<%= t('stats.click_to_return', :link => link_to(t('stats.click_to_return_link'), {:controller => "stats", :action => "index"})) %>
+<%= raw t('stats.click_to_return', :link => link_to(t('stats.click_to_return_link'), stats_path)) %>
diff --git a/app/views/stats/done.html.erb b/app/views/stats/done.html.erb
index 155daccf..d8cf6a1f 100644
--- a/app/views/stats/done.html.erb
+++ b/app/views/stats/done.html.erb
@@ -36,7 +36,7 @@
<% if @last_completed_recurring_todos.empty? -%>
<%= t('projects.no_last_completed_recurring_todos') %>
-<%= t('stats.click_to_update_actions') %> <%= t('stats.click_to_return', :link => link_to(t('stats.click_to_return_link'), {:controller => "stats", :action => "index"})) %>
+<%= t('stats.click_to_update_actions') %> <%= raw t('stats.click_to_return', :link => link_to(t('stats.click_to_return_link'), stats_path)) %>
<%
unless @further
-%>
-<%= t('stats.click_to_show_actions_from_week',
- :link => link_to("here", {:controller => "stats", :action => "show_selected_actions_from_chart", :id=>"#{params[:id]}_end", :index => params[:index]}),
+<%= raw t('stats.click_to_show_actions_from_week',
+ :link => link_to("here", show_actions_from_chart_path(:id=>"#{params[:id]}_end", :index => params[:index])),
:week => params[:index])
-%>
<%
diff --git a/app/views/todos/done.html.erb b/app/views/todos/done.html.erb
index aecc4b2a..ce6875a6 100644
--- a/app/views/todos/done.html.erb
+++ b/app/views/todos/done.html.erb
@@ -26,6 +26,6 @@
<% end -%>
-
<%= t('todos.see_all_completed', :link => link_to(t("todos.all_completed_here"), determine_all_done_path)) %>
+<%= raw t('todos.see_all_completed', :link => link_to(t("todos.all_completed_here"), determine_all_done_path)) %>
diff --git a/config/routes.rb b/config/routes.rb
index 9c6068ac..973c36f4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,19 +66,41 @@ Tracksapp::Application.routes.draw do
match "tickler" => "todos#list_deferred"
match 'review' => "projects#review"
match 'calendar' => "todos#calendar"
- match 'stats' => 'stats#index'
+ match 'data' => "data#index"
match 'done' => "stats#done", :as => 'done_overview'
+
match 'integrations' => "integrations#index"
match 'integrations/rest_api' => "integrations#rest_api", :as => 'rest_api_docs'
match 'integrations/cloudmailin' => 'integrations#cloudmailin'
match 'integrations/search_plugin.xml' => "integrations#search_plugin", :as => 'search_plugin'
match 'integrations/google_gadget.xml' => 'integrations#google_gadget', :as => 'google_gadget'
+ match 'integrations/get_applescript1.js' => 'integrations#get_applescript1'
+ match 'integrations/get_applescript2.js' => 'integrations#get_applescript2'
+ match 'integrations/get_quicksilver_applescript.js' => 'integrations#get_quicksilver_applescript'
+
match 'preferences' => "preferences#index"
match 'preferences/render_date_format' => "preferences#render_date_format"
+
match 'feeds' => "feedlist#index", :as => 'feeds'
match 'feedlist/get_feeds_for_context' => 'feedlist#get_feeds_for_context'
match 'feedlist/get_feeds_for_project' => 'feedlist#get_feeds_for_project'
- match 'data' => "data#index"
+
+ match 'stats' => 'stats#index'
+ match 'stats/actions_done_last12months_data' => 'stats#actions_done_last12months_data'
+ match 'stats/actions_done_last_years' => 'stats#actions_done_last_years'
+ match 'stats/actions_done_lastyears_data' => 'stats#actions_done_lastyears_data'
+ match 'stats/actions_done_last30days_data' => 'stats#actions_done_last30days_data'
+ match 'stats/actions_completion_time_data' => 'stats#actions_completion_time_data'
+ match 'stats/actions_running_time_data' => 'stats#actions_running_time_data'
+ match 'stats/actions_visible_running_time_data' => 'stats#actions_visible_running_time_data'
+ match 'stats/actions_open_per_week_data' => 'stats#actions_open_per_week_data'
+ match 'stats/context_total_actions_data' => 'stats#context_total_actions_data'
+ match 'stats/context_running_actions_data' => 'stats#context_running_actions_data'
+ match 'stats/actions_day_of_week_all_data' => 'stats#actions_day_of_week_all_data'
+ match 'stats/actions_day_of_week_30days_data' => 'stats#actions_day_of_week_30days_data'
+ match 'stats/actions_time_of_day_all_data' => 'stats#actions_time_of_day_all_data'
+ match 'stats/actions_time_of_day_30days_data' => 'stats#actions_time_of_day_30days_data'
+ match 'stats/show_selected_actions_from_chart/:id' => 'stats#show_selected_actions_from_chart', :as => 'show_actions_from_chart'
resources :contexts do
member do
diff --git a/features/step_definitions/todo_steps.rb b/features/step_definitions/todo_steps.rb
index 2ccdccd5..5e0c548f 100644
--- a/features/step_definitions/todo_steps.rb
+++ b/features/step_definitions/todo_steps.rb
@@ -108,7 +108,7 @@ Then /^I should see the page selector$/ do
end
Then /^the page should be "([^"]*)"$/ do |page_number|
- page.find(:xpath, ".//span[@class='current']").text.should == page_number
+ page.find(:xpath, ".//em[@class='current']").text.should == page_number
end
Then /^the project field of the new todo form should contain "([^"]*)"$/ do |project_name|
diff --git a/features/view_done.feature b/features/view_done.feature
index bda393be..f74bc346 100644
--- a/features/view_done.feature
+++ b/features/view_done.feature
@@ -113,7 +113,7 @@ Feature: Show done
Then I should be on the done recurring todos page
And the page should be "2"
- @javascript @wip
+ @javascript
Scenario: I can toggle a done recurring todo active from done page
Given I have a completed repeat pattern "test pattern"
When I go to the done recurring todos page
@@ -181,6 +181,7 @@ Feature: Show done
When I go to the projects page
Then I should see "completed project"
+ @wip
Scenario Outline: All pages are internationalized
Given I set the locale to ""
When I go to the
diff --git a/public/stylesheets/images/next.png b/public/stylesheets/images/next.png
deleted file mode 100644
index 62e10cfe..00000000
Binary files a/public/stylesheets/images/next.png and /dev/null differ
diff --git a/public/stylesheets/images/previous.png b/public/stylesheets/images/previous.png
deleted file mode 100644
index 839117bc..00000000
Binary files a/public/stylesheets/images/previous.png and /dev/null differ
diff --git a/vendor/assets/swfs/expressInstall.swf b/public/swfs/expressInstall.swf
similarity index 100%
rename from vendor/assets/swfs/expressInstall.swf
rename to public/swfs/expressInstall.swf
diff --git a/vendor/assets/swfs/open-flash-chart.swf b/public/swfs/open-flash-chart.swf
similarity index 100%
rename from vendor/assets/swfs/open-flash-chart.swf
rename to public/swfs/open-flash-chart.swf