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

Merge branch 'testing'

Browse Source 
Conflicts:
	app/views/artists/_quick_search.html.erb
	app/views/pools/_quick_search.html.erb
	app/views/tags/_quick_search.html.erb
	app/views/wiki_pages/_quick_search.html.erb
This commit is contained in:
Toks
2013-03-30 15:50:31 -04:00
parent d62c366ca8 3bfb05d795
commit c51c3e800a
13 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/pools/_quick_search.html.erb
View File

@@ -1,3 +1,3 @@
<%= form_tag(pools_path, :method => :get) do %>
<%= text_field "search", "name_matches", :id => "quick_search_name_matches" %>
<%= text_field "search", "name_matches", :id => "quick_search_name_matches", :placeholder => "Search pools" %>
<% end %>