From 3de2ed452eab4551ff907ea7bc9ce2d94fa19edf Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 23 Apr 2013 15:32:07 -0400
Subject: [PATCH] move artist search to index, fixes #636

---
 .../stylesheets/specific/artists.css.scss     |  4 ---
 app/views/artists/_search.html.erb            | 28 +++++++++++++++++++
 app/views/artists/_secondary_links.html.erb   |  1 -
 app/views/artists/index.html.erb              |  3 +-
 app/views/artists/search.html.erb             | 27 ------------------
 config/routes.rb                              |  1 -
 6 files changed, 29 insertions(+), 35 deletions(-)
 create mode 100644 app/views/artists/_search.html.erb
 delete mode 100644 app/views/artists/search.html.erb

diff --git a/app/assets/stylesheets/specific/artists.css.scss b/app/assets/stylesheets/specific/artists.css.scss
index f2d91e5b9..30cc10e6b 100644
--- a/app/assets/stylesheets/specific/artists.css.scss
+++ b/app/assets/stylesheets/specific/artists.css.scss
@@ -31,8 +31,4 @@ div#c-artists {
       margin: 0;
     }
   }
-
-  .hint {
-    display: block;
-  }
 }
diff --git a/app/views/artists/_search.html.erb b/app/views/artists/_search.html.erb
new file mode 100644
index 000000000..dc47210f8
--- /dev/null
+++ b/app/views/artists/_search.html.erb
@@ -0,0 +1,28 @@
+<table class="search">
+  <tbody>
+    <%= form_tag(artists_path, :method => :get, :class => "simple_form") do %>
+      <tr>
+        <th><label for="search_name">Name</label>
+        <td>
+          <div class="input">
+            <%= text_field "search", "name" %>
+            <span class="hint">You can search on any name or URL</span>
+          </div>
+        </td>
+      </tr>
+
+      <tr>
+        <th><label for="search_sort">Sort</label>
+        <td>
+          <div class="input">
+            <%= select "search", "sort", [["Date", "date"], ["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/artists/_secondary_links.html.erb b/app/views/artists/_secondary_links.html.erb
index 6721088d7..99fe19d41 100644
--- a/app/views/artists/_secondary_links.html.erb
+++ b/app/views/artists/_secondary_links.html.erb
@@ -3,7 +3,6 @@
     <li><%= render "artists/quick_search" %></li>
     <li><%= link_to "Listing", artists_path %></li>
     <li><%= link_to "Banned", banned_artists_path %></li>
-    <li><%= link_to "Search", search_artists_path %></li>
     <li><%= link_to "New", new_artist_path %></li>
     <li><%= link_to "Recent changes", artist_versions_path %></li>
     <% if @artist && !@artist.new_record? %>
diff --git a/app/views/artists/index.html.erb b/app/views/artists/index.html.erb
index 5e37af882..b81ccab4d 100644
--- a/app/views/artists/index.html.erb
+++ b/app/views/artists/index.html.erb
@@ -1,7 +1,6 @@
 <div id="c-artists">
   <div id="a-index">
-    <h1>Artists</h1>
-
+    <%= render "search" %>
     <table class="striped" width="100%">
       <thead>
         <tr>
diff --git a/app/views/artists/search.html.erb b/app/views/artists/search.html.erb
deleted file mode 100644
index fb218ac1c..000000000
--- a/app/views/artists/search.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<div id="c-artists">
-  <div id="a-search">
-    <h1>Search Artists</h1>
-
-    <div id="search-form">
-      <%= form_tag(artists_path, :method => :get, :class => "simple_form") do %>
-        <div class="input">
-          <label>Name</label>
-          <%= text_field "search", "name" %>
-          <p class="hint">You can search on any name or URL</p>
-        </div>
-
-        <div class="input">
-          <label>Sort</label>
-          <%= select "search", "sort", [["Date", "date"], ["Name", "name"]] %>
-        </div>
-        <%= submit_tag "Search" %>
-      <% end %>
-    </div>
-  </div>
-</div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Artists - <%= Danbooru.config.app_name %>
-<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 758a0ff9a..aec71d7e9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -60,7 +60,6 @@ Danbooru::Application.routes.draw do
     end
     collection do
       get :show_or_new
-      get :search
       get :banned
     end
   end