diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index c8d3642a3..d9c1d6641 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -4,6 +4,7 @@ //= require jquery.timeout.js //= require jquery-ui-autocomplete-custom.js //= require jquery.storageapi.js +//= require jquery.dropdown.min.js //= require ugoira_player.js //= require stupidtable.js //= require rails.js diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 7736247f9..03a9fef4d 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -576,7 +576,7 @@ } }); - $("#save-search").click(function() { + $("#save-search").click(function(e) { if (Danbooru.meta("disable-labeled-saved-searches") === "false") { $("#save-search-dialog").dialog("open"); } else { @@ -587,6 +587,18 @@ } ); } + + e.preventDefault(); + }); + + $("#search-dropdown #wiki-search").click(function(e) { + window.location.href = "/wiki_pages?search%5Btitle%5D=" + encodeURIComponent($("#tags").val()); + e.preventDefault(); + }); + + $("#search-dropdown #artist-search").click(function(e) { + window.location.href = "/artists?search%5Bname%5D=" + encodeURIComponent($("#tags").val()); + e.preventDefault(); }); } })(); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a1b69f2b0..f0939e18a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,3 +1,4 @@ @import "jquery-ui-1.11.2.min.scss"; +@import "jquery.dropdown.css"; @import "common/*"; @import "specific/*"; diff --git a/app/assets/stylesheets/common/main_layout.scss b/app/assets/stylesheets/common/main_layout.scss index 5271a919f..f8b1e478e 100644 --- a/app/assets/stylesheets/common/main_layout.scss +++ b/app/assets/stylesheets/common/main_layout.scss @@ -38,7 +38,7 @@ div#page { } input[type=text] { - width: 10em; + width: 8em; } } diff --git a/app/logical/popular_search_service.rb b/app/logical/popular_search_service.rb index b61d83a48..ac7e0c88c 100644 --- a/app/logical/popular_search_service.rb +++ b/app/logical/popular_search_service.rb @@ -26,6 +26,6 @@ class PopularSearchService end end response - end.force_encoding("utf-8") + end.to_s.force_encoding("utf-8") end end diff --git a/app/models/saved_search.rb b/app/models/saved_search.rb index ca2d694f5..d8c356858 100644 --- a/app/models/saved_search.rb +++ b/app/models/saved_search.rb @@ -110,6 +110,6 @@ class SavedSearch < ActiveRecord::Base end def label_string=(val) - self.labels = val.scan(/\S+/).map {|x| SavedSearch.normalize_label(x)} + self.labels = val.to_s.scan(/\S+/).map {|x| SavedSearch.normalize_label(x)} end end diff --git a/app/views/posts/partials/common/_search.html.erb b/app/views/posts/partials/common/_search.html.erb index 18ffab1f9..943a1bc99 100644 --- a/app/views/posts/partials/common/_search.html.erb +++ b/app/views/posts/partials/common/_search.html.erb @@ -15,5 +15,16 @@ <% end %> <%= hidden_field_tag "ms", "1" %> <%= submit_tag "Go", :name => nil %> + <%= submit_tag "+", "data-jq-dropdown" => "#search-dropdown" %> +
+ +
<% end %> diff --git a/app/views/saved_searches/_interface.html.erb b/app/views/saved_searches/_interface.html.erb index 1720a4499..28f618fbb 100644 --- a/app/views/saved_searches/_interface.html.erb +++ b/app/views/saved_searches/_interface.html.erb @@ -1,7 +1,3 @@ -<% if SavedSearch.enabled? && CurrentUser.show_saved_searches? %> - <%= button_tag "Save search", :id => "save-search" %> -<% end %> - <% if SavedSearch.enabled? %>