- This post has been deleted
+<% if post.is_flagged? && !post.is_deleted? && post.flags.any? %>
+
+
This post was flagged for deletion:
+
+ <%= post_flag_reasons(post) %>
<% end %>
-<% if (post.is_flagged? || post.is_deleted?) && post.flags.any? %>
+<% if post.is_deleted? && post.flags.empty? %>
+
+ This post was deleted
+
+<% end %>
+
+<% if post.is_deleted? && post.flags.any? %>
-
This post has been flagged for deletion:
+
This post was deleted for the following reasons:
<%= post_flag_reasons(post) %>
@@ -19,7 +27,7 @@
<% if CurrentUser.is_janitor? && !post.disapproved_by?(CurrentUser.user) %>
<% 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" %>
@@ -29,7 +37,7 @@
<% if (post.is_flagged? || post.is_deleted?) && post.appeals.any? %>
-
This post has been appealed:
+
This post was appealed:
<%= post_appeal_reasons(post) %>
<% 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 @@
<%= feedback.category %> |
<%= link_to feedback.user_name, user_path(feedback.user_id) %> |
<%= link_to feedback.creator_name, user_path(feedback.creator_id) %> |
-
<%= time_ago_in_words_tagged(feedback.created_at) %> ago |
+
<%= time_ago_in_words_tagged(feedback.created_at) %> |
<%= format_text(feedback.body) %> |
<% 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 %>
<%= link_to user.note_versions.count, note_versions_path(:search => {:updater_id => user.id}) %> |
<%= user.level_string %> |
-
<%= time_ago_in_words_tagged user.created_at %> ago |
+
<%= time_ago_in_words_tagged user.created_at %> |
<% end %>
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" %>
- <%= @wiki_page_version.pretty_title %> (<%= time_ago_in_words_tagged(@wiki_page_version.updated_at) %> ago)
+ <%= @wiki_page_version.pretty_title %> (<%= time_ago_in_words_tagged(@wiki_page_version.updated_at) %>)
<%= format_text(@wiki_page_version.body) %>