jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2737 from evazion/fix-link-rules

Browse Source 
Link self-upload disclaimer on /uploads; link howto:flag in flag notices.
This commit is contained in:
Albert Yi
2016-10-24 17:23:50 -07:00
committed by GitHub
parent 4926db7e42 5e3393817f
commit ae61cc8a40
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/posts/partials/show/_notices.html.erb
View File

@@ -1,6 +1,6 @@
<% if post.is_flagged? && !post.is_deleted? && post.flags.any? %> <% if post.is_flagged? && !post.is_deleted? && post.flags.any? %>
<div class="ui-corner-all ui-state-highlight notice notice-flagged"> <div class="ui-corner-all ui-state-highlight notice notice-flagged">
<p>This post was flagged for deletion: </p> <p>This post was flagged for review (<%= link_to "learn more", wiki_pages_path(:title => "howto:flag") %>): </p>
<%= post_flag_reasons(post) %> <%= post_flag_reasons(post) %>
</div> </div>
@@ -79,4 +79,4 @@
</div> </div>
<% end %> <% end %>
<%= render "post_disapprovals/detailed_rejection_dialog" %> <%= render "post_disapprovals/detailed_rejection_dialog" %>

5
app/views/uploads/new.html.erb
View File

@@ -4,7 +4,10 @@
<% if CurrentUser.can_upload? %> <% if CurrentUser.can_upload? %>
<div id="upload-guide-notice"> <div id="upload-guide-notice">
<p>Before uploading, please read the <%= link_to "how to upload guide", wiki_pages_path(:title => "howto:upload") %>.</p> <p><strong>Before uploading, please read the <%= link_to "how to upload guide", wiki_pages_path(:title => "howto:upload") %></strong>.
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.</p>
</div> </div>
<% unless CurrentUser.can_upload_free? %> <% unless CurrentUser.can_upload_free? %>