jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move tag search to index (#636)

Browse Source
This commit is contained in:
Toks
2013-04-23 14:58:42 -04:00
parent 48019d684e
commit 730ee0c264
7 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/stylesheets/common/tables.css.scss
View File

@@ -39,3 +39,19 @@ table.striped {
background-color: #FAFAFA; background-color: #FAFAFA;
} }
} }
table.search {
tr {
height: 2em;
}
th {
text-align: right;
padding-right: 1em;
vertical-align: top;
}
td {
vertical-align: top;
}
}

2
app/assets/stylesheets/specific/tags.css.scss
View File

@@ -1,5 +1,5 @@
div#c-tags { div#c-tags {
div#a-index { div#a-index table.striped {
td:nth-child(1), th:nth-child(1) { td:nth-child(1), th:nth-child(1) {
width: 5em; width: 5em;
text-align: right; text-align: right;

46
app/views/tags/_search.html.erb Normal file
View File

@@ -0,0 +1,46 @@
<table class="search">
<tbody>
<%= form_tag(tags_path, :method => :get, :class => "simple_form") do %>
<tr>
<th><label for="search_name">Name</label></th>
<td>
<div class="input">
<%= text_field "search", "name_matches" %>
<span class="hint">Use * for wildcard</span>
</div>
</td>
</tr>
<tr>
<th><label for="search_category">Category</label></th>
<td>
<div class="input">
<%= select "search", "category", [""] + Danbooru.config.canonical_tag_category_mapping.to_a %>
</div>
</td>
</tr>
<tr>
<th><label for="search_sort">Sort</label></th>
<td>
<div class="input">
<%= select "search", "sort", %w(count date name) %>
</div>
</td>
</tr>
<tr>
<th><label for="search_hide_empty">Hide Empty</label></th>
<td>
<div class="input">
<%= check_box "search", "hide_empty", {:checked => true}, "yes", "no" %>
</div>
</td>
</tr>
<tr>
<td><%= submit_tag "Search" %><td>
</tr>
<% end %>
</tbody>
</table>

1
app/views/tags/_secondary_links.html.erb
View File

@@ -2,7 +2,6 @@
<menu> <menu>
<li><%= render "tags/quick_search" %></li> <li><%= render "tags/quick_search" %></li>
<li><%= link_to "Listing", tags_path %></li> <li><%= link_to "Listing", tags_path %></li>
<li><%= link_to "Search", search_tags_path %></li>
<li><%= link_to "Help", wiki_pages_path(:search => {:title => "help:tags"}) %></li> <li><%= link_to "Help", wiki_pages_path(:search => {:title => "help:tags"}) %></li>
<% if @tag %> <% if @tag %>
<li>|</li> <li>|</li>

1
app/views/tags/index.html.erb
View File

@@ -1,5 +1,6 @@
<div id="c-tags"> <div id="c-tags">
<div id="a-index"> <div id="a-index">
<%= render "search" %>
<table class="striped"> <table class="striped">
<thead> <thead>
<tr> <tr>

34
app/views/tags/search.html.erb
View File

@@ -1,34 +0,0 @@
<div id="c-tags">
<div id="a-search">
<%= form_tag(tags_path, :method => :get, :class => "simple_form") do %>
<div class="input">
<label for="search_name">Name</label>
<%= text_field "search", "name_matches" %>
<span class="hint">Use * for wildcard</span>
</div>
<div class="input">
<label for="search_category">Category</label>
<%= select "search", "category", [""] + Danbooru.config.canonical_tag_category_mapping.to_a %>
</div>
<div class="input">
<label for="search_hide_empty">Hide Empty</label>
<%= select "search", "hide_empty", ["yes", "no"] %>
</div>
<div class="input">
<label for="search_sort">Sort</label>
<%= select "search", "sort", %w(date name count) %>
</div>
<%= submit_tag "Search" %>
<% end %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Search Tags - <%= Danbooru.config.app_name %>
<% end %>

3
config/routes.rb
View File

@@ -160,9 +160,6 @@ Danbooru::Application.routes.draw do
resource :source, :only => [:show] resource :source, :only => [:show]
resources :tags do resources :tags do
resource :correction, :only => [:new, :create, :show], :controller => "TagCorrections" resource :correction, :only => [:new, :create, :show], :controller => "TagCorrections"
collection do
get :search
end
end end
resources :tag_aliases do resources :tag_aliases do
resource :correction, :only => [:create, :new, :show], :controller => "TagAliasCorrections" resource :correction, :only => [:create, :new, :show], :controller => "TagAliasCorrections"