From 13d4474818cfb47d3d448483e7721bb6e1c8e39f Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 24 Oct 2016 18:05:31 -0500 Subject: [PATCH 1/2] Add self-uploading disclaimer to uploads page. --- app/views/uploads/new.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index 16db8a56a..5ea88ebc4 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -4,7 +4,10 @@ <% if CurrentUser.can_upload? %>
-

Before uploading, please read the <%= link_to "how to upload guide", wiki_pages_path(:title => "howto:upload") %>.

+

Before uploading, please read the <%= link_to "how to upload guide", wiki_pages_path(:title => "howto:upload") %>. + If you plan to upload your own art, you should read <%= Danbooru.config.app_name %>'s + <%= link_to "specific policy guidance", wiki_pages_path(:title => "howto:upload", :anchor => "dtext-self-upload") %> + first. More suitable sites to uploading your own artwork include DeviantArt, Tumblr, Twitter, Pixiv, etc.

<% unless CurrentUser.can_upload_free? %> From 5e3393817fe2303c9a623b969f7dc1566a381e35 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 24 Oct 2016 16:04:31 -0500 Subject: [PATCH 2/2] Link to howto:flag in flag notice. --- app/views/posts/partials/show/_notices.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb index 5fb158de8..b9e565598 100644 --- a/app/views/posts/partials/show/_notices.html.erb +++ b/app/views/posts/partials/show/_notices.html.erb @@ -1,6 +1,6 @@ <% if post.is_flagged? && !post.is_deleted? && post.flags.any? %>
-

This post was flagged for deletion:

+

This post was flagged for review (<%= link_to "learn more", wiki_pages_path(:title => "howto:flag") %>):

<%= post_flag_reasons(post) %>
@@ -79,4 +79,4 @@ <% end %> -<%= render "post_disapprovals/detailed_rejection_dialog" %> \ No newline at end of file +<%= render "post_disapprovals/detailed_rejection_dialog" %>