diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ad32e3d98..a361712ed 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -272,20 +272,18 @@ module ApplicationHelper
def page_title(title = nil)
if title.present?
content_for(:page_title) { "#{title} | #{Danbooru.config.app_name}" }
- elsif title.blank? && !title.nil?
- content_for(:page_title) { Danbooru.config.app_name }
elsif content_for(:page_title).present?
content_for(:page_title)
elsif params[:action] == "index"
- "#{params[:controller].titleize} - #{Danbooru.config.app_name}"
+ "#{params[:controller].titleize} | #{Danbooru.config.app_name}"
elsif params[:action] == "show"
- "#{params[:controller].singularize.titleize} - #{Danbooru.config.app_name}"
+ "#{params[:controller].singularize.titleize} | #{Danbooru.config.app_name}"
elsif params[:action] == "new"
- "New #{params[:controller].singularize.titleize} - #{Danbooru.config.app_name}"
+ "New #{params[:controller].singularize.titleize} | #{Danbooru.config.app_name}"
elsif params[:action] == "edit"
- "Edit #{params[:controller].singularize.titleize} - #{Danbooru.config.app_name}"
+ "Edit #{params[:controller].singularize.titleize} | #{Danbooru.config.app_name}"
elsif params[:action] == "search"
- "Search #{params[:controller].titleize} - #{Danbooru.config.app_name}"
+ "Search #{params[:controller].titleize} | #{Danbooru.config.app_name}"
else
"#{Danbooru.config.app_name}/#{params[:controller]}"
end
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 9bf49d054..0b3be0703 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -74,6 +74,8 @@
window.addthis_config = { ui_click: true };
+ <%= tag.meta name: "twitter:title", content: page_title %>
+ <%= tag.meta name: "og:title", content: page_title %>
<%= yield :html_header %>
<%= raw Danbooru.config.custom_html_header_content %>
diff --git a/app/views/posts/partials/index/_seo_meta_tags.html.erb b/app/views/posts/partials/index/_seo_meta_tags.html.erb
index 00be2290b..feef48d51 100644
--- a/app/views/posts/partials/index/_seo_meta_tags.html.erb
+++ b/app/views/posts/partials/index/_seo_meta_tags.html.erb
@@ -1,15 +1,3 @@
-<% if @post_set.is_single_tag? %>
- <% "#{@post_set.humanized_tag_string.titleize} - #{Danbooru.config.app_name}".tap do |title| %>
- <%= tag.meta name: "og:title", content: title %>
- <%= tag.meta name: "twitter:title", content: title %>
- <% end %>
-<% else %>
- <% "#{@post_set.humanized_tag_string} - #{Danbooru.config.app_name}".tap do |title| %>
- <%= tag.meta name: "og:title", content: title %>
- <%= tag.meta name: "twitter:title", content: title %>
- <% end %>
-<% end %>
-
<% if @post_set.hide_from_crawler? %>
<% end %>
@@ -41,4 +29,4 @@
<%= 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 %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index a54d3eb9c..b47ec2394 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -159,7 +159,6 @@
- <%= tag.meta name: "og:title", content: "#{@post.presenter.humanized_essential_tag_string} - #{Danbooru.config.app_name}" %>
<% if @post.visible? %>
<%= tag.meta name: "og:image", content: @post.open_graph_image_url %>
@@ -175,7 +174,6 @@
<% if @post.twitter_card_supported? %>
<%= tag.meta name: "twitter:site", content: Danbooru.config.twitter_site %>
- <%= tag.meta name: "twitter:title", content: "#{@post.presenter.humanized_essential_tag_string} - #{Danbooru.config.app_name}" %>
<%= tag.meta name: "twitter:description", content: "View this #{@post.image_width}x#{@post.image_height} #{number_to_human_size(@post.file_size)} image" %>
<% if @post.visible? %>