From 719343cea5876b4efec2292cb77747ade20cc13c Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Fri, 5 Sep 2014 16:27:19 -0700
Subject: [PATCH] make pool gallery the default view

---
 app/assets/stylesheets/specific/posts.css.scss     | 6 +++++-
 app/presenters/post_presenter.rb                   | 2 +-
 app/presenters/post_set_presenters/pool_gallery.rb | 5 +++--
 app/views/layouts/_main_links.html.erb             | 2 +-
 app/views/pools/_quick_search.html.erb             | 2 +-
 app/views/pools/_search.html.erb                   | 2 +-
 app/views/pools/_secondary_links.html.erb          | 3 +--
 app/views/static/site_map.html.erb                 | 2 +-
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
index 0bd0a5818..efadb4ec4 100644
--- a/app/assets/stylesheets/specific/posts.css.scss
+++ b/app/assets/stylesheets/specific/posts.css.scss
@@ -11,7 +11,11 @@ article.post-preview {
   position: relative;
 
   &.pooled {
-    height: 194px;
+    height: 214px;
+  }
+
+  .desc {
+    font-size: 80%;
   }
 
   img {
diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb
index b4fef6965..23e93a8e7 100644
--- a/app/presenters/post_presenter.rb
+++ b/app/presenters/post_presenter.rb
@@ -27,7 +27,7 @@ class PostPresenter < Presenter
     if options[:pool]
       html << %{<p class="desc">}
       html << %{<a href="/pools/#{options[:pool].id}">}
-      html << options[:pool].pretty_name.truncate(40)
+      html << options[:pool].pretty_name.truncate(80)
       html << %{</a>}
       html << %{</p>}
     end
diff --git a/app/presenters/post_set_presenters/pool_gallery.rb b/app/presenters/post_set_presenters/pool_gallery.rb
index 2f7fef2eb..cf0a386c6 100644
--- a/app/presenters/post_set_presenters/pool_gallery.rb
+++ b/app/presenters/post_set_presenters/pool_gallery.rb
@@ -14,9 +14,10 @@ module PostSetPresenters
         return template.render("post_sets/blank")
       end
 
+      posts = ::Post.where(id: pools.map(&:cover_post_id)).to_a.inject({}) {|h, x| h[x.id] = x; h}
+
       pools.each do |pool|
-        if pool.cover_post_id
-          post = ::Post.find(pool.cover_post_id)
+        if post = posts[pool.cover_post_id.to_i]
           html << PostPresenter.preview(post, options.merge(:tags => @post_set.tag_string, :raw => @post_set.raw, :pool => pool))
           html << "\n"
         end
diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb
index 9abdd7f7d..791c85bb4 100644
--- a/app/views/layouts/_main_links.html.erb
+++ b/app/views/layouts/_main_links.html.erb
@@ -13,7 +13,7 @@
     <%= nav_link_to("Aliases", tag_aliases_path) %>
     <%= nav_link_to("Implications", tag_implications_path) %>
   <% end %>
-  <%= nav_link_to("Pools", pools_path) %>
+  <%= nav_link_to("Pools", gallery_pools_path) %>
   <%= nav_link_to("Wiki", wiki_pages_path(:title => "help:home")) %>
   <%= nav_link_to("Forum", forum_topics_path, :class => (CurrentUser.user.has_forum_been_updated? ? "forum-updated" : nil)) %>
   <% if CurrentUser.is_janitor? %>
diff --git a/app/views/pools/_quick_search.html.erb b/app/views/pools/_quick_search.html.erb
index 40d8b1993..275b52888 100644
--- a/app/views/pools/_quick_search.html.erb
+++ b/app/views/pools/_quick_search.html.erb
@@ -1,3 +1,3 @@
-<%= form_tag(pools_path, :method => :get) do %>
+<%= form_tag(gallery_pools_path, :method => :get) do %>
   <%= text_field "search", "name_matches", :id => "quick_search_name_matches", :placeholder => "Search pools" %>
 <% end %>
diff --git a/app/views/pools/_search.html.erb b/app/views/pools/_search.html.erb
index 60fc7903a..e5b15f3e9 100644
--- a/app/views/pools/_search.html.erb
+++ b/app/views/pools/_search.html.erb
@@ -1,6 +1,6 @@
 <table class="search">
   <tbody>
-    <%= form_tag pools_path, :method => :get, :class => "simple_form" do %>
+    <%= form_tag gallery_pools_path, :method => :get, :class => "simple_form" do %>
       <tr>
         <th><label for="search_name_matches">Name</label></th>
         <td>
diff --git a/app/views/pools/_secondary_links.html.erb b/app/views/pools/_secondary_links.html.erb
index 8f7f93683..8ad621564 100644
--- a/app/views/pools/_secondary_links.html.erb
+++ b/app/views/pools/_secondary_links.html.erb
@@ -1,8 +1,7 @@
 <% content_for(:secondary_links) do %>
   <menu>
     <li><%= render "pools/quick_search" %></li>
-    <li><%= link_to "Gallery", gallery_pools_path %></li>
-    <li><%= link_to "Listing", pools_path %></li>
+    <li><%= link_to "Listing", gallery_pools_path %></li>
     <li><%= link_to "New", new_pool_path %></li>
     <li><%= link_to "Help", wiki_pages_path(:search => {:title => "help:pools"}) %></li>
     <% if CurrentUser.is_member? && @pool && !@pool.new_record? %>
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index 67727a4a2..193addd12 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -52,7 +52,7 @@
       <ul>
         <li><h1>Pools</h1></li>
         <li><%= link_to("Help", wiki_pages_path(:title => "help:pools")) %></li>
-        <li><%= link_to("Listing", pools_path) %></li>
+        <li><%= link_to("Listing", gallery_pools_path) %></li>
         <li><%= link_to("Changes", pool_versions_path) %></li>
       </ul>
       <ul>