jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweak social links

Browse Source
This commit is contained in:
r888888888
2018-10-20 19:24:29 -07:00
parent 0ab6e9f94d
commit ee3b8933d2
5 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/src/javascripts/posts.js.erb
View File

@@ -1,5 +1,3 @@
/* global addthis */
import Utility from './utility'
import Hammer from 'hammerjs'
import RelatedTag from './related_tag.js.erb'
@@ -99,7 +97,6 @@ Post.open_edit_dialog = function() {
$("#edit").show();
$("#comments").hide();
$("#share").hide();
$("#post-sections li").removeClass("active");
$("#post-edit-link").parent("li").addClass("active");
$("#related-tags-container").show();
@@ -432,12 +429,10 @@ Post.initialize_post_sections = function() {
if (e.target.hash === "#comments") {
$("#comments").show();
$("#edit").hide();
$("#share").hide();
$("#recommended").hide();
} else if (e.target.hash === "#edit") {
$("#edit").show();
$("#comments").hide();
$("#share").hide();
$("#post_tag_string").focus().selectEnd().height($("#post_tag_string")[0].scrollHeight);
$("#related-tags-button").trigger("click");
$("#fetch-data-manual").trigger("click");
@@ -445,7 +440,6 @@ Post.initialize_post_sections = function() {
} else if (e.target.hash === "#recommended") {
$("#comments").hide();
$("#edit").hide();
$("#share").hide();
$("#recommended").show();
$.get("/recommended_posts", {context: "post", post_id: Utility.meta("post-id")}, function(data) {
$("#recommended").html(data);
@@ -453,8 +447,6 @@ Post.initialize_post_sections = function() {
} else {
$("#edit").hide();
$("#comments").hide();
$("#share").show();
addthis.init();
$("#recommended").hide();
}

6
app/views/posts/partials/index/_seo_meta_tags.html.erb
View File

@@ -23,7 +23,7 @@
<meta name="rating" content="adult">
<% end %>
<%= tag.meta name: "canonical", content: posts_url(tags: params[:tags], host: Danbooru.config.domain) %>
<%= tag.meta name: "canonical", content: posts_url(tags: params[:tags], host: Danbooru.config.hostname, protocol: "https") %>
<% if params[:tags].present? %>
<% "Find the best art of #{params[:tags].tr('_', ' ').titleize} on #{Danbooru.config.app_name}".tap do |desc| %>
@@ -43,7 +43,7 @@
<%= tag.meta name: "og:site", content: Danbooru.config.app_name %>
<% if @post_set.best_post.present? %>
<%= tag.meta name: "twitter:image", content: @post_set.best_post.file_url %>
<%= tag.meta name: "og:image", content: @post_set.best_post.file_url %>
<%= tag.meta name: "twitter:image", content: @post_set.best_post.open_graph_image_url %>
<%= tag.meta name: "og:image", content: @post_set.best_post.open_graph_image_url %>
<%= tag.meta name: "twitter:card", content: "summary_large_image" %>
<% end %>

22
app/views/posts/partials/index/_share.html.erb
View File

@@ -7,13 +7,23 @@
</div>
<script type="text/javascript">
var addthis_config = {"data_track_addressbar": false, "pubid": "<%= Danbooru.config.addthis_key %>"};
var addthis_share = {
"url":"<%= j posts_url(tags: params[:tags]) %>",
"title": "<%= escape_javascript @post_set.humanized_tag_string %> - <%= Danbooru.config.app_name %>"
};
window.addthis_config = {"data_track_addressbar": false, "pubid": "<%= Danbooru.config.addthis_key %>"};
<% if params[:tags].present? %>
window.addthis_share = {
"url":"<%= j posts_url(tags: params[:tags]) %>",
"title": "Find more art about <%= escape_javascript @post_set.humanized_tag_string %> on <%= Danbooru.config.app_name %>"
};
<% else %>
window.addthis_share = {
"url":"<%= j posts_url %>",
"title": "Find good anime art fast on <%= Danbooru.config.app_name %>"
};
<% end %>
$(function() {
addthis.init();
});
</script>
<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#async=1"></script>
<script type="text/javascript" src="https://s7.addthis.com/js/300/addthis_widget.js#async=1"></script>
<% end %>

11
app/views/posts/partials/show/_share.html.erb
View File

@@ -7,13 +7,16 @@
</div>
<script type="text/javascript">
var addthis_config = {"data_track_addressbar": false, "pubid": "<%= Danbooru.config.addthis_key %>"};
var addthis_share = {
window.addthis_config = {"data_track_addressbar": false, "pubid": "<%= Danbooru.config.addthis_key %>"};
window.addthis_share = {
"url":"<%= j post_url(post) %>",
"title": "<%= '#r_18 ' unless post.rating == 's' %><%= escape_javascript post.presenter.humanized_essential_tag_string.html_safe %> - <%= Danbooru.config.app_name %>"
"title": "<%= escape_javascript post.presenter.humanized_essential_tag_string.html_safe %> on <%= Danbooru.config.app_name %>"
};
$(function() {
addthis.init();
});
</script>
<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#async=1"></script>
<script type="text/javascript" src="https://s7.addthis.com/js/300/addthis_widget.js#async=1"></script>
<% end %>

5
app/views/posts/show.html.erb
View File

@@ -170,6 +170,8 @@
<meta name="report-server" content="<%= Danbooru.config.reportbooru_server %>">
<% end %>
<%= tag.meta name: "canonical", content: post_url(@post, host: Danbooru.config.hostname, protocol: "https") %>
<%# Twitter properties %>
<% if @post.twitter_card_supported? %>
<meta name="twitter:card" content="summary_large_image">
@@ -186,6 +188,9 @@
<meta name="rating" content="adult">
<% end %>
<%= tag.meta name: "og:type", content: "website" %>
<%= tag.meta name: "og:site", content: Danbooru.config.app_name %>
<%= auto_discovery_link_tag(:atom, comments_url(:atom, search: { post_id: @post.id }), title: "Comments for post ##{@post.id}") %>
<% end %>