* Continued work on improving post view templates

* Added statistics-based estimator for related tag calculator
* Fleshed out IpBan class based on changes to Danbooru 1.xx

app/views/posts/index.html.erb

@@ -4,7 +4,7 @@
   </div>
 <% end %>
 
-<aside>
+<aside class="sidebar">
   <section id="search-box">
     <h1>Search</h1>
     <% form_tag(posts_path, :method => "get") do %>

app/views/posts/partials/common/_search.html.erb

@@ -0,0 +1,4 @@
+<% form_tag(posts_path, :method => "get") do %>
+  <%= text_field_tag("tags", params[:tags], :size => 15) %>
+  <%= submit_tag "Go" %>
+<% end %>

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

@@ -0,0 +1,50 @@
+<div id="edit">
+  <% unless @current_user.is_contributor? %>
+    <div style="margin-bottom: 1em;">
+      <p>Before editing, read the <%= link_to "how to tag guide", wiki_page_path(:id => "howto:tag") %>.</p>
+    </div>
+  <% end %>
+
+  <% form_for(post) do |f| %>
+    <%= f.hidden_field :old_tags, :value => post.tag_string %>
+
+    <p>
+      <% if post.is_rating_locked? %>
+        This post is rating locked.
+      <% else %>
+        <%= f.label :rating_explicit, "Explicit" %>
+        <%= f.radio_button :rating, :e %>
+        
+        <%= f.label :rating_questionable, "Questionable" %>
+        <%= f.radio_button :rating, :q %>
+
+        <%= f.label :rating_safe, "Safe" %>
+        <%= f.radio_button :rating, :s %>
+      <% end %>
+    </p>
+    
+    <% if @current_user.is_privileged? %>
+      <p>
+        <%= f.label :is_note_locked, "Lock notes" %>
+        <%= f.check_box :is_note_locked %>
+      </p>
+      
+      <p>
+        <%= f.label :is_rating_locked, "Lock rating" %>
+        <%= f.check_box :is_rating_locked %>
+      </p>
+    <% end %>
+    
+    <p>
+      <%= f.label :source %>
+      <%= f.text_field :source %>
+    </p>
+    
+    <p>
+      <%= f.label :tag_string, "Tags" %>
+      <%= f.text_area :tag_string , :size => "50x3" %>
+    </p>
+    
+    <%= submit_tag "Submit" %>
+  <% end %>
+</div>

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

@@ -0,0 +1,6 @@
+<% content_tag(:object, :width => post.image_width, :height => post.image_height) do %>
+  <%= tag :params, :name => "movie", :value => post.file_url %>
+  <%= tag :embed, :src => post.file_url, :width => post.image_width, :height => post.image_height, :allowScriptAccess => "never" %>
+<% end %>
+
+<p><%= link_to "Save this flash (right click and save)", post.file_url %></p>

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

@@ -0,0 +1,2 @@
+<%= render :partial => "posts/partials/show/notes", :locals => {:post => post, :notes => post.notes.active} %>
+<%= image_tag(post.file_url_for(@current_user), :alt => post.tag_string, :width => post.image_width_for(@current_user), :height => post.image_height_for(@current_user), "data-original-width" => post.image_width, "data-original-height" => post.image_height) %>

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

@@ -0,0 +1,13 @@
+<ul>
+  <li>ID: <%= post.id %></li>
+  <li>Uploader: <%= link_to_unless(post.uploader.nil?, post.uploader_name, user_path(post.uploader)) %></li>
+  <li>Uploaded: <%= time_ago_in_words(post.created_at).gsub(/about/, "") %> ago</li>
+  <% if post.approver %>
+    <li>Approver: <%= link_to(post.approver.name, user_path(post.approver_id)) %></li>
+  <% end %>
+  <li>
+    Size: <%= image_dimension_menu(post, @current_user) %>
+  </li>
+  <li><%= link_to "Tag History", post_versions_path(:post_id => post) %></li>
+  <li><%= link_to "Note History", note_versions_path(:post_id => post) %></li>
+</ul>

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

@@ -0,0 +1,3 @@
+<% notes.each do |note| %>
+  <%= content_tag(:article, "data-width" => note.width, "data-height" => note.height, "data-x" => note.x, "data-y" => note.y, "data-body" => note.formatted_body) %>
+<% end %>

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

@@ -0,0 +1,15 @@
+<ul>
+  <% if !post.is_deleted? && post.is_image? && post.image_width && post.image_width > 700 %>
+    <li><%= link_to "Resize", "#" %></li>
+  <% end %>
+  <li><%= link_to "Favorite", "#" %></li>
+  <li><%= link_to "Unfavorite", "#" %></li>
+  <li><%= link_to "Translate", "#" %></li>
+  <li><%= link_to "Unapprove", "#" %></li>
+  <% if @current_user.is_janitor? %>
+    <li><%= link_to "Approve", "#" %></li>
+    <li><%= link_to "Undelete", "#" %></li>
+    <li><%= link_to "Delete", "#" %></li>
+  <% end %>
+  <li><%= link_to "Pool", "#" %></li>
+</ul>

app/views/posts/show.html.erb

@@ -1,25 +1,22 @@
-<aside>
+<aside class="sidebar">
   <section>
     <h1>Search</h1>
-    <% form_tag(posts_path, :method => "get") do %>
-      <%= text_field_tag("tags", params[:tags], :size => 20) %>
-      <%= submit_tag "Go" %>
-    <% end %>
+    <%= render :partial => "posts/partials/common/search" %>
   </section>
   
   <section>
     <h1>Tags</h1>
-    <%= @post.presenter.tag_list_html %>
+    <%= @post.presenter.tag_list_html(self, @current_user) %>
   </section>
   
   <section>
     <h1>Information</h1>
-    <%= render :partial => "information", :locals => {:post => @post} %>
+    <%= render :partial => "posts/partials/show/information", :locals => {:post => @post} %>
   </section>
 
   <section>
     <h1>Options</h1>
-    <%= render :partial => "options", :locals => {:post => @post} %>
+    <%= render :partial => "posts/partials/show/options", :locals => {:post => @post} %>
   </section>  
 </aside>
 
@@ -33,15 +30,17 @@
   
   <section>
     <h2>Notes</h2>
-    <%= @post.presenter.note_html %>
+    <%= render :partial => "notes/note", :collection => @post.notes.active %>
   </section>
   
   <section>
     <h2>Comments</h2>
+    <%= render :partial => "comments/partials/index/list", :locals => {:comments => @post.comments, :post => @post} %>
   </section>
   
   <section>
     <h2>Edit</h2>
+    <%= render :partial => "posts/partials/show/edit", :locals => {:post => @post} %>
   </section>
 </section>