From 4c93154569643a145ecfa95c95ac9d05519e290d Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Fri, 22 Mar 2013 08:45:01 -0700
Subject: [PATCH] fixes #1031

---
 .../posts/partials/show/_options.html.erb     | 55 +++++++++----------
 app/views/posts/show.html.erb                 | 10 ++--
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb
index d21c6f6fb..d73f845bb 100644
--- a/app/views/posts/partials/show/_options.html.erb
+++ b/app/views/posts/partials/show/_options.html.erb
@@ -1,36 +1,35 @@
 <ul>
-  <% if CurrentUser.is_member? %>
-    <li><%= link_to "Resize to window", "#", :id => "image-resize-to-window-link" %></li>
-    <li><%= link_to "Favorite", favorites_path(:post_id => post.id), :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 "Add to pool", "#", :id => "pool" %></li>
-    <% if post.is_note_locked? %>
-      <li><span id="note-locked-notice">Note locked</span></li>
-    <% else %>
-      <li><%= link_to "Add note", "#", :id => "translate", :title => "Shortcut is CTRL+N" %></li>
+  <li><%= link_to "Resize to window", "#", :id => "image-resize-to-window-link" %></li>
+  <li><%= link_to "Favorite", favorites_path(:post_id => post.id), :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 "Add to pool", "#", :id => "pool" %></li>
+  <% if post.is_note_locked? %>
+    <li><span id="note-locked-notice">Note locked</span></li>
+  <% else %>
+    <li><%= link_to "Add note", "#", :id => "translate", :title => "Shortcut is CTRL+N" %></li>
+  <% end %>
+  <li><%= link_to "Find similar", "http://danbooru.iqdb.org/db-search.php?url=http://#{Danbooru.config.hostname}#{post.preview_file_url}" %></li>
+
+  <% unless post.is_status_locked? %>
+    <% if !post.is_deleted? && !post.is_pending? %>
+      <li><%= link_to "Flag", new_post_flag_path(:post_id => post.id), :id => "flag" %></li>
     <% end %>
-    <li><%= link_to "Find similar", "http://danbooru.iqdb.org/db-search.php?url=http://#{Danbooru.config.hostname}#{post.preview_file_url}" %></li>
 
-    <% unless post.is_status_locked? %>
-      <% if !post.is_deleted? && !post.is_pending? %>
-        <li><%= link_to "Flag", new_post_flag_path(:post_id => post.id), :id => "flag" %></li>
+    <% if post.is_flagged? || post.is_deleted? %>
+      <li><%= link_to "Appeal", new_post_appeal_path(:post_id => post.id), :id => "appeal" %></li>
+    <% end %>
+
+    <% if CurrentUser.is_janitor? %>
+      <% if post.is_deleted? %>
+        <li><%= link_to "Undelete", undelete_moderator_post_post_path(:post_id => post.id), :remote => true, :method => :post, :id => "undelete" %></li>
+      <% else %>
+        <li><%= link_to "Delete", confirm_delete_moderator_post_post_path(:post_id => post.id) %></li>
       <% end %>
 
-      <% if post.is_flagged? || post.is_deleted? %>
-        <li><%= link_to "Appeal", new_post_appeal_path(:post_id => post.id), :id => "appeal" %></li>
-      <% end %>
-
-      <% if CurrentUser.is_janitor? %>
-        <% if post.is_flagged? || post.is_pending? %>
-          <li><%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :remote => true, :method => :post, :id => "approve" %></li>
-        <% else %>
-          <li><%= link_to "Hide from queue", moderator_post_disapproval_path(:post_id => post.id), :remote => true, :method => :post, :id => "disapprove" %></li>
-        <% end %>
-        <% if post.is_deleted? %>
-          <li><%= link_to "Undelete", undelete_moderator_post_post_path(:post_id => post.id), :remote => true, :method => :post, :id => "undelete" %></li>
-        <% else %>
-          <li><%= link_to "Delete", confirm_delete_moderator_post_post_path(:post_id => post.id) %></li>
-        <% end %>
+      <% if post.is_flagged? || post.is_pending? %>
+        <li><%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :remote => true, :method => :post, :id => "approve" %></li>
+      <% else %>
+        <li><%= link_to "Hide from queue", moderator_post_disapproval_path(:post_id => post.id), :remote => true, :method => :post, :id => "disapprove" %></li>
       <% end %>
     <% end %>
   <% end %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index dec337036..ca63942fe 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -14,10 +14,12 @@
         <%= render "posts/partials/show/information", :post => @post %>
       </section>
 
-      <section>
-        <h1>Options</h1>
-        <%= render "posts/partials/show/options", :post => @post %>
-      </section>
+      <% if CurrentUser.is_member? %>
+        <section>
+          <h1>Options</h1>
+          <%= render "posts/partials/show/options", :post => @post %>
+        </section>
+      <% end %>
 
       <section>
         <h1>History</h1>