From c5731298fb219757ddd3f32c589e759cce4c3c4d Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Tue, 19 Feb 2013 22:03:01 -0500
Subject: [PATCH] clarify post deletion/flag logic

---
 app/helpers/post_appeals_helper.rb            |  2 +-
 app/helpers/post_flags_helper.rb              |  2 +-
 app/views/artist_versions/index.html.erb      |  2 +-
 app/views/forum_posts/index.html.erb          |  2 +-
 .../_activity_user_feedback.html.erb          |  2 +-
 app/views/moderator/post/queues/show.html.erb |  2 +-
 app/views/notes/index_by_note.html.erb        |  2 +-
 .../posts/partials/show/_information.html.erb |  2 +-
 .../posts/partials/show/_notices.html.erb     | 22 +++++++++++++------
 app/views/user_feedbacks/index.html.erb       |  2 +-
 app/views/users/index.html.erb                |  2 +-
 app/views/wiki_page_versions/show.html.erb    |  2 +-
 12 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/app/helpers/post_appeals_helper.rb b/app/helpers/post_appeals_helper.rb
index 218072c81..6274fc86c 100644
--- a/app/helpers/post_appeals_helper.rb
+++ b/app/helpers/post_appeals_helper.rb
@@ -4,7 +4,7 @@ module PostAppealsHelper
     html << '<ul>'
     
     post.appeals.each do |appeal|
-      html << '<li>' + appeal.reason + ' - ' + link_to(appeal.creator.name, user_path(appeal.creator)) + ' ' + time_ago_in_words_tagged(appeal.created_at) + ' ago</li>'
+      html << '<li>' + appeal.reason + ' - ' + link_to(appeal.creator.name, user_path(appeal.creator)) + ' ' + time_ago_in_words_tagged(appeal.created_at) + '</li>'
     end
     
     html << '</ul>'
diff --git a/app/helpers/post_flags_helper.rb b/app/helpers/post_flags_helper.rb
index c86f58aee..9ca0aeb1b 100644
--- a/app/helpers/post_flags_helper.rb
+++ b/app/helpers/post_flags_helper.rb
@@ -10,7 +10,7 @@ module PostFlagsHelper
         html << ' - ' + link_to(flag.creator.name, user_path(flag.creator))
       end
 
-      html << ' ' + time_ago_in_words_tagged(flag.created_at) + ' ago</li>'
+      html << ' ' + time_ago_in_words_tagged(flag.created_at) + '</li>'
     end
     
     html << '</ul>'
diff --git a/app/views/artist_versions/index.html.erb b/app/views/artist_versions/index.html.erb
index 484ea1621..90b84b199 100644
--- a/app/views/artist_versions/index.html.erb
+++ b/app/views/artist_versions/index.html.erb
@@ -21,7 +21,7 @@
               <td><%= link_to h(artist_version.name), artist_versions_path(:artist_id => artist_version.artist_id) %></td>
               <td><%= h artist_version.other_names %></td>
               <td><%= h artist_version.group_name %></td>
-              <td><%= time_ago_in_words_tagged artist_version.created_at %> ago</td>
+              <td><%= time_ago_in_words_tagged artist_version.created_at %></td>
               <td><%= link_to artist_version.updater_name, user_path(artist_version.updater_id) %></td>
               <td><%= artist_version.is_active? %></td>
               <td><%= artist_version.url_string %></td>
diff --git a/app/views/forum_posts/index.html.erb b/app/views/forum_posts/index.html.erb
index cedc4958e..9371e1d9b 100644
--- a/app/views/forum_posts/index.html.erb
+++ b/app/views/forum_posts/index.html.erb
@@ -15,7 +15,7 @@
             <td><%= link_to forum_post.topic.title, forum_topic_path(forum_post.topic) %></td>
             <td><%= link_to truncate(forum_post.body, :length => 50), forum_post_path(forum_post) %></td>
             <td><%= forum_post.creator.name %></td>
-            <td><%= time_ago_in_words_tagged forum_post.created_at %> ago</td>
+            <td><%= time_ago_in_words_tagged forum_post.created_at %></td>
           </tr>
         <% end %>
       </tbody>
diff --git a/app/views/moderator/dashboards/_activity_user_feedback.html.erb b/app/views/moderator/dashboards/_activity_user_feedback.html.erb
index 1eeb22a71..d90078460 100644
--- a/app/views/moderator/dashboards/_activity_user_feedback.html.erb
+++ b/app/views/moderator/dashboards/_activity_user_feedback.html.erb
@@ -12,7 +12,7 @@
       <tr class="user-record-score-<%= record.category %>">
         <td><%= link_to(record.user.name, user_path(record.user)) %></td>
         <td><%= format_text(record.body) %></td>
-        <td><%= time_ago_in_words_tagged(record.created_at) %> ago</td>
+        <td><%= time_ago_in_words_tagged(record.created_at) %></td>
       </tr>
     <% end %>
   </tbody>
diff --git a/app/views/moderator/post/queues/show.html.erb b/app/views/moderator/post/queues/show.html.erb
index ac276c3ed..8cd528975 100644
--- a/app/views/moderator/post/queues/show.html.erb
+++ b/app/views/moderator/post/queues/show.html.erb
@@ -42,7 +42,7 @@
                   (<%= post.image_width %>x<%= post.image_height %>)
                 <% end %>
               </li>
-              <li><strong>Uploader</strong>: <%= link_to(post.uploader.name, user_path(post.uploader_id)) %> <%= time_ago_in_words_tagged(post.created_at) %> ago</li>
+              <li><strong>Uploader</strong>: <%= link_to(post.uploader.name, user_path(post.uploader_id)) %> <%= time_ago_in_words_tagged(post.created_at) %></li>
               <% if post.is_flagged? %>
                 <li><strong>Flagged</strong>: <%= post_flag_reasons(post) %></li>
               <% end %>
diff --git a/app/views/notes/index_by_note.html.erb b/app/views/notes/index_by_note.html.erb
index 93d9042d5..4a95c622d 100644
--- a/app/views/notes/index_by_note.html.erb
+++ b/app/views/notes/index_by_note.html.erb
@@ -17,7 +17,7 @@
           <tr>
             <td><%= link_to note.post_id, post_path(note.post_id) %></td>
             <td><%= link_to note.creator.name, user_path(note.creator_id) %></td>
-            <td><%= time_ago_in_words_tagged(note.created_at) %> ago</td>
+            <td><%= time_ago_in_words_tagged(note.created_at) %></td>
             <td><%= note.is_active? %></td>
             <td><%= format_text(note.body) %></td>
           </tr>
diff --git a/app/views/posts/partials/show/_information.html.erb b/app/views/posts/partials/show/_information.html.erb
index 11c09685f..5751d59b1 100644
--- a/app/views/posts/partials/show/_information.html.erb
+++ b/app/views/posts/partials/show/_information.html.erb
@@ -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 %>
diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb
index cfd1fc969..29ec42adf 100644
--- a/app/views/posts/partials/show/_notices.html.erb
+++ b/app/views/posts/partials/show/_notices.html.erb
@@ -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 %>
diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb
index 891294b17..1d89a4eee 100644
--- a/app/views/user_feedbacks/index.html.erb
+++ b/app/views/user_feedbacks/index.html.erb
@@ -18,7 +18,7 @@
             <td><%= feedback.category %></td>
             <td><%= link_to feedback.user_name, user_path(feedback.user_id) %></td>
             <td><%= link_to feedback.creator_name, user_path(feedback.creator_id) %></td>
-            <td><%= time_ago_in_words_tagged(feedback.created_at) %> ago</td>
+            <td><%= time_ago_in_words_tagged(feedback.created_at) %></td>
             <td><%= format_text(feedback.body) %></td>
           </tr>
         <% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index d86086e09..a5a06f252 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -46,7 +46,7 @@
             <% end %>
             <td><%= link_to user.note_versions.count, note_versions_path(:search => {:updater_id => user.id}) %></td>
             <td><%= user.level_string %></td>
-            <td><span title="<%= user.created_at %>"><%= time_ago_in_words_tagged user.created_at %> ago</span></td>
+            <td><span title="<%= user.created_at %>"><%= time_ago_in_words_tagged user.created_at %></span></td>
           </tr>
         <% end %>
       </tbody>
diff --git a/app/views/wiki_page_versions/show.html.erb b/app/views/wiki_page_versions/show.html.erb
index ee698368c..f06a4dcf1 100644
--- a/app/views/wiki_page_versions/show.html.erb
+++ b/app/views/wiki_page_versions/show.html.erb
@@ -3,7 +3,7 @@
     <%= render "wiki_pages/sidebar" %>
     
     <section id="content">
-      <h1 id="wiki-page-title"><%= @wiki_page_version.pretty_title %> <span class="version">(<%= time_ago_in_words_tagged(@wiki_page_version.updated_at) %> ago)</span></h1>
+      <h1 id="wiki-page-title"><%= @wiki_page_version.pretty_title %> <span class="version">(<%= time_ago_in_words_tagged(@wiki_page_version.updated_at) %>)</span></h1>
       
       <div id="wiki-page-body" class="dtext">
         <%= format_text(@wiki_page_version.body) %>