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

clarify post deletion/flag logic

Browse Source
This commit is contained in:
albert
2013-02-19 22:03:01 -05:00
parent 5202ee42f6
commit c5731298fb
12 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/posts/partials/show/_information.html.erb
View File

@@ -1,6 +1,6 @@
<ul>
<li>Uploader: <%= link_to_unless(post.uploader.nil?, post.uploader_name, user_path(post.uploader)) %></li>
<li>Date: <time datetime="<%= post.created_at.iso8601 %>" title="<%= post.created_at.to_date %>"><%= raw time_ago_in_words_tagged(post.created_at).gsub(/about/, "") %> ago</time></li>
<li>Date: <time datetime="<%= post.created_at.iso8601 %>" title="<%= post.created_at.to_date %>"><%= raw time_ago_in_words_tagged(post.created_at).gsub(/about/, "") %></time></li>
<% if post.approver %>
<li>Approver: <%= link_to(post.approver.name, user_path(post.approver_id)) %></li>
<% end %>

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

@@ -1,12 +1,20 @@
<% if post.is_deleted? %>
<div class="ui-corner-all ui-state-error notice">
This post has been deleted
<% if post.is_flagged? && !post.is_deleted? && post.flags.any? %>
<div class="ui-corner-all ui-state-highlight notice">
<p>This post was flagged for deletion: </p>
<%= post_flag_reasons(post) %>
</div>
<% end %>
<% if (post.is_flagged? || post.is_deleted?) && post.flags.any? %>
<% if post.is_deleted? && post.flags.empty? %>
<div class="ui-corner-all ui-state-error notice">
This post was deleted
</div>
<% end %>
<% if post.is_deleted? && post.flags.any? %>
<div class="ui-corner-all ui-state-highlight notice">
<p>This post has been flagged for deletion: </p>
<p>This post was deleted for the following reasons: </p>
<%= post_flag_reasons(post) %>
</div>
@@ -19,7 +27,7 @@
<% if CurrentUser.is_janitor? && !post.disapproved_by?(CurrentUser.user) %>
<div class="quick-mod">
<% unless post.is_status_locked? %>
<%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :method => :post, :remote => true, :class => "btn" %>
<%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :method => :post, :remote => true, :class => "btn" %> |
<% end %>
<%= link_to "Hide from queue", moderator_post_disapproval_path(:post_id => post.id), :method => :post, :remote => true, :class => "btn" %>
</div>
@@ -29,7 +37,7 @@
<% if (post.is_flagged? || post.is_deleted?) && post.appeals.any? %>
<div class="ui-corner-all ui-state-highlight notice">
<p>This post has been appealed:</p>
<p>This post was appealed:</p>
<%= post_appeal_reasons(post) %>
</div>
<% end %>