merge pool category branch; fixes #1521

app/views/pools/_search.html.erb

@@ -28,6 +28,15 @@
         </td>
       </tr>
 
+      <tr>
+        <th><label for="search_category">Category</th>
+        <td>
+          <div class="input">
+            <%= select "search", "category", [["Series", "series"], ["Collection", "collection"]], :selected => params[:search][:category], :include_blank => true %>
+          </div>
+        </td>
+      </tr>
+
       <tr>
         <th><label for="search_sort">Order</th>
         <td>

app/views/pools/edit.html.erb

@@ -5,6 +5,7 @@
       <%= f.input :name, :input_html => { :value => @pool.pretty_name } %>
       <%= f.input :description %>
       <%= f.input :post_ids, :label => "Posts" %>
+      <%= f.input :category, :collection => ["series", "collection"], :include_blank => false %>
       <%= f.input :is_active %>
       <%= f.button :submit %>
     <% end %>

app/views/pools/index.html.erb

@@ -17,7 +17,7 @@
 
             </td>
             <td>
-              <%= link_to h(pool.pretty_name), pool_path(pool) %>
+              <%= link_to h(pool.pretty_name), pool_path(pool), :class => "pool-category-#{pool.category}" %>
             </td>
             <td>
               <%= link_to_user pool.creator %>

app/views/pools/new.html.erb

@@ -5,6 +5,7 @@
       <%= f.input :name %>
       <%= f.input :description %>
       <%= f.input :post_ids, :label => "Posts" %>
+      <%= f.input :category, :collection => ["series", "collection"], :include_blank => false %>
       <%= f.input :is_active %>
       <%= f.button :submit %>
     <% end %>