From 48f57d7018576252e47b959d3464296acccc06e0 Mon Sep 17 00:00:00 2001 From: zatchii Date: Wed, 8 May 2013 21:42:56 +0000 Subject: [PATCH 01/36] Fix typo/duplicate property --- app/assets/javascripts/notes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 922b42745..2ad708d9d 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -480,7 +480,7 @@ Danbooru.Note = { dragging: false, dragStartX: 0, dragStartY: 0, - dragDistanceY: 0, + dragDistanceX: 0, dragDistanceY: 0, x: 0, y: 0, From 5bbd1e0c67627d051647a310ac726d165ab9369a Mon Sep 17 00:00:00 2001 From: zatchii Date: Wed, 8 May 2013 22:28:01 +0000 Subject: [PATCH 02/36] URL encode wiki link --- app/assets/javascripts/related_tag.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js index 656705059..1d955580a 100644 --- a/app/assets/javascripts/related_tag.js +++ b/app/assets/javascripts/related_tag.js @@ -160,8 +160,9 @@ query = query.replace(/_/g, " "); var header = $(""); - if (match = query.match(/^wiki:(.+)/)) { - header.html($("").attr("href", "/wiki_pages?title=" + match[1]).attr("target", "_blank").text(query)); + var match = query.match(/^wiki:(.+)/); + if (match) { + header.html($("").attr("href", "/wiki_pages?title=" + encodeURIComponent(match[1])).attr("target", "_blank").text(query)); } else { header.text(query); } From 8d44878e12a81f7e64a6af9bc950592dc03aac44 Mon Sep 17 00:00:00 2001 From: Toks Date: Thu, 9 May 2013 13:55:13 -0400 Subject: [PATCH 03/36] fixes #1583 --- app/assets/javascripts/posts.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 1b54c627d..69f6753ac 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -139,8 +139,10 @@ var current_post_id = $("meta[name=post-id]").attr("content"); $("#post_" + current_post_id).css("background-color", "rgba(0,0,0,0.05)"); - this.toggle_relationship_preview($("#has-children-relationship-preview"), $("#has-children-relationship-preview-link")); - this.toggle_relationship_preview($("#has-parent-relationship-preview"), $("#has-parent-relationship-preview-link")); + if (Danbooru.Cookie.get("show-relationship-previews") === "0") { + this.toggle_relationship_preview($("#has-children-relationship-preview"), $("#has-children-relationship-preview-link")); + this.toggle_relationship_preview($("#has-parent-relationship-preview"), $("#has-parent-relationship-preview-link")); + } $("#has-children-relationship-preview-link").click(function(e) { Danbooru.Post.toggle_relationship_preview($("#has-children-relationship-preview"), $(this)); @@ -157,9 +159,11 @@ preview.toggle(); if (preview.is(":visible")) { preview_link.html("« hide"); + Danbooru.Cookie.put("show-relationship-previews", "1"); } else { preview_link.html("show »"); + Danbooru.Cookie.put("show-relationship-previews", "0"); } } From a38576245fde0bcedccb452321fcf93d5ac6dceb Mon Sep 17 00:00:00 2001 From: Toks Date: Thu, 9 May 2013 13:58:43 -0400 Subject: [PATCH 04/36] fixes #1474 --- app/assets/stylesheets/specific/posts.css.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index ecc23089a..756a121ea 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -46,6 +46,15 @@ a.blacklisted-active { border: 2px solid #F00; } +#has-parent-relationship-preview, #has-children-relationship-preview { + overflow-x: auto; + white-space: nowrap; +} + +#has-parent-relationship-preview article.post-preview, #has-children-relationship-preview article.post-preview { + float: none; +} + .category-1 a, a.tag-type-1 { color: #A00; } From be125ff6da6c44643d4b3f26fb44b7050fd67717 Mon Sep 17 00:00:00 2001 From: Toks Date: Thu, 9 May 2013 14:03:12 -0400 Subject: [PATCH 05/36] reduce width for tall relationship previews (#1474) --- app/assets/stylesheets/specific/posts.css.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 756a121ea..bbfadb9db 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -53,6 +53,8 @@ a.blacklisted-active { #has-parent-relationship-preview article.post-preview, #has-children-relationship-preview article.post-preview { float: none; + width: auto; + border: none; } .category-1 a, a.tag-type-1 { From 33e5a27ca9f69072567bee7b97d596da47d4bbb4 Mon Sep 17 00:00:00 2001 From: Toks Date: Thu, 9 May 2013 14:15:24 -0400 Subject: [PATCH 06/36] use orange border to highlight current post --- app/assets/javascripts/posts.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 69f6753ac..ac55ac926 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -4,8 +4,6 @@ Danbooru.Post.pending_update_count = 0; Danbooru.Post.initialize_all = function() { - this.initialize_post_previews(); - if ($("#c-posts").length) { if (Danbooru.meta("enable-js-navigation") === "true") { this.initialize_shortcuts(); @@ -29,6 +27,8 @@ $("#image-resize-to-window-link").click(); } } + + this.initialize_post_previews(); } Danbooru.Post.initialize_similar = function() { @@ -137,7 +137,7 @@ Danbooru.Post.initialize_post_relationship_previews = function() { var current_post_id = $("meta[name=post-id]").attr("content"); - $("#post_" + current_post_id).css("background-color", "rgba(0,0,0,0.05)"); + $("#post_" + current_post_id).addClass("post-status-current"); if (Danbooru.Cookie.get("show-relationship-previews") === "0") { this.toggle_relationship_preview($("#has-children-relationship-preview"), $("#has-children-relationship-preview-link")); @@ -218,13 +218,18 @@ } else if ($post.hasClass("post-status-flagged")) { border_colors.push("#F00"); } + if ($post.hasClass("post-status-current")) { + border_colors.push("#F80"); + } if (border_colors.length > 1) { $img.css("border", "2px solid"); - if (border_colors.length === 3) { - $img.css("border-color", border_colors[0] + " " + border_colors[2] + " " + border_colors[2] + " " + border_colors[1]); - } else if (border_colors.length === 2) { + if (border_colors.length === 2) { $img.css("border-color", border_colors[0] + " " + border_colors[1] + " " + border_colors[1] + " " + border_colors[0]); + } else if (border_colors.length === 3) { + $img.css("border-color", border_colors[0] + " " + border_colors[2] + " " + border_colors[2] + " " + border_colors[1]); + } else if (border_colors.length === 4) { + $img.css("border-color", border_colors[0] + " " + border_colors[2] + " " + border_colors[3] + " " + border_colors[1]); } } } From 66ae47e883a95bfbaec50714e880041bf6535470 Mon Sep 17 00:00:00 2001 From: Toks Date: Thu, 9 May 2013 14:23:20 -0400 Subject: [PATCH 07/36] fixes #1588 --- app/views/tags/_secondary_links.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/tags/_secondary_links.html.erb b/app/views/tags/_secondary_links.html.erb index 09d138a1e..672a295a4 100644 --- a/app/views/tags/_secondary_links.html.erb +++ b/app/views/tags/_secondary_links.html.erb @@ -8,6 +8,7 @@
  • <%= link_to "Help", wiki_pages_path(:search => {:title => "help:tags"}) %>
    • <% if @tag %>
  • |
    • +
  • <%= link_to "Posts (#{Post.fast_count(@tag.name)})", posts_path(:tags => @tag.name) %>
  • <%= link_to "Edit", edit_tag_path(@tag) %>
    • <% if @tag.post_count < 1_000 %>
  • <%= link_to "Fix", new_tag_correction_path(:tag_id => @tag.id) %>
    • From 932995b97334db8d658ca9c18d453ef9db0da876 Mon Sep 17 00:00:00 2001 From: Toks Date: Thu, 9 May 2013 14:28:33 -0400 Subject: [PATCH 08/36] fixes #1586 --- app/assets/javascripts/dtext.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/dtext.js b/app/assets/javascripts/dtext.js index 677472301..96e46da4f 100644 --- a/app/assets/javascripts/dtext.js +++ b/app/assets/javascripts/dtext.js @@ -7,6 +7,9 @@ } Danbooru.Dtext.call_preview = function(e, $button, $input, $preview) { + $button.val("Edit"); + $input.hide(); + $preview.text("Loading...").fadeIn("fast"); $.ajax({ type: "post", url: "/dtext_preview", @@ -14,8 +17,6 @@ body: $input.val() }, success: function(data) { - $button.val("Edit"); - $input.hide(); $preview.html(data).fadeIn("fast"); } }); From f6820108ee13d6dcce09a8fb85be834448d56059 Mon Sep 17 00:00:00 2001 From: ghostrigger Date: Sat, 11 May 2013 02:57:01 +0800 Subject: [PATCH 09/36] fixes #1591 hopefully adds wiki title on document's title when comparing wiki versions --- app/views/wiki_page_versions/diff.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/wiki_page_versions/diff.html.erb b/app/views/wiki_page_versions/diff.html.erb index 0c87fa13d..aa3a3d88f 100644 --- a/app/views/wiki_page_versions/diff.html.erb +++ b/app/views/wiki_page_versions/diff.html.erb @@ -11,3 +11,7 @@ <%= render "wiki_pages/secondary_links" %> + +<% content_for(:page_title) do %> + Wiki Page Version - <%= @wiki_page.pretty_title %> - <%= Danbooru.config.app_name %> +<% end %> From b600a5bcb0bd0707dac3bbcc980b83bacdba92c4 Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 10 May 2013 15:45:43 -0400 Subject: [PATCH 10/36] fix regression @wiki_page wasn't defined by the wiki page versions controller; @thispage and @otherpage were instead --- app/views/wiki_page_versions/diff.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/wiki_page_versions/diff.html.erb b/app/views/wiki_page_versions/diff.html.erb index aa3a3d88f..429be93d0 100644 --- a/app/views/wiki_page_versions/diff.html.erb +++ b/app/views/wiki_page_versions/diff.html.erb @@ -13,5 +13,5 @@ <%= render "wiki_pages/secondary_links" %> <% content_for(:page_title) do %> - Wiki Page Version - <%= @wiki_page.pretty_title %> - <%= Danbooru.config.app_name %> + Wiki Page Versions Comparison - <%= @thispage.pretty_title %> - <%= Danbooru.config.app_name %> <% end %> From eaf016921dc4405e621acf908ca2d13b4c0253bc Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 10 May 2013 15:45:48 -0400 Subject: [PATCH 11/36] Revert "fixes #1286" This reverts commit 799fc6223fbf1595d793edcf96bdcfb98b71e457. --- app/logical/post_sets/post.rb | 4 ---- app/presenters/post_set_presenters/post.rb | 10 +--------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/app/logical/post_sets/post.rb b/app/logical/post_sets/post.rb index 21db554ca..216194cc2 100644 --- a/app/logical/post_sets/post.rb +++ b/app/logical/post_sets/post.rb @@ -69,10 +69,6 @@ module PostSets tag_string =~ /\*/ end - def is_empty_search? - posts.count == 0 - end - def current_page [page.to_i, 1].max end diff --git a/app/presenters/post_set_presenters/post.rb b/app/presenters/post_set_presenters/post.rb index 6ebe62790..c24c9c7dc 100644 --- a/app/presenters/post_set_presenters/post.rb +++ b/app/presenters/post_set_presenters/post.rb @@ -9,9 +9,7 @@ module PostSetPresenters end def related_tags - if post_set.is_empty_search? - suggested_tags - elsif post_set.is_pattern_search? + if post_set.is_pattern_search? pattern_tags elsif post_set.is_tag_subscription? post_set.tag_subscription_tags @@ -41,12 +39,6 @@ module PostSetPresenters Tag.name_matches(post_set.tag_string).all(:select => "name", :limit => Danbooru.config.tag_query_limit, :order => "post_count DESC").map(&:name) end - def suggested_tags - if post_set.tag_string.length >= 3 - Tag.name_matches("*#{post_set.tag_string}*").where("post_count > 0").all(:select => "name", :limit => Danbooru.config.tag_query_limit, :order => "post_count DESC").map(&:name) - end - end - def related_tags_for_group RelatedTagCalculator.calculate_from_sample_to_array(post_set.tag_string).map(&:first) end From c0d90e84a81460ca17ff6ba1e4baecf63016934c Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 10 May 2013 18:32:24 -0400 Subject: [PATCH 12/36] change fix for #1570 --- app/assets/javascripts/posts.js | 11 +++-------- .../stylesheets/specific/posts.css.scss | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index ac55ac926..980ddd049 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -4,6 +4,8 @@ Danbooru.Post.pending_update_count = 0; Danbooru.Post.initialize_all = function() { + this.initialize_post_previews(); + if ($("#c-posts").length) { if (Danbooru.meta("enable-js-navigation") === "true") { this.initialize_shortcuts(); @@ -27,8 +29,6 @@ $("#image-resize-to-window-link").click(); } } - - this.initialize_post_previews(); } Danbooru.Post.initialize_similar = function() { @@ -137,7 +137,7 @@ Danbooru.Post.initialize_post_relationship_previews = function() { var current_post_id = $("meta[name=post-id]").attr("content"); - $("#post_" + current_post_id).addClass("post-status-current"); + $("#post_" + current_post_id).addClass("current-post"); if (Danbooru.Cookie.get("show-relationship-previews") === "0") { this.toggle_relationship_preview($("#has-children-relationship-preview"), $("#has-children-relationship-preview-link")); @@ -218,9 +218,6 @@ } else if ($post.hasClass("post-status-flagged")) { border_colors.push("#F00"); } - if ($post.hasClass("post-status-current")) { - border_colors.push("#F80"); - } if (border_colors.length > 1) { $img.css("border", "2px solid"); @@ -228,8 +225,6 @@ $img.css("border-color", border_colors[0] + " " + border_colors[1] + " " + border_colors[1] + " " + border_colors[0]); } else if (border_colors.length === 3) { $img.css("border-color", border_colors[0] + " " + border_colors[2] + " " + border_colors[2] + " " + border_colors[1]); - } else if (border_colors.length === 4) { - $img.css("border-color", border_colors[0] + " " + border_colors[2] + " " + border_colors[3] + " " + border_colors[1]); } } } diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index bbfadb9db..30f223114 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -46,15 +46,22 @@ a.blacklisted-active { border: 2px solid #F00; } +.post-preview.current-post { + background-color: rgba(0,0,0,0.1); +} + #has-parent-relationship-preview, #has-children-relationship-preview { overflow-x: auto; white-space: nowrap; -} - -#has-parent-relationship-preview article.post-preview, #has-children-relationship-preview article.post-preview { - float: none; - width: auto; - border: none; + margin-top: 5px; + + article.post-preview { + float: none; + width: auto; + border: none; + margin: 0px; + padding: 0 5px 10px; + } } .category-1 a, a.tag-type-1 { From 0bddabc9a3557bee54996f20955a1b3da0ab95d7 Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 10 May 2013 18:38:10 -0400 Subject: [PATCH 13/36] tweak #1570 --- app/assets/stylesheets/specific/posts.css.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 30f223114..ea043d1e2 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -53,14 +53,13 @@ a.blacklisted-active { #has-parent-relationship-preview, #has-children-relationship-preview { overflow-x: auto; white-space: nowrap; - margin-top: 5px; article.post-preview { float: none; width: auto; border: none; margin: 0px; - padding: 0 5px 10px; + padding: 5px 5px 10px; } } From 86c55ecccfc46c19a7acfc2550a0db73fa312b7f Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 11 May 2013 05:34:30 +0300 Subject: [PATCH 14/36] fixes #1594 --- app/assets/stylesheets/specific/forum.css.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/specific/forum.css.scss b/app/assets/stylesheets/specific/forum.css.scss index 832f0ec4d..5b1d67a80 100644 --- a/app/assets/stylesheets/specific/forum.css.scss +++ b/app/assets/stylesheets/specific/forum.css.scss @@ -53,4 +53,8 @@ div#c-forum-topics { span.locked-topic { color: #666; } + + tr.forum-topic-row td:last-child { + white-space: nowrap; + } } From b1d0ca821e1f3fa2968eb25b90d626be62f312d3 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Fri, 10 May 2013 19:44:14 -0700 Subject: [PATCH 15/36] fix unicorn deploy for staging --- config/deploy.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/deploy.rb b/config/deploy.rb index a20e383ad..9d6b76969 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,6 @@ set :stages, %w(production staging) set :default_stage, "staging" +set :unicorn_env, "staging" require 'capistrano/ext/multistage' require 'bundler/capistrano' From bbd3ac1867de3338f9812516a9b878ffadcdaa2b Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 10 May 2013 23:21:45 -0400 Subject: [PATCH 16/36] separate post previews html with linebreaks --- app/presenters/post_set_presenters/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/presenters/post_set_presenters/base.rb b/app/presenters/post_set_presenters/base.rb index 5ceb51b9b..fe831a926 100644 --- a/app/presenters/post_set_presenters/base.rb +++ b/app/presenters/post_set_presenters/base.rb @@ -12,7 +12,7 @@ module PostSetPresenters end posts.each do |post| - html << PostPresenter.preview(post, :tags => @post_set.tag_string) + html << PostPresenter.preview(post, :tags => @post_set.tag_string) + "\n" end html.html_safe From 54ca6973c2c7d2e4434c0c98f1f367a743ea689f Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 11 May 2013 06:36:49 +0300 Subject: [PATCH 17/36] Removed duplicate css div.nav-notice has the same + more/newer --- app/assets/stylesheets/specific/posts.css.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index ea043d1e2..e1cdb18a1 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -263,11 +263,6 @@ div#c-posts { .pool-name, .search-name { word-wrap: break-word; } - - #nav-links { - margin: 1em 0; - padding: 0.5em; - } #content.with-ads { margin-right: 7em; From 47f57bdd3fdda51aa655012cc09f2e7c7f9dd434 Mon Sep 17 00:00:00 2001 From: Lightforger Date: Sat, 11 May 2013 06:38:57 +0300 Subject: [PATCH 18/36] fixes #1595 --- app/assets/stylesheets/specific/posts.css.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index e1cdb18a1..d3db28ab6 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -274,6 +274,8 @@ div#c-posts { } #pool-nav, #search-seq-nav, #nav-help { + margin: 0px 0px 0.5em 0px; + li { position: relative; text-align: center; From 0ced0ca659f977f6a1ec7150c9c5e7dda5d16126 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 07:28:42 -0400 Subject: [PATCH 19/36] fix --- app/presenters/post_set_presenters/base.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/presenters/post_set_presenters/base.rb b/app/presenters/post_set_presenters/base.rb index fe831a926..98976ca30 100644 --- a/app/presenters/post_set_presenters/base.rb +++ b/app/presenters/post_set_presenters/base.rb @@ -12,7 +12,8 @@ module PostSetPresenters end posts.each do |post| - html << PostPresenter.preview(post, :tags => @post_set.tag_string) + "\n" + html << PostPresenter.preview(post, :tags => @post_set.tag_string) + html << "\n" end html.html_safe From 189544f66f7afa177fcc23dd45a441af3b6e1b45 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 07:42:39 -0400 Subject: [PATCH 20/36] fix css for #1595 --- app/assets/stylesheets/specific/posts.css.scss | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index d3db28ab6..d9e7e451f 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -263,7 +263,12 @@ div#c-posts { .pool-name, .search-name { word-wrap: break-word; } - + + #nav-links { + margin: 1em 0; + padding: 0.5em; + } + #content.with-ads { margin-right: 7em; } @@ -273,9 +278,11 @@ div#c-posts { word-wrap: break-word; } + #search-seq-nav + #pool-nav { + margin-top: 0.5em; + } + #pool-nav, #search-seq-nav, #nav-help { - margin: 0px 0px 0.5em 0px; - li { position: relative; text-align: center; From f972ee53c0de6b40c9ef26f94583687668f36a80 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 08:31:03 -0400 Subject: [PATCH 21/36] enhance show or new wpages; move wpage preview code to helper --- app/controllers/wiki_pages_controller.rb | 3 +++ app/helpers/wiki_pages_helper.rb | 13 +++++++++++++ app/views/wiki_pages/new.html.erb | 7 +------ app/views/wiki_pages/show.html.erb | 7 +------ app/views/wiki_pages/show_or_new.html.erb | 9 +++++++-- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb index 5645bba2e..58f4c17a3 100644 --- a/app/controllers/wiki_pages_controller.rb +++ b/app/controllers/wiki_pages_controller.rb @@ -69,6 +69,9 @@ class WikiPagesController < ApplicationController @wiki_page = WikiPage.find_by_title(params[:title]) if @wiki_page redirect_to wiki_page_path(@wiki_page) + else + @wiki_page = WikiPage.new(params[:wiki_page]) + respond_with(@wiki_page) end end diff --git a/app/helpers/wiki_pages_helper.rb b/app/helpers/wiki_pages_helper.rb index 9fbc3862c..382b6ae9b 100644 --- a/app/helpers/wiki_pages_helper.rb +++ b/app/helpers/wiki_pages_helper.rb @@ -33,4 +33,17 @@ module WikiPagesHelper html.html_safe end + + def wiki_page_post_previews(wiki_page) + html = '
    ' + + if Post.fast_count(wiki_page.title) > 0 + html << "

    Posts

    " + html << wiki_page.post_set.presenter.post_previews_html(self) + end + + html << "
    " + + html.html_safe + end end diff --git a/app/views/wiki_pages/new.html.erb b/app/views/wiki_pages/new.html.erb index 0d56f5858..3482cea4d 100644 --- a/app/views/wiki_pages/new.html.erb +++ b/app/views/wiki_pages/new.html.erb @@ -15,12 +15,7 @@ <%= wiki_page_alias_and_implication_list(@wiki_page)%> -
    - <% if Post.fast_count(@wiki_page.title) > 0 %> -

    Posts

    - <% end %> - <%= @wiki_page.post_set.presenter.post_previews_html(self) %> -
    + <%= wiki_page_post_previews(@wiki_page) %>
    diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb index 74b051b81..4b4f37bb4 100644 --- a/app/views/wiki_pages/show.html.erb +++ b/app/views/wiki_pages/show.html.erb @@ -18,12 +18,7 @@ <%= wiki_page_alias_and_implication_list(@wiki_page) %> -
    - <% if Post.fast_count(@wiki_page.title) > 0 %> -

    Posts

    - <% end %> - <%= @wiki_page.post_set.presenter.post_previews_html(self) %> -
    + <%= wiki_page_post_previews(@wiki_page) %> diff --git a/app/views/wiki_pages/show_or_new.html.erb b/app/views/wiki_pages/show_or_new.html.erb index 8c7288781..c75c45a95 100644 --- a/app/views/wiki_pages/show_or_new.html.erb +++ b/app/views/wiki_pages/show_or_new.html.erb @@ -7,12 +7,17 @@

    This wiki page does not exist. <%= link_to "Create new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.

    + + <%= wiki_page_alias_and_implication_list(@wiki_page)%> + + <%= wiki_page_post_previews(@wiki_page) %> + +<%= render "secondary_links" %> + <% content_for(:page_title) do %> Wiki - <%= params[:title] %> - <%= Danbooru.config.app_name %> <% end %> - -<%= render "secondary_links" %> From 299fc1057e7afa36ef17171b67cd9d124d616ed3 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 08:37:00 -0400 Subject: [PATCH 22/36] fix wiki page errors --- app/controllers/wiki_pages_controller.rb | 2 +- app/logical/post_sets/wiki_page.rb | 2 +- app/presenters/post_set_presenters/wiki_page.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb index 58f4c17a3..a3ca8ee28 100644 --- a/app/controllers/wiki_pages_controller.rb +++ b/app/controllers/wiki_pages_controller.rb @@ -70,7 +70,7 @@ class WikiPagesController < ApplicationController if @wiki_page redirect_to wiki_page_path(@wiki_page) else - @wiki_page = WikiPage.new(params[:wiki_page]) + @wiki_page = WikiPage.new(:title => params[:title]) respond_with(@wiki_page) end end diff --git a/app/logical/post_sets/wiki_page.rb b/app/logical/post_sets/wiki_page.rb index 2c83d5c2c..22625fa43 100644 --- a/app/logical/post_sets/wiki_page.rb +++ b/app/logical/post_sets/wiki_page.rb @@ -2,7 +2,7 @@ module PostSets class SearchError < Exception end - class WikiPage < Post + class WikiPage < PostSets::Post def presenter @presenter ||= ::PostSetPresenters::WikiPage.new(self) end diff --git a/app/presenters/post_set_presenters/wiki_page.rb b/app/presenters/post_set_presenters/wiki_page.rb index 7d057b7c8..1299b2d6e 100644 --- a/app/presenters/post_set_presenters/wiki_page.rb +++ b/app/presenters/post_set_presenters/wiki_page.rb @@ -1,5 +1,5 @@ module PostSetPresenters - class WikiPage < Post + class WikiPage < PostSetPresenters::Post def posts @post_set.posts rescue ActiveRecord::StatementInvalid, PGError From 3366291ea0ee4ae302c908f0d2819aba71098e57 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 09:13:36 -0400 Subject: [PATCH 23/36] fix css for #1595 --- app/assets/stylesheets/specific/posts.css.scss | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index d9e7e451f..4aabf1385 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -170,8 +170,8 @@ div#c-posts { } div.nav-notice { - padding: 0.5em 0.5em 0; - margin-bottom: 1em; + padding: 0.5em; + margin: 1em 0; background: #EEE; border: 1px solid #AAA; position: relative; @@ -264,11 +264,6 @@ div#c-posts { word-wrap: break-word; } - #nav-links { - margin: 1em 0; - padding: 0.5em; - } - #content.with-ads { margin-right: 7em; } From 20588a7848a8370c9e53bf0bb11e0983e9da46bb Mon Sep 17 00:00:00 2001 From: ghostrigger Date: Sat, 11 May 2013 21:52:37 +0800 Subject: [PATCH 24/36] fixes #1578 hopefully pulls the `query` parameter from url; removes the `user:` prefix. there must be more elegant solution than this. --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 4f53f744d..0a1f50ba6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -239,7 +239,7 @@ Danbooru::Application.routes.draw do match "/comment/index" => redirect {|params, req| "/comments?page=#{req.params[:page]}"} match "/comment/show/:id" => redirect("/comments/%{id}") match "/comment/new" => redirect("/comments") - match "/comment/search" => redirect("/comments/search") + match "/comment/search" => redirect {|params, req| "/comments?group_by=comment&search[creator_name]=#{CGI::escape(req.params[:query].to_s).sub!(/^user(%3A|%253A|:)/, '')}"} match "/favorite" => redirect {|params, req| "/favorites?page=#{req.params[:page]}"} match "/favorite/index" => redirect {|params, req| "/favorites?page=#{req.params[:page]}"} From 6c5c2ee65cee6649eb64a8011673dfd9e4616450 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 10:18:39 -0400 Subject: [PATCH 25/36] add back redirect to main comment search page (#1578) Now it's more inelegant... --- config/routes.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 0a1f50ba6..3a1bd9a22 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -239,7 +239,13 @@ Danbooru::Application.routes.draw do match "/comment/index" => redirect {|params, req| "/comments?page=#{req.params[:page]}"} match "/comment/show/:id" => redirect("/comments/%{id}") match "/comment/new" => redirect("/comments") - match "/comment/search" => redirect {|params, req| "/comments?group_by=comment&search[creator_name]=#{CGI::escape(req.params[:query].to_s).sub!(/^user(%3A|%253A|:)/, '')}"} + match("/comment/search" => redirect do |params, req| + if req.params[:query] =~ /^user:(.+)/i + "/comments?group_by=comment&search[creator_name]=#{CGI::escape($1)}" + else + "/comments/search" + end + end) match "/favorite" => redirect {|params, req| "/favorites?page=#{req.params[:page]}"} match "/favorite/index" => redirect {|params, req| "/favorites?page=#{req.params[:page]}"} From 7c795c61e6f02fe13ad420027e20e3d1139fd175 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 13:41:32 -0400 Subject: [PATCH 26/36] fixes #1272 Thanks to @ghostrigger --- config/routes.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 3a1bd9a22..f81df5ca0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -289,7 +289,10 @@ Danbooru::Application.routes.draw do match "/post/view/:id" => redirect("/posts/%{id}") match "/post/flag/:id" => redirect("/posts/%{id}") - match "/post_tag_history" => redirect {|params, req| "/post_versions?page=#{req.params[:page]}"} + match("/post_tag_history" => redirect do |params, req| + page = req.params[:before_id].present? ? "b#{req.params[:before_id]}" : req.params[:page] + "/post_versions?page=#{page}&search[updater_id]=#{req.params[:user_id]}" + end) match "/post_tag_history/index" => redirect {|params, req| "/post_versions?page=#{req.params[:page]}"} match "/tag/index.xml", :controller => "legacy", :action => "tags", :format => "xml" From 3ee20d2bb7a7b85138ac27f13a35ac7e74d65c13 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 16:01:19 -0400 Subject: [PATCH 27/36] fixes #846 --- app/assets/stylesheets/specific/wiki_pages.css.scss | 5 +++++ app/controllers/wiki_pages_controller.rb | 8 ++++++-- app/helpers/wiki_pages_helper.rb | 2 +- app/views/wiki_pages/show.html.erb | 4 ++++ app/views/wiki_pages/show_or_new.html.erb | 5 +++++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/specific/wiki_pages.css.scss b/app/assets/stylesheets/specific/wiki_pages.css.scss index 6c114ec19..feab83c89 100644 --- a/app/assets/stylesheets/specific/wiki_pages.css.scss +++ b/app/assets/stylesheets/specific/wiki_pages.css.scss @@ -27,4 +27,9 @@ div#c-wiki-pages { margin-left: 15em; padding-left: 1em; } + + div.redirected-from { + font-size: 0.8em; + margin-bottom: 1em; + } } diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb index a3ca8ee28..ce2690368 100644 --- a/app/controllers/wiki_pages_controller.rb +++ b/app/controllers/wiki_pages_controller.rb @@ -67,8 +67,12 @@ class WikiPagesController < ApplicationController def show_or_new @wiki_page = WikiPage.find_by_title(params[:title]) - if @wiki_page - redirect_to wiki_page_path(@wiki_page) + tag_alias = TagAlias.where("status = 'active' and antecedent_name = ?", params[:title]).first + + if tag_alias && params[:no_redirect].blank? + redirect_to show_or_new_wiki_pages_path(:title => tag_alias.consequent_name, :redirected_from => params[:title]) + elsif @wiki_page + redirect_to wiki_page_path(@wiki_page, :redirected_from => params[:redirected_from]) else @wiki_page = WikiPage.new(:title => params[:title]) respond_with(@wiki_page) diff --git a/app/helpers/wiki_pages_helper.rb b/app/helpers/wiki_pages_helper.rb index 382b6ae9b..c0506de35 100644 --- a/app/helpers/wiki_pages_helper.rb +++ b/app/helpers/wiki_pages_helper.rb @@ -15,7 +15,7 @@ module WikiPagesHelper if consequent_aliases.any? html << "

    The following tags are aliased to this tag: " - html << raw(consequent_aliases.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", ")) + html << raw(consequent_aliases.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name, :no_redirect => true))}.join(", ")) html << ".

    " end diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb index 4b4f37bb4..0a739d067 100644 --- a/app/views/wiki_pages/show.html.erb +++ b/app/views/wiki_pages/show.html.erb @@ -12,6 +12,10 @@ <% end %> + <% if params[:redirected_from].present? %> +
    Redirected from <%= link_to params[:redirected_from], show_or_new_wiki_pages_path(:title => params[:redirected_from], :no_redirect => true) %>.
    + <% end %> +
    <%= format_text(@wiki_page.body) %> diff --git a/app/views/wiki_pages/show_or_new.html.erb b/app/views/wiki_pages/show_or_new.html.erb index c75c45a95..3c2c24ba5 100644 --- a/app/views/wiki_pages/show_or_new.html.erb +++ b/app/views/wiki_pages/show_or_new.html.erb @@ -4,6 +4,11 @@

    <%= params[:title] %>

    + + <% if params[:redirected_from].present? %> +
    Redirected from <%= link_to params[:redirected_from], show_or_new_wiki_pages_path(:title => params[:redirected_from], :no_redirect => true) %>.
    + <% end %> +

    This wiki page does not exist. <%= link_to "Create new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.

    From aa3b1a0c4d6c43a2b2e9ed825ed055244ed4a9f2 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 16:02:33 -0400 Subject: [PATCH 28/36] more visually distinct wiki page notice --- app/views/wiki_pages/show_or_new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/wiki_pages/show_or_new.html.erb b/app/views/wiki_pages/show_or_new.html.erb index 3c2c24ba5..50fc736e6 100644 --- a/app/views/wiki_pages/show_or_new.html.erb +++ b/app/views/wiki_pages/show_or_new.html.erb @@ -9,8 +9,8 @@
    Redirected from <%= link_to params[:redirected_from], show_or_new_wiki_pages_path(:title => params[:redirected_from], :no_redirect => true) %>.
    <% end %> -
    -

    This wiki page does not exist. <%= link_to "Create new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.

    +
    + This wiki page does not yet exist. <%= link_to "Create a new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.
    <%= wiki_page_alias_and_implication_list(@wiki_page)%> From ddfa019c4ca762e72aaef08d308dfebbcd2796df Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 18:00:28 -0400 Subject: [PATCH 29/36] fixes #1596 --- app/assets/javascripts/posts.js | 4 ++++ app/views/favorites/create.js.erb | 6 ++++++ app/views/favorites/destroy.js.erb | 6 ++++++ app/views/posts/partials/show/_information.html.erb | 2 +- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 980ddd049..fef5bd3bb 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -170,6 +170,10 @@ Danbooru.Post.initialize_favlist = function() { $("#favlist").hide(); $("#hide-favlist-link").hide(); + var fav_count = $("#show-favlist-link").prev().text(); + if (fav_count === "0") { + $("#show-favlist-link").hide(); + } $("#show-favlist-link").click(function(e) { $("#favlist").show(); diff --git a/app/views/favorites/create.js.erb b/app/views/favorites/create.js.erb index 6a0cc2912..01958716b 100644 --- a/app/views/favorites/create.js.erb +++ b/app/views/favorites/create.js.erb @@ -5,5 +5,11 @@ $("a#remove-from-favorites").show(); $("#score-for-post-<%= @post.id %>").html(<%= @post.score %>); $("#favcount-for-post-<%= @post.id %>").html(<%= @post.fav_count %>); + <% if CurrentUser.is_gold? %> + $("#favlist").html("<%= escape_javascript(post_favlist(@post)) %>"); + if (!$("#favlist").is(":visible")) { + $("#show-favlist-link").show(); + } + <% end %> Danbooru.notice("You have favorited this post"); <% end %> diff --git a/app/views/favorites/destroy.js.erb b/app/views/favorites/destroy.js.erb index 2ece21748..47b6a8003 100644 --- a/app/views/favorites/destroy.js.erb +++ b/app/views/favorites/destroy.js.erb @@ -2,4 +2,10 @@ $("a#add-to-favorites").show(); $("a#remove-from-favorites").hide(); $("#score-for-post-<%= @post.id %>").html(<%= @post.score %>); $("#favcount-for-post-<%= @post.id %>").html(<%= @post.fav_count %>); +<% if CurrentUser.is_gold? %> + $("#favlist").html("<%= escape_javascript(post_favlist(@post)) %>"); + <% if @post.fav_count == 0 %> + $("#show-favlist-link, #hide-favlist-link, #favlist").hide(); + <% end %> +<% end %> Danbooru.notice("You have unfavorited this post"); diff --git a/app/views/posts/partials/show/_information.html.erb b/app/views/posts/partials/show/_information.html.erb index 957e6c3e2..df06402a1 100644 --- a/app/views/posts/partials/show/_information.html.erb +++ b/app/views/posts/partials/show/_information.html.erb @@ -15,7 +15,7 @@
  • Rating: <%= post.pretty_rating %>
  • Score: <%= post.score %> <% if CurrentUser.is_gold? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %>
  • Favorites: <%= post.fav_count %> - <% if CurrentUser.is_gold? && post.fav_count > 0 %> + <% if CurrentUser.is_gold? %> <%= link_to "»".html_safe, "#", :id => "show-favlist-link" %> <%= link_to "«".html_safe, "#", :id => "hide-favlist-link" %>
    <%= post_favlist(post) %>
    From cc17c9ce55b47960c4b779594dd163dd98c22cd5 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 20:53:11 -0400 Subject: [PATCH 30/36] fixes #1560 --- app/models/user_feedback.rb | 4 ++++ app/views/user_feedbacks/search.html.erb | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/models/user_feedback.rb b/app/models/user_feedback.rb index 111a21eff..4ce908d07 100644 --- a/app/models/user_feedback.rb +++ b/app/models/user_feedback.rb @@ -47,6 +47,10 @@ class UserFeedback < ActiveRecord::Base q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].mb_chars.downcase) end + if params[:category].present? + q = q.where("category = ?", params[:category]) + end + q end end diff --git a/app/views/user_feedbacks/search.html.erb b/app/views/user_feedbacks/search.html.erb index ea449dd38..b5e02dcc4 100644 --- a/app/views/user_feedbacks/search.html.erb +++ b/app/views/user_feedbacks/search.html.erb @@ -3,9 +3,18 @@

    Search User Feedbacks

    <%= form_tag(user_feedbacks_path, :method => :get, :class => "simple_form") do %> - <%= search_field "user_name", :label => "User" %> - <%= search_field "creator_name", :label => "Creator" %> - <%= submit_tag "Search" %> +
    + <%= search_field "user_name", :label => "User" %> + + <%= search_field "creator_name", :label => "Creator" %> + + + <%= select "search", "category", %w(positive negative neutral) %> +
    + +
    + <%= submit_tag "Search" %> +
    <% end %>
    • From 7b1e5f6d9ad0a9a1855b4da0c9498f13deab6c82 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 20:59:48 -0400 Subject: [PATCH 31/36] add blank category option --- app/views/user_feedbacks/search.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/user_feedbacks/search.html.erb b/app/views/user_feedbacks/search.html.erb index b5e02dcc4..4a61686e8 100644 --- a/app/views/user_feedbacks/search.html.erb +++ b/app/views/user_feedbacks/search.html.erb @@ -9,7 +9,7 @@ <%= search_field "creator_name", :label => "Creator" %> - <%= select "search", "category", %w(positive negative neutral) %> + <%= select "search", "category", %w(positive negative neutral), :include_blank => true %>
    From 044219b642c88596ac70a5037e18e9d4a386ab15 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 21:33:11 -0400 Subject: [PATCH 32/36] fixes #1603 --- app/views/posts/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb index a450cfd5e..7383c6a97 100644 --- a/app/views/posts/index.html.erb +++ b/app/views/posts/index.html.erb @@ -17,10 +17,10 @@
    "> -
  • Posts
    • +
  • Posts
    • <% if @post_set.has_wiki? %> -
  • Wiki
    • +
  • <%= link_to "Wiki", wiki_page_path(@post_set.wiki_page), :id => "show-wiki-excerpt-link" %>
    • <% end %>     From 8f17a505e673305a8816737933cb561acf2d2691 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 11 May 2013 22:22:59 -0400 Subject: [PATCH 33/36] fixes #1422 --- app/views/comments/partials/new/_form.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/comments/partials/new/_form.html.erb b/app/views/comments/partials/new/_form.html.erb index c26b41e87..23e0b675b 100644 --- a/app/views/comments/partials/new/_form.html.erb +++ b/app/views/comments/partials/new/_form.html.erb @@ -4,6 +4,7 @@ <%= form_tag(comments_path, :class => "simple_form") do %> <%= hidden_field "comment", "post_id", :value => post.id %> <%= dtext_field "comment", "body", :input_id => "comment_response_for_#{post.id}", :preview_id => "dtext-preview-for-#{post.id}" %> + <%= submit_tag "Post" %> <%= dtext_preview_button "comment", "body", :input_id => "comment_response_for_#{post.id}", :preview_id => "dtext-preview-for-#{post.id}" %> - <%= submit_tag "Post" %> <%= check_box "comment", "do_not_bump_post", :id => "comment_do_not_bump_post_#{post.id}" %> + <%= check_box "comment", "do_not_bump_post", :id => "comment_do_not_bump_post_#{post.id}" %> <% end %> From e99f3f17472d5564fc4a35882b163fbdc2f4b7fe Mon Sep 17 00:00:00 2001 From: Toks Date: Sun, 12 May 2013 11:53:02 -0400 Subject: [PATCH 34/36] fix dashboard max level --- app/logical/moderator/dashboard/report.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/logical/moderator/dashboard/report.rb b/app/logical/moderator/dashboard/report.rb index 3694988f9..c3600e8ac 100644 --- a/app/logical/moderator/dashboard/report.rb +++ b/app/logical/moderator/dashboard/report.rb @@ -5,7 +5,7 @@ module Moderator def initialize(min_date, max_level) @min_date = min_date.present? ? min_date.to_date : 1.week.ago - @max_level = max_level.present? ? User::Levels::MEMBER : max_level.to_i + @max_level = max_level.present? ? max_level.to_i : User::Levels::MEMBER end def artists From 31ffff16878f061be5d2e201adb97939d770c233 Mon Sep 17 00:00:00 2001 From: Toks Date: Sun, 12 May 2013 13:01:41 -0400 Subject: [PATCH 35/36] fixes #1515; fixes #1405 * Notes can be resized while the edit window is opened. * Notes will remain dim when editing, except when one is hovered over. * Only one note editing window can be open at a time (for any number of notes). Related: #78 --- app/assets/javascripts/notes.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 2ad708d9d..07af4ca0a 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -66,8 +66,18 @@ Danbooru.Note = { var $note_box_inner = $(e.currentTarget); if (e.type === "mouseover") { Danbooru.Note.Body.show($note_box_inner.data("id")); + if (Danbooru.Note.editing) { + var $this = $(this); + $this.resizable("enable"); + $this.draggable("enable"); + } } else if (e.type === "mouseout") { Danbooru.Note.Body.hide($note_box_inner.data("id")); + if (Danbooru.Note.editing) { + var $this = $(this); + $this.resizable("disable"); + $this.draggable("disable"); + } } e.stopPropagation(); @@ -162,10 +172,6 @@ Danbooru.Note = { }, show: function(id) { - if (Danbooru.Note.editing) { - return; - } - Danbooru.Note.Body.hide_all(); Danbooru.Note.clear_timeouts(); var $note_body = Danbooru.Note.Body.find(id); @@ -312,7 +318,7 @@ Danbooru.Note = { $(".note-box").resizable("enable"); $(".note-box").draggable("enable"); }); - // Danbooru.Note.editing = true; + Danbooru.Note.editing = true; }, parameterize_note: function($note_box, $note_body) { @@ -410,7 +416,7 @@ Danbooru.Note = { var id = $this.data("id"); Danbooru.Note.Box.find(id).remove(); Danbooru.Note.Body.find(id).remove(); - $(this).dialog("close"); + $this.dialog("close"); if (id.match(/\d/)) { $.ajax("/notes/" + id + ".js", { From fcd450b2fd084a0f4ee39d05759aa368219ffbbc Mon Sep 17 00:00:00 2001 From: Toks Date: Sun, 12 May 2013 13:52:26 -0400 Subject: [PATCH 36/36] fixes #1609 --- app/views/forum_posts/_forum_post.html.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb index fe0899d74..5aa59276d 100644 --- a/app/views/forum_posts/_forum_post.html.erb +++ b/app/views/forum_posts/_forum_post.html.erb @@ -37,8 +37,11 @@
  • <%= link_to "Edit", edit_forum_post_path(forum_post.id) %>
    • <% end %> <% end %> -
  • <%= link_to "Parent", forum_topic_path(forum_post.topic, :page => forum_post.forum_topic_page, :anchor => "forum_post_#{forum_post.id}") %>
    • -
  • <%= link_to "Permalink", forum_post_path(forum_post) %>
    • + <% if params[:controller] == "forum_posts" %> +
  • <%= link_to "Parent", forum_topic_path(forum_post.topic, :page => forum_post.forum_topic_page, :anchor => "forum_post_#{forum_post.id}") %>
    • + <% else %> +
  • <%= link_to "Permalink", forum_post_path(forum_post) %>
    • + <% end %>