changeset 1213:17305097e652 cannam

Three-column explore layout
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 12 Mar 2013 10:21:36 +0000
parents d6d53a77f058
children c212850aec6e
files app/views/projects/explore.html.erb public/stylesheets/application.css
diffstat 2 files changed, 24 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/projects/explore.html.erb	Wed Jan 23 12:02:55 2013 +0000
+++ b/app/views/projects/explore.html.erb	Tue Mar 12 10:21:36 2013 +0000
@@ -8,14 +8,25 @@
 
 <h2><%= l(:label_explore_projects) %></h2>
 
+<div class="threecolumnleft">
 <% cache(:action => 'explore', :action_suffix => 'tags', :expires_in => 1.hour) do %>
   <div class="tags box">
   <h3><%=l(:label_project_tags_all)%></h3>
     <%= render :partial => 'projects/tagcloud' %>
   </div>
 <% end %>
+</div>
 
-<div class="splitcontentleft">
+<div class="threecolumnright">
+  <% cache(:action => 'explore', :action_suffix => 'mature_projects', :expires_in => 1.hour) do %>
+  <div class="projects box">
+  <h3><%=l(:label_projects_mature)%></h3>
+    <%= render :partial => 'projects/mature' %>
+  </div>
+  <% end %>
+</div>
+
+<div class="threecolumnleft">
   <% cache(:action => 'explore', :action_suffix => 'busy_institutions', :expires_in => 1.hour) do %>
   <div class="institutions box">
   <h3><%=l(:label_institutions_busy)%></h3>
@@ -23,13 +34,17 @@
     <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
   </div>
   <% end %>
+</div>
+
+<div class="threecolumnright">
   <div class="projects box">
   <h3><%=l(:label_project_latest)%></h3>
     <%= render :partial => 'projects/latest' %>
     <%= link_to l(:label_projects_more), { :controller => 'projects' }, :class => 'more' %>
   </div>
 </div>
-<div class="splitcontentright">
+
+<div class="threecolumnmid">
   <% cache(:action => 'explore', :action_suffix => 'busy_projects', :expires_in => 1.hour) do %>
   <div class="projects box">
   <h3><%=l(:label_projects_busy)%></h3>
@@ -37,10 +52,6 @@
     <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
   </div>
   <% end %>
-  <% cache(:action => 'explore', :action_suffix => 'mature_projects', :expires_in => 1.hour) do %>
-  <div class="projects box">
-  <h3><%=l(:label_projects_mature)%></h3>
-    <%= render :partial => 'projects/mature' %>
-  </div>
-  <% end %>
 </div>
+
+<% html_title(l(:label_explore_projects)) -%>
--- a/public/stylesheets/application.css	Wed Jan 23 12:02:55 2013 +0000
+++ b/public/stylesheets/application.css	Tue Mar 12 10:21:36 2013 +0000
@@ -282,6 +282,11 @@
 
 .splitcontentleft{float:left; width:49%;}
 .splitcontentright{float:right; width:49%;}
+
+.threecolumnleft{float:left; clear:left; width: 32%;}
+.threecolumnright{float:right; clear:right; width: 32%;}
+.threecolumnmid{margin-left: 33%; margin-right: 33%;}
+
 form {display: inline;}
 input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
 fieldset {border: 1px solid #e4e4e4; margin:0;}