From d45db380e9a8dcee2b70e7bb9710983b57f38c95 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 30 Mar 2013 13:54:01 -0400 Subject: [PATCH 1/4] should fix #165 --- app/logical/d_text.rb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb index 411ab6e62..e4aeefd22 100644 --- a/app/logical/d_text.rb +++ b/app/logical/d_text.rb @@ -19,6 +19,7 @@ class DText str.gsub!(/\[i\](.+?)\[\/i\]/i, '\1') str.gsub!(/\[s\](.+?)\[\/s\]/i, '\1') str.gsub!(/\[u\](.+?)\[\/u\]/i, '\1') + str.gsub!(/\[spoilers?\](.+?)\[\/spoilers?\]/i, '\1') str = parse_links(str) str = parse_aliased_wiki_links(str) @@ -127,8 +128,6 @@ class DText str.gsub!(/\s*\[\/quote\]\s*/m, "\n\n[/quote]\n\n") str.gsub!(/\s*\[code\]\s*/m, "\n\n[code]\n\n") str.gsub!(/\s*\[\/code\]\s*/m, "\n\n[/code]\n\n") - str.gsub!(/\s*\[spoilers?\](?!\])\s*/m, "\n\n[spoiler]\n\n") - str.gsub!(/\s*\[\/spoilers?\]\s*/m, "\n\n[/spoiler]\n\n") end str.gsub!(/(?:\r?\n){3,}/, "\n\n") @@ -178,16 +177,6 @@ class DText flags[:code] = false '' - when /\[spoilers?\](?!\])/ - stack << "div" - '
' - - when /\[\/spoilers?\]/ - if stack.last == "div" - stack.pop - '
' - end - else if flags[:code] block From 0c1dcbca0ba66b5021fd50ccf65b4f78a17edbe4 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 30 Mar 2013 13:58:21 -0400 Subject: [PATCH 2/4] revert reltag sorting to relevance --- app/assets/javascripts/related_tag.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js index 13c67e92b..976398b18 100644 --- a/app/assets/javascripts/related_tag.js +++ b/app/assets/javascripts/related_tag.js @@ -95,7 +95,7 @@ $("#related-tags").show(); var query = Danbooru.RelatedTag.recent_search.query; - var related_tags = Danbooru.RelatedTag.recent_search.tags.sort(); + var related_tags = Danbooru.RelatedTag.recent_search.tags; var wiki_page_tags = Danbooru.RelatedTag.recent_search.wiki_page_tags; var $dest = $("#related-tags"); $dest.empty(); From 445e67795659446af7100d2e392baa14ef01dacf Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 30 Mar 2013 14:43:42 -0400 Subject: [PATCH 3/4] adds placeholder text to quick search --- app/assets/stylesheets/common/page_header.css.scss | 2 +- app/views/artists/_quick_search.html.erb | 2 +- app/views/pools/_quick_search.html.erb | 2 +- app/views/tags/_quick_search.html.erb | 2 +- app/views/wiki_pages/_quick_search.html.erb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/page_header.css.scss b/app/assets/stylesheets/common/page_header.css.scss index 594594027..4c83dc3f0 100644 --- a/app/assets/stylesheets/common/page_header.css.scss +++ b/app/assets/stylesheets/common/page_header.css.scss @@ -15,7 +15,7 @@ header#top { display: inline-block; input { - width: 8em; + width: 8.5em; } } diff --git a/app/views/artists/_quick_search.html.erb b/app/views/artists/_quick_search.html.erb index 149f8aa86..660645c53 100644 --- a/app/views/artists/_quick_search.html.erb +++ b/app/views/artists/_quick_search.html.erb @@ -1,3 +1,3 @@ <%= form_tag(artists_path, :method => :get) do %> - <%= text_field "search", "name" %> + <%= text_field "search", "name", :placeholder => "Search artists" %> <% end %> diff --git a/app/views/pools/_quick_search.html.erb b/app/views/pools/_quick_search.html.erb index 6044cebed..bbf150f44 100644 --- a/app/views/pools/_quick_search.html.erb +++ b/app/views/pools/_quick_search.html.erb @@ -1,3 +1,3 @@ <%= form_tag(pools_path, :method => :get) do %> - <%= text_field "search", "name_matches" %> + <%= text_field "search", "name_matches", :placeholder => "Search pools" %> <% end %> diff --git a/app/views/tags/_quick_search.html.erb b/app/views/tags/_quick_search.html.erb index fb5e46c26..26e5f4349 100644 --- a/app/views/tags/_quick_search.html.erb +++ b/app/views/tags/_quick_search.html.erb @@ -1,3 +1,3 @@ <%= form_tag(tags_path, :method => :get) do %> - <%= text_field "search", "name_matches" %> + <%= text_field "search", "name_matches", :placeholder => "Search tags" %> <% end %> diff --git a/app/views/wiki_pages/_quick_search.html.erb b/app/views/wiki_pages/_quick_search.html.erb index 4e2762a5b..6dc314ce8 100644 --- a/app/views/wiki_pages/_quick_search.html.erb +++ b/app/views/wiki_pages/_quick_search.html.erb @@ -1,3 +1,3 @@ <%= form_tag(wiki_pages_path, :method => :get) do %> - <%= text_field "search", "title" %> + <%= text_field "search", "title", :placeholder => "Search wiki pages" %> <% end %> From 3bfb05d79568917844b6dc64c746af5d89b8634d Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 30 Mar 2013 15:25:09 -0400 Subject: [PATCH 4/4] add more quick searches comments, notes, and users --- app/views/comments/_quick_search.html.erb | 4 ++++ app/views/comments/_secondary_links.html.erb | 1 + app/views/notes/_quick_search.html.erb | 4 ++++ app/views/notes/_secondary_links.html.erb | 1 + app/views/users/_quick_search.html.erb | 3 +++ app/views/users/_secondary_links.html.erb | 1 + 6 files changed, 14 insertions(+) create mode 100644 app/views/comments/_quick_search.html.erb create mode 100644 app/views/notes/_quick_search.html.erb create mode 100644 app/views/users/_quick_search.html.erb diff --git a/app/views/comments/_quick_search.html.erb b/app/views/comments/_quick_search.html.erb new file mode 100644 index 000000000..07dbb3233 --- /dev/null +++ b/app/views/comments/_quick_search.html.erb @@ -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 %> diff --git a/app/views/comments/_secondary_links.html.erb b/app/views/comments/_secondary_links.html.erb index 9abf9678b..bae582602 100644 --- a/app/views/comments/_secondary_links.html.erb +++ b/app/views/comments/_secondary_links.html.erb @@ -1,5 +1,6 @@ <% content_for(:secondary_links) do %> +
  • <%= render "quick_search" %>
  • <%= link_to "Listing", comments_path(:group_by => "post") %>
  • <%= link_to "Search", search_comments_path %>
  • <%= link_to "Help", wiki_pages_path(:title => "help:comments") %>
    • diff --git a/app/views/notes/_quick_search.html.erb b/app/views/notes/_quick_search.html.erb new file mode 100644 index 000000000..7fee86be0 --- /dev/null +++ b/app/views/notes/_quick_search.html.erb @@ -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 %> diff --git a/app/views/notes/_secondary_links.html.erb b/app/views/notes/_secondary_links.html.erb index 2062406d5..8d2b12449 100644 --- a/app/views/notes/_secondary_links.html.erb +++ b/app/views/notes/_secondary_links.html.erb @@ -1,5 +1,6 @@ <% content_for(:secondary_links) do %> +
  • <%= render "quick_search" %>
  • <%= link_to "Listing", notes_path(:group_by => "post") %>
  • <%= link_to "Search", search_notes_path %>
  • <%= link_to "History", note_versions_path %>
    • diff --git a/app/views/users/_quick_search.html.erb b/app/views/users/_quick_search.html.erb new file mode 100644 index 000000000..5800c37b4 --- /dev/null +++ b/app/views/users/_quick_search.html.erb @@ -0,0 +1,3 @@ +<%= form_tag(users_path, :method => :get) do %> + <%= text_field "search", "name_matches", :placeholder => "Search users" %> +<% end %> diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb index f7a9edbcc..edcc34e6c 100644 --- a/app/views/users/_secondary_links.html.erb +++ b/app/views/users/_secondary_links.html.erb @@ -1,5 +1,6 @@ <% content_for(:secondary_links) do %> +
  • <%= render "quick_search" %>
  • <%= link_to "Listing", users_path %>
  • <%= link_to "Search", search_users_path %>