From 37fd0d2422e29f990fc88d763b7b74499ce8b78f Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 17 Mar 2013 22:26:17 -0400 Subject: [PATCH] fixes #894, fixes #893, fixes #892 --- app/assets/stylesheets/common/page_header.css.scss | 8 ++++++++ app/views/artists/_quick_search.html.erb | 3 +++ app/views/artists/_secondary_links.html.erb | 1 + app/views/pools/_quick_search.html.erb | 3 +++ app/views/pools/_secondary_links.html.erb | 1 + app/views/tags/_quick_search.html.erb | 3 +++ app/views/tags/_secondary_links.html.erb | 1 + 7 files changed, 20 insertions(+) create mode 100644 app/views/artists/_quick_search.html.erb create mode 100644 app/views/pools/_quick_search.html.erb create mode 100644 app/views/tags/_quick_search.html.erb diff --git a/app/assets/stylesheets/common/page_header.css.scss b/app/assets/stylesheets/common/page_header.css.scss index dc5d630b6..f5cda33b2 100644 --- a/app/assets/stylesheets/common/page_header.css.scss +++ b/app/assets/stylesheets/common/page_header.css.scss @@ -11,6 +11,14 @@ header#top { background: $menu_color; padding: 6px 20px; + form { + display: inline-block; + + input { + width: 8em; + } + } + li { margin: 0; padding: 0; diff --git a/app/views/artists/_quick_search.html.erb b/app/views/artists/_quick_search.html.erb new file mode 100644 index 000000000..bd86a2dea --- /dev/null +++ b/app/views/artists/_quick_search.html.erb @@ -0,0 +1,3 @@ +<%= form_tag(artists_path, :method => :get, :target => "_blank") do %> + <%= text_field "search", "name" %> +<% end %> diff --git a/app/views/artists/_secondary_links.html.erb b/app/views/artists/_secondary_links.html.erb index 271a78e45..024099bdc 100644 --- a/app/views/artists/_secondary_links.html.erb +++ b/app/views/artists/_secondary_links.html.erb @@ -1,5 +1,6 @@ <% content_for(:secondary_links) do %> +
  • <%= render "quick_search" %>
  • <%= link_to "Listing", artists_path %>
  • <%= link_to "Banned", banned_artists_path %>
  • <%= link_to "Search", search_artists_path %>
  • diff --git a/app/views/pools/_quick_search.html.erb b/app/views/pools/_quick_search.html.erb new file mode 100644 index 000000000..cc5c22ece --- /dev/null +++ b/app/views/pools/_quick_search.html.erb @@ -0,0 +1,3 @@ +<%= form_tag(pools_path, :method => :get, :target => "_blank") do %> + <%= text_field "search", "name_matches" %> +<% end %> diff --git a/app/views/pools/_secondary_links.html.erb b/app/views/pools/_secondary_links.html.erb index 0ad6af2ed..9550867d6 100644 --- a/app/views/pools/_secondary_links.html.erb +++ b/app/views/pools/_secondary_links.html.erb @@ -1,5 +1,6 @@ <% content_for(:secondary_links) do %> +
  • <%= render "quick_search" %>
  • <%= link_to "Listing", pools_path %>
  • <%= link_to "Search", search_pools_path %>
  • <%= link_to "New", new_pool_path %>
  • diff --git a/app/views/tags/_quick_search.html.erb b/app/views/tags/_quick_search.html.erb new file mode 100644 index 000000000..8eec7af8d --- /dev/null +++ b/app/views/tags/_quick_search.html.erb @@ -0,0 +1,3 @@ +<%= form_tag(tags_path, :method => :get, :target => "_blank") do %> + <%= text_field "search", "name_matches" %> +<% end %> diff --git a/app/views/tags/_secondary_links.html.erb b/app/views/tags/_secondary_links.html.erb index 2086dc1de..928077846 100644 --- a/app/views/tags/_secondary_links.html.erb +++ b/app/views/tags/_secondary_links.html.erb @@ -1,5 +1,6 @@ <% content_for(:secondary_links) do %> +
  • <%= render "quick_search" %>
  • <%= link_to "Listing", tags_path %>
  • <%= link_to "Search", search_tags_path %>
  • <%= link_to "Help", wiki_pages_path(:search => {:title => "help:tags"}) %>