first pass of all tests done

This commit is contained in:
Reinier Balt 2012-05-18 15:33:47 +02:00
parent 598891c1d3
commit 5e477a4d25
16 changed files with 46 additions and 23 deletions

View file

@ -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%>
</h2>
<% unless suppress_sort_menu %>

View file

@ -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() {

View file

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

View file

@ -36,7 +36,7 @@
<% if @last_completed_recurring_todos.empty? -%>
<div class="message"><p><%= t('projects.no_last_completed_recurring_todos') %></p></div>
<% else -%>
<%= render :partial => '/recurring_todos/recurring_todo', :collection => @last_completed_recurring_todos %>
<%= render :partial => @last_completed_recurring_todos %>
<% end -%>
</div>

View file

@ -1,12 +1,12 @@
<%= render :partial => 'chart', :locals => {:width => @chart_width, :height => @chart_height, :data => url_for(:action => @chart_name)} -%>
<br/>
<p>
<%= 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])
-%>
<%

View file

@ -26,6 +26,6 @@
<% end -%>
</div>
<p><%= t('todos.see_all_completed', :link => link_to(t("todos.all_completed_here"), determine_all_done_path)) %></p>
<p><%= raw t('todos.see_all_completed', :link => link_to(t("todos.all_completed_here"), determine_all_done_path)) %></p>
</div>