# HG changeset patch
# User Chris Cannam
# Date 1423649028 0
# Node ID ae8145b28b2b9209b23b8f177eae574de085917d
# Parent  df5b75a95193302e47dd6d7a4958e25cb53b4908# Parent  83a2227efc710fa3c2e5eafeb320802f0ecf7454
Merge from live branch

diff -r df5b75a95193 -r ae8145b28b2b app/views/projects/explore.html.erb
--- a/app/views/projects/explore.html.erb	Fri Sep 26 09:48:15 2014 +0100
+++ b/app/views/projects/explore.html.erb	Wed Feb 11 10:03:48 2015 +0000
@@ -11,12 +11,12 @@
 <h2><%= l(:label_explore_projects) %></h2>
 
 <div class="threecolumnleft">
-<% cache(:action => 'explore', :action_suffix => 'tags') do %>
   <div class="tags box">
   <h3><%=l(:label_project_tags_all)%></h3>
+    <% cache(:action => 'explore', :action_suffix => 'tags') do %>
     <%= render :partial => 'projects/tagcloud' %>
+    <% end %>
   </div>
-<% end %>
 </div>
 
 <div class="threecolumnright">
@@ -28,33 +28,33 @@
 </div>
 
 <div class="threecolumnleft">
-  <% cache(:action => 'explore', :action_suffix => 'busy_institutions') do %>
   <div class="institutions box">
   <h3><%=l(:label_institutions_busy)%></h3>
+  <% cache(:action => 'explore', :action_suffix => 'busy_institutions') do %>
     <%= render :partial => 'activities/busy_institution' %>
-    <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
+  <% end %>
+  <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
   </div>
-  <% end %>
 </div>
 
 <div class="threecolumnright">
-  <% cache(:action => 'explore', :action_suffix => 'busy_projects') do %>
   <div class="projects box">
   <h3><%=l(:label_projects_busy)%></h3>
+    <% cache(:action => 'explore', :action_suffix => 'busy_projects') do %>
     <%= render :partial => 'activities/busy' %>
+    <% end %>
     <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
   </div>
-  <% end %>
 </div>
 
 <div class="threecolumnmid">
-  <% cache(:action => 'explore', :action_suffix => 'mature_projects') do %>
   <div class="projects box">
   <h3><%=l(:label_projects_mature)%></h3>
+    <% cache(:action => 'explore', :action_suffix => 'mature_projects') do %>
     <%= render :partial => 'projects/mature' %>
+    <% end %>
     <%= link_to l(:label_projects_more), { :controller => 'projects' }, :class => 'more' %>
   </div>
-  <% end %>
 </div>
 
 <% html_title(l(:label_explore_projects)) -%>