From 3cbcd1e6b9d625348b312a7b79d0c692230a9f5e Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Wed, 18 Apr 2012 12:20:49 -0400
Subject: [PATCH] tweaks

---
 app/views/pools/destroy.js.erb                  | 2 +-
 app/views/pools/undelete.js.erb                 | 1 +
 app/views/posts/partials/show/_edit.html.erb    | 2 +-
 app/views/posts/partials/show/_image.html.erb   | 2 +-
 app/views/posts/partials/show/_options.html.erb | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 app/views/pools/undelete.js.erb

diff --git a/app/views/pools/destroy.js.erb b/app/views/pools/destroy.js.erb
index 77e9aed9d..345366b9b 100644
--- a/app/views/pools/destroy.js.erb
+++ b/app/views/pools/destroy.js.erb
@@ -1 +1 @@
-Danbooru.notice("Pool deleted");
+location.reload();
diff --git a/app/views/pools/undelete.js.erb b/app/views/pools/undelete.js.erb
new file mode 100644
index 000000000..345366b9b
--- /dev/null
+++ b/app/views/pools/undelete.js.erb
@@ -0,0 +1 @@
+location.reload();
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index f0bee131c..2a39a832f 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -62,7 +62,7 @@
       <%= f.label :tag_string, "Tags" %>
       <%= f.text_area :tag_string , :size => "50x3" %>
     </div>
-
+    
     <%= button_tag "Related tags", :id => "related-tags-button" %>
     <%= button_tag "Artists", :id => "related-artists-button" %>
     <%= button_tag "Characters", :id => "related-characters-button" %>
diff --git a/app/views/posts/partials/show/_image.html.erb b/app/views/posts/partials/show/_image.html.erb
index 2c63e3fab..325fbf6a0 100644
--- a/app/views/posts/partials/show/_image.html.erb
+++ b/app/views/posts/partials/show/_image.html.erb
@@ -2,4 +2,4 @@
 
 <% if post.has_large? && CurrentUser.default_image_size == "large" %>
   <p id="image-resize-notice">Resized to <%= number_to_percentage post.resize_percentage, :precision => 0 %> of original (<%= link_to "view original", post.file_url, :id => "image-resize-link" %>)</p>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb
index 151f1341f..6a6a06bd6 100644
--- a/app/views/posts/partials/show/_options.html.erb
+++ b/app/views/posts/partials/show/_options.html.erb
@@ -7,7 +7,7 @@
     <li><%= link_to "Find similar", "http://danbooru.iqdb.org/db-search.php?url=#{post.preview_file_url}" %></li>
     
     <% unless post.is_status_locked? %>
-      <% if !post.is_deleted? %>
+      <% if !post.is_deleted? && !post.is_pending? %>
         <li><%= link_to "Flag", new_post_flag_path(:post_id => post.id), :id => "flag" %></li>
       <% end %>
       
@@ -35,6 +35,6 @@
   <% end %>
   
   <% if CurrentUser.is_admin? %>
-    <li><%= link_to "Annihilate", annihilate_moderator_post_post_path(:post_id => post.id), :remote => true, :method => :post, :id => "annihilate", :confirm => "This will permanently delete this post (meaning the file will be deleted). Are you sure you want to annihilate this post?" %></li>
+    <li><%= link_to "Permanent delete", annihilate_moderator_post_post_path(:post_id => post.id), :remote => true, :method => :post, :id => "annihilate", :confirm => "This will permanently delete this post (meaning the file will be deleted). Are you sure you want to delete this post?" %></li>
   <% end %>
 </ul>
\ No newline at end of file