changeset 1592:72d9219f2f19 dockerise

Rejig explore page
author Chris Cannam
date Fri, 18 Aug 2017 14:46:06 +0100
parents 63650ae64bf2
children 83412a0a2389
files app/views/projects/explore.html.erb
diffstat 1 files changed, 13 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/projects/explore.html.erb	Fri Aug 18 13:04:09 2017 +0100
+++ b/app/views/projects/explore.html.erb	Fri Aug 18 14:46:06 2017 +0100
@@ -11,11 +11,12 @@
 <h2><%= l(:label_explore_projects) %></h2>
 
 <div class="threecolumnleft">
-  <div class="tags box">
-  <h3><%=l(:label_project_tags_all)%></h3>
-    <% cache(:action => 'explore', :action_suffix => 'tags') do %>
-    <%= render :partial => 'projects/tagcloud' %>
+  <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>
 </div>
 
@@ -27,26 +28,6 @@
   </div>
 </div>
 
-<div class="threecolumnleft">
-  <div class="institutions box">
-  <h3><%=l(:label_institutions_busy)%></h3>
-  <% cache(:action => 'explore', :action_suffix => 'busy_institutions') do %>
-    <%= render :partial => 'activities/busy_institution' %>
-  <% end %>
-  <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
-  </div>
-</div>
-
-<div class="threecolumnright">
-  <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>
-</div>
-
 <div class="threecolumnmid">
   <div class="projects box">
   <h3><%=l(:label_projects_mature)%></h3>
@@ -57,4 +38,12 @@
   </div>
 </div>
 
+  <div class="tags box" style="clear:all">
+  <h3><%=l(:label_project_tags_all)%></h3>
+    <% cache(:action => 'explore', :action_suffix => 'tags') do %>
+    <%= render :partial => 'projects/tagcloud' %>
+    <% end %>
+  </div>
+
+
 <% html_title(l(:label_explore_projects)) -%>