# HG changeset patch # User Chris Cannam # Date 1352482864 0 # Node ID 4ffe9098c16c93e0d9f86d1b3332e923e308cd70 # Parent 85123e5bc883652254bbcf625977efbf54ea799b Busy-projects partial, etc diff -r 85123e5bc883 -r 4ffe9098c16c app/views/activities/_busy.html.erb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/views/activities/_busy.html.erb Fri Nov 09 17:41:04 2012 +0000 @@ -0,0 +1,58 @@ +<% events = @events_by_day %> +<% max = 5 %> +<% if (events.nil?) + activity = Redmine::Activity::Fetcher.new(User.current) + events = activity.events(Date.today - 14, Date.today + 1) + end +%> + +<% if events.empty? %> + +<% else %> + + +<% end %> diff -r 85123e5bc883 -r 4ffe9098c16c app/views/projects/_latest.html.erb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/views/projects/_latest.html.erb Fri Nov 09 17:41:04 2012 +0000 @@ -0,0 +1,21 @@ + diff -r 85123e5bc883 -r 4ffe9098c16c app/views/welcome/index.html.erb --- a/app/views/welcome/index.html.erb Fri Nov 09 16:33:06 2012 +0000 +++ b/app/views/welcome/index.html.erb Fri Nov 09 17:41:04 2012 +0000 @@ -31,6 +31,11 @@ <%= render :partial => 'projects/tagcloud' %> <%= link_to l(:label_projects_more), :controller => 'projects' %> +
+

<%=l(:label_projects_busy)%>

+ <%= render :partial => 'activities/busy' %> + <%= link_to l(:label_projects_more), :controller => 'projects' %> +
<% end %> <%= call_hook(:view_welcome_index_right, :projects => @projects) %> diff -r 85123e5bc883 -r 4ffe9098c16c config/locales/en.yml --- a/config/locales/en.yml Fri Nov 09 16:33:06 2012 +0000 +++ b/config/locales/en.yml Fri Nov 09 17:41:04 2012 +0000 @@ -494,7 +494,8 @@ label_project_all: All Projects label_project_latest: Latest projects label_projects_more: More projects - label_project_tags_all: Project tags + label_project_tags_all: Tags for projects + label_projects_busy: Busy projects label_managers: Managed by label_issue: Issue label_issue_new: New issue