From 9d47d7f7dd2b7813fcee82d53dd7b0b6d232a2e9 Mon Sep 17 00:00:00 2001 From: Toks Date: Sat, 7 Jun 2014 14:10:02 -0400 Subject: [PATCH] Support source fetching and translated tags while editing posts (manual only) --- app/assets/javascripts/uploads.js | 11 ++++++++--- app/assets/stylesheets/specific/posts.css.scss | 16 ++++++++++++++++ app/views/posts/partials/show/_edit.html.erb | 2 ++ app/views/sources/_info_for_post.html.erb | 14 ++++++++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 app/views/sources/_info_for_post.html.erb diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js index b764b8519..9feb1ba0c 100644 --- a/app/assets/javascripts/uploads.js +++ b/app/assets/javascripts/uploads.js @@ -4,11 +4,12 @@ Danbooru.Upload.initialize_all = function() { if ($("#c-uploads,#c-posts").length) { this.initialize_enter_on_tags(); + this.initialize_info_manual(); } if ($("#c-uploads").length) { this.initialize_image(); - this.initialize_info(); + this.initialize_info_bookmarklet(); this.initialize_similar(); $("#related-tags-button").trigger("click"); $("#find-artist-button").trigger("click"); @@ -55,16 +56,20 @@ }); } - Danbooru.Upload.initialize_info = function() { + Danbooru.Upload.initialize_info_bookmarklet = function() { $("#source-info ul").hide(); $("#fetch-data-bookmarklet").click(function(e) { $.get(e.target.href).success(Danbooru.Upload.fill_source_info); e.preventDefault(); }); $("#fetch-data-bookmarklet").trigger("click"); + } + + Danbooru.Upload.initialize_info_manual = function() { + $("#source-info ul").hide(); $("#fetch-data-manual").click(function(e) { - var source = $("#upload_source").val(); + var source = $("#upload_source,#post_source").val(); if (!/\S/.test(source)) { Danbooru.error("Error: You must enter a URL into the source field to get its data"); } else if (!/^https?:\/\//.test(source)) { diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index d99b5935c..c67bc4414 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -373,6 +373,22 @@ div#c-posts { color: gray; } } + + div#source-info { + margin: 1em 0; + padding: 1em; + border: 1px solid gray; + + p { + margin: 0; + } + + ul { + a { + margin-right: 1em; + } + } + } } div#quick-edit-div { diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb index 906cfe82b..4d9d90997 100644 --- a/app/views/posts/partials/show/_edit.html.erb +++ b/app/views/posts/partials/show/_edit.html.erb @@ -4,6 +4,8 @@ <% end %> +<%= render "sources/info_for_post" %> + <%= form_for(post, :html => {:class => "simple_form", :id => "form"}) do |f| %> <%= hidden_field_tag :tags_query, params[:tags] %> <%= hidden_field_tag :pool_id, params[:pool_id] %> diff --git a/app/views/sources/_info_for_post.html.erb b/app/views/sources/_info_for_post.html.erb new file mode 100644 index 000000000..ee4c5afb4 --- /dev/null +++ b/app/views/sources/_info_for_post.html.erb @@ -0,0 +1,14 @@ + + +
+

<%= link_to "Fetch source data", source_path(:format => "json"), :id => "fetch-data-manual" %>

+

<%= content_tag "span", "Loading source data...", :id => "loading-data", :style => "display: none;" %>

+ + +