* Removed unapprovals, added post flags and post appeals (still need to update tests)

* Restyled text

app/views/posts/partials/index/_mode_menu.html.erb

@@ -17,6 +17,5 @@
     <% if CurrentUser.user.is_janitor? %>
       <option value="approve">Approve</option>
     <% end %>
-    <option value="unapprove">Unapprove</option>
   </select>          
 </form>

app/views/posts/partials/show/_information.html.erb

@@ -4,8 +4,11 @@
   <% if post.approver %>
     <li>Approver: <%= link_to(post.approver.name, user_path(post.approver_id)) %></li>
   <% end %>
-  <% if post.unapproval %>
-    <li>Unapproved: <%= post.unapproval.reason %> (by <%= post.unapproval.unapprover.name %>)</li>
+  <% if post.is_flagged? %>
+    <li>Flagged: <%= post_flag_reason(post) %></li>
+  <% end %>
+  <% if (post.is_flagged? || post.is_deleted?) && post.appeals.any? %>
+    <li>Appealed: <%= post_appeal_reason(post) %></li>
   <% end %>
   <li>
     Size: <%= number_to_human_size(post.file_size) %> 

app/views/posts/partials/show/_options.html.erb

@@ -3,7 +3,8 @@
   <li><%= link_to "Favorite", favorite_path(post), :remote => true, :method => :post, :id => "add-to-favorites" %></li>
   <li><%= link_to "Unfavorite", favorite_path(post), :remote => true, :method => :delete, :id => "remove-from-favorites" %></li>
   <li><%= link_to "Translate", "#" %></li>
-  <li><%= link_to "Unapprove", new_unapproval_path(:post_id => post.id), :id => "unapprove" %></li>
+  <li><%= link_to "Flag", new_post_flag_path(:post_id => post.id), :id => "flag" %></li>
+  <li><%= link_to "Appeal", new_post_appeal_path(:post_id => post.id), :id => "appeal" %></li>
   <% if CurrentUser.is_janitor? %>
     <li><%= link_to "Approve", post_moderation_approve_path(:post_id => post.id), :remote => true, :method => :put, :id => "approve" %></li>
     <li><%= link_to "Disapprove", post_moderation_disapprove_path(:post_id => post.id), :remote => true, :method => :put, :id => "disapprove" %></li>

app/views/posts/show.html.erb

@@ -60,8 +60,12 @@
     </section>    
   </div>
 
-  <div id="unapprove-dialog" title="Unapprove Post">
-    <%= render :template => "unapprovals/new" %>
+  <div id="flag-dialog" title="Flag Post">
+    <%= render :template => "post_flags/new" %>
+  </div>
+
+  <div id="appeal-dialog" title="Appeal Post">
+    <%= render :template => "post_appeals/new" %>
   </div>
   
   <div id="add-to-pool-dialog" title="Add to Pool">
@@ -78,7 +82,6 @@
   <meta name="favorites" content="<%= @post.fav_string %>">
   <meta name="pools" content="<%= @post.pool_string %>">
   <meta name="post-id" content="<%= @post.id %>">
-  <meta name="post-is-unapprovable" content="<%= @post.is_unapprovable? %>">
   <meta name="post-is-approvable" content="<%= @post.is_approvable? %>">
   <meta name="post-is-deleted" content="<%= @post.is_deleted? %>">
 <% end %>