From 3c88053c42b4a9bcaec3f9db02518988f5a4e3d7 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 23 Apr 2013 15:20:09 -0400
Subject: [PATCH] move pool search to index (#636)

---
 app/views/pools/_search.html.erb          | 45 +++++++++++++++++++++++
 app/views/pools/_secondary_links.html.erb |  1 -
 app/views/pools/index.html.erb            |  1 +
 app/views/pools/search.html.erb           | 22 -----------
 config/routes.rb                          |  3 --
 5 files changed, 46 insertions(+), 26 deletions(-)
 create mode 100644 app/views/pools/_search.html.erb
 delete mode 100644 app/views/pools/search.html.erb

diff --git a/app/views/pools/_search.html.erb b/app/views/pools/_search.html.erb
new file mode 100644
index 000000000..5e0a29dc1
--- /dev/null
+++ b/app/views/pools/_search.html.erb
@@ -0,0 +1,45 @@
+<table class="search">
+  <tbody>
+    <%= form_tag pools_path, :method => :get, :class => "simple_form" do %>
+      <tr>
+        <th><label for="search_name_matches">Name</label></th>
+        <td>
+          <div class="input">
+            <%= text_field "search", "name_matches" %>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <th><label for="search_description_matches">Description</label></th>
+        <td>
+          <div class="input">
+            <%= text_field "search", "description_matches" %>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <th><label for="search_creator_name">Creator</th>
+        <td>
+          <div class="input">
+            <%= text_field "search", "creator_name" %>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <th><label for="search_sort">Order</th>
+        <td>
+          <div class="input">
+            <%= select "search", "sort", [["Last updated", "updated_at"], ["Name", "name"]] %>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <td><%= submit_tag "Search" %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/app/views/pools/_secondary_links.html.erb b/app/views/pools/_secondary_links.html.erb
index 03fd8b8c5..889d390ba 100644
--- a/app/views/pools/_secondary_links.html.erb
+++ b/app/views/pools/_secondary_links.html.erb
@@ -2,7 +2,6 @@
   <menu>
     <li><%= render "pools/quick_search" %></li>
     <li><%= link_to "Listing", pools_path %></li>
-    <li><%= link_to "Search", search_pools_path %></li>
     <li><%= link_to "New", new_pool_path %></li>
     <% if CurrentUser.is_member? && @pool && !@pool.new_record? %>
       <li>|</li>
diff --git a/app/views/pools/index.html.erb b/app/views/pools/index.html.erb
index 68c27ed12..8ff8204b4 100644
--- a/app/views/pools/index.html.erb
+++ b/app/views/pools/index.html.erb
@@ -1,5 +1,6 @@
 <div id="c-pools">
   <div id="a-index">
+    <%= render "search" %>
     <table class="striped" width="100%">
       <thead>
         <tr>
diff --git a/app/views/pools/search.html.erb b/app/views/pools/search.html.erb
deleted file mode 100644
index 5afc344f7..000000000
--- a/app/views/pools/search.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<div id="c-pools">
-  <div id="a-search">
-    <%= form_tag pools_path, :method => :get, :class => "simple_form" do %>
-      <%= search_field "name_matches", :label => "Name" %>
-      <%= search_field "description_matches", :label => "Description" %>
-      <%= search_field "creator_name", :label => "Creator" %>
-
-      <div class="input">
-        <label>Order</label>
-        <%= select "search", "sort", [["Last updated", "updated_at"], ["Name", "name"]] %>
-      </div>
-
-      <%= submit_tag "Search" %>
-    <% end %>
-  </div>
-</div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Pools - <%= Danbooru.config.app_name %>
-<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 4e8cd6180..758a0ff9a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -122,9 +122,6 @@ Danbooru::Application.routes.draw do
   end
   resources :note_versions, :only => [:index]
   resources :pools do
-    collection do
-      get :search
-    end
     member do
       put :revert
       post :undelete