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/artists/_quick_search.html.erb
View File

@@ -1,3 +1,3 @@
<%= form_tag(artists_path, :method => :get) do %>
<%= text_field "search", "name", :id => "quicksearch_name" %>
<%= text_field "search", "name", :id => "quicksearch_name", :placeholder => "Search artists" %>
<% end %>

4
app/views/comments/_quick_search.html.erb Normal file
View File

@@ -0,0 +1,4 @@
<%= form_tag(comments_path, :method => :get) do %>
<%= hidden_field_tag "group_by", "comment" %>
<%= text_field "search", "body_matches", :placeholder => "Search comments" %>
<% end %>

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

@@ -1,5 +1,6 @@
<% content_for(:secondary_links) do %>
<menu>
<li><%= render "quick_search" %></li>
<li><%= link_to "Listing", comments_path(:group_by => "post") %></li>
<li><%= link_to "Search", search_comments_path %></li>
<li><%= link_to "Help", wiki_pages_path(:title => "help:comments") %></li>

4
app/views/notes/_quick_search.html.erb Normal file
View File

@@ -0,0 +1,4 @@
<%= form_tag(notes_path, :method => :get) do %>
<%= hidden_field_tag "group_by", "note" %>
<%= text_field "search", "body_matches", :placeholder => "Search notes" %>
<% end %>

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

@@ -1,5 +1,6 @@
<% content_for(:secondary_links) do %>
<menu>
<li><%= render "quick_search" %></li>
<li><%= link_to "Listing", notes_path(:group_by => "post") %></li>
<li><%= link_to "Search", search_notes_path %></li>
<li><%= link_to "History", note_versions_path %></li>

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 %>

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

@@ -1,3 +1,3 @@
<%= form_tag(tags_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 tags" %>
<% end %>

3
app/views/users/_quick_search.html.erb Normal file
View File

@@ -0,0 +1,3 @@
<%= form_tag(users_path, :method => :get) do %>
<%= text_field "search", "name_matches", :placeholder => "Search users" %>
<% end %>

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

@@ -1,5 +1,6 @@
<% content_for(:secondary_links) do %>
<menu>
<li><%= render "quick_search" %>
<li><%= link_to "Listing", users_path %></li>
<li><%= link_to "Search", search_users_path %></li>

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

@@ -1,3 +1,3 @@
<%= form_tag(wiki_pages_path, :method => :get) do %>
<%= text_field "search", "title", :id => "quick_search_title" %>
<%= text_field "search", "title", :id => "quick_search_title", :placeholder => "Search wiki pages" %>
<% end %>