Index: app/controllers/welcome_controller.rb =================================================================== --- app/controllers/welcome_controller.rb (revision 14859) +++ app/controllers/welcome_controller.rb (working copy) @@ -20,7 +20,9 @@ def index @news = News.latest User.current - @projects = Project.latest User.current + @trackers = Tracker.sorted.to_a + @open_issues_by_tracker = Issue.visible.open.group(:tracker).count + @total_issues_by_tracker = Issue.visible.group(:tracker).count end def robots Index: app/views/projects/show.html.erb =================================================================== --- app/views/projects/show.html.erb (revision 14859) +++ app/views/projects/show.html.erb (working copy) @@ -41,36 +41,7 @@ <% if User.current.allowed_to?(:view_issues, @project) %>

<%=l(:label_issue_tracking)%>

- <% if @trackers.present? %> - - - - - - - - - - - <% @trackers.each do |tracker| %> - "> - - - - - - <% end %> - -
<%=l(:label_open_issues_plural)%><%=l(:label_closed_issues_plural)%><%=l(:label_total)%>
- <%= link_to tracker.name, project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %> - - <%= link_to @open_issues_by_tracker[tracker].to_i, project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %> - - <%= link_to (@total_issues_by_tracker[tracker].to_i - @open_issues_by_tracker[tracker].to_i), project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id, :status_id => 'c') %> - - <%= link_to @total_issues_by_tracker[tracker].to_i, project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id, :status_id => '*') %> -
- <% end %> + <%= render :partial => 'issues/total_issues_list', :locals => {:project => @project, :trackers => @trackers, :open_issues_by_tracker => @open_issues_by_tracker, :total_issues_by_tracker => @total_issues_by_tracker} %>

<%= link_to l(:label_issue_view_all), project_issues_path(@project, :set_filter => 1) %> <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %> Index: app/views/welcome/index.html.erb =================================================================== --- app/views/welcome/index.html.erb (revision 14859) +++ app/views/welcome/index.html.erb (working copy) @@ -4,35 +4,33 @@

<%= textilizable Setting.welcome_text %>
- <% if @news.any? %> -
-

<%=l(:label_news_latest)%>

- <%= render :partial => 'news/news', :collection => @news %> - <%= link_to l(:label_news_view_all), :controller => 'news' %> -
- <% end %> <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
- <% if @projects.any? %> -
-

<%=l(:label_project_latest)%>

- -
<% end %> - <%= call_hook(:view_welcome_index_right, :projects => @projects) %> + <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
<% content_for :header_tags do %>