changeset 1031:873d052b361b cannam

Merge from browsing branch

--- a/app/views/activities/_busy.html.erb	Mon Nov 12 15:17:17 2012 +0000
+++ b/app/views/activities/_busy.html.erb	Tue Nov 13 10:37:06 2012 +0000
@@ -1,6 +1,6 @@
 <% events = @events_by_day %>
 <% if (events.nil?) 
-     activity = Redmine::Activity::Fetcher.new(User.current)
+     activity = Redmine::Activity::Fetcher.new(User.anonymous)
      events = activity.events(Date.today - 14, Date.today + 1)
    end
 %>

--- a/app/views/activities/_busy_institution.html.erb	Mon Nov 12 15:17:17 2012 +0000
+++ b/app/views/activities/_busy_institution.html.erb	Tue Nov 13 10:37:06 2012 +0000
@@ -1,7 +1,8 @@
 <% events = @events_by_day %>
 <% if (events.nil?) 
-     activity = Redmine::Activity::Fetcher.new(User.current)
-     events = activity.events(Date.today - 14, Date.today + 1)
+     activity = Redmine::Activity::Fetcher.new(User.anonymous)
+     days = Setting.activity_days_default.to_i
+     events = activity.events(Date.today - days, Date.today + 1)
    end
 %>
 
@@ -24,3 +25,4 @@
     <% end %>
   </ul>
 <% end %>
+

--- a/app/views/projects/explore.html.erb	Mon Nov 12 15:17:17 2012 +0000
+++ b/app/views/projects/explore.html.erb	Tue Nov 13 10:37:06 2012 +0000
@@ -1,23 +1,29 @@
 
+<% cache(:action => 'explore', :action_suffix => 'tags') do %>
 <h2><%= l(:label_explore_projects) %></h2>
-
   <div class="tags box">
   <h3><%=l(:label_project_tags_all)%></h3>
     <%= render :partial => 'projects/tagcloud' %>
   </div>
+<% end %>
+
 <div class="splitcontentleft">
+  <% cache(:action => 'explore', :action_suffix => 'busy_institutions') do %>
   <div class="institutions box">
   <h3><%=l(:label_institutions_busy)%></h3>
     <%= render :partial => 'activities/busy_institution' %>
   </div>
+  <% end %>
   <div class="projects box">
   <h3><%=l(:label_project_latest)%></h3>
     <%= render :partial => 'projects/latest' %>
   </div>
 </div>
 <div class="splitcontentright">
+  <% cache(:action => 'explore', :action_suffix => 'busy_projects') do %>
   <div class="projects box">
   <h3><%=l(:label_projects_busy)%></h3>
     <%= render :partial => 'activities/busy' %>
   </div>
+  <% end %>
 </div>

--- a/vendor/plugins/redmine_tags/app/controllers/tags_controller.rb	Mon Nov 12 15:17:17 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-class TagsController < ApplicationController
-  
-  def index
-    respond_to do |format|
-      format.html {
-        render :template => 'tags/index.html.erb', :layout => !request.xhr?
-      }
-      format.api  {
-      }
-      format.atom {
-      }
-    end
-  end
-
-end

--- a/vendor/plugins/redmine_tags/app/views/tags/index.html.erb	Mon Nov 12 15:17:17 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
-    <%= stylesheet_link_tag 'redmine_tags', :plugin => 'redmine_tags' %>
-<% end %>
-
-
-<div style="clear:both;"></div>
-<h2>
-  <%= l("label_project_tags_all") %>
-</h2>
-
-<%= render_tags_list(Project.available_tags, :style => :cloud) %>
-