# HG changeset patch # User Chris Cannam # Date 1363083696 0 # Node ID 17305097e652826ebe7afd482cccd73c8b380034 # Parent d6d53a77f058b9028014550e13570cd2729486e6 Three-column explore layout diff -r d6d53a77f058 -r 17305097e652 app/views/projects/explore.html.erb --- 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 @@

<%= l(:label_explore_projects) %>

+
<% cache(:action => 'explore', :action_suffix => 'tags', :expires_in => 1.hour) do %>

<%=l(:label_project_tags_all)%>

<%= render :partial => 'projects/tagcloud' %>
<% end %> +
-
+
+ <% cache(:action => 'explore', :action_suffix => 'mature_projects', :expires_in => 1.hour) do %> +
+

<%=l(:label_projects_mature)%>

+ <%= render :partial => 'projects/mature' %> +
+ <% end %> +
+ +
<% cache(:action => 'explore', :action_suffix => 'busy_institutions', :expires_in => 1.hour) do %>

<%=l(:label_institutions_busy)%>

@@ -23,13 +34,17 @@ <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
<% end %> +
+ +

<%=l(:label_project_latest)%>

<%= render :partial => 'projects/latest' %> <%= link_to l(:label_projects_more), { :controller => 'projects' }, :class => 'more' %>
-
+ +
<% cache(:action => 'explore', :action_suffix => 'busy_projects', :expires_in => 1.hour) do %>

<%=l(:label_projects_busy)%>

@@ -37,10 +52,6 @@ <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }, :class => 'more' %>
<% end %> - <% cache(:action => 'explore', :action_suffix => 'mature_projects', :expires_in => 1.hour) do %> -
-

<%=l(:label_projects_mature)%>

- <%= render :partial => 'projects/mature' %> -
- <% end %>
+ +<% html_title(l(:label_explore_projects)) -%> diff -r d6d53a77f058 -r 17305097e652 public/stylesheets/application.css --- 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;}