Merge branch 'iqdb'

2014-03-24 13:35:07 -07:00
parent 413ac0a491 16712b7d56
commit ae5fe58c77
24 changed files with 335 additions and 0 deletions
--- a/app/views/iqdb/similar_by_source.html.erb
+++ b/app/views/iqdb/similar_by_source.html.erb
@@ -0,0 +1,6 @@
+<% if @download.similar_posts %>
+  <h3>Similar</h3>
+  <% @download.similar_posts.each do |similar| %>
+    <%= PostPresenter.preview(Post.find(similar.post_id)) %>
+  <% end %>
+<% end %>
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -59,6 +59,12 @@
        <%= f.text_field :parent_id %>
      </div>

+      <% if false && Danbooru.config.iqdb_hostname_and_port && params[:url] %>
+        <div class="input" id="iqdb-similar">
+          <p><em>Loading similar...</em></p>
+        </div>
+      <% end %>
+
      <div class="input">
        <div>
          <%= f.label :tag_string, "Tags" %>