views: refactor page titles.

Refactor `page_title` helper to automatically include site name.

app/helpers/application_helper.rb

@@ -269,8 +269,12 @@ module ApplicationHelper
     end.to_h
   end
 
-  def page_title
-    if content_for(:page_title).present?
+  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}"

app/models/tag.rb

@@ -206,6 +206,10 @@ class Tag < ApplicationRecord
   end
 
   concerning :NameMethods do
+    def pretty_name
+      name.tr("_", " ")
+    end
+
     def unqualified_name
       name.gsub(/_\(.*\)\z/, "").tr("_", " ")
     end

app/views/admin/alias_and_implication_imports/new.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Alias & Implication Import" %>
+
 <div id="c-admin-alias-and-implication-imports">
   <div id="a-new">
     <h1>Alias &amp; Implication Import</h1>
@@ -20,7 +22,3 @@ mass update aaa -> bbb
     <% end %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Alias &amp; Implication Import - <%= Danbooru.config.app_name %>
-<% end %>

app/views/admin/dashboards/show.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Admin Dashboard" %>
+
 <div id="c-admin-dashboards">
   <div id="a-show">
     <h1>Admin Dashboard</h1>
@@ -23,7 +25,3 @@
     </div>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Admin Dashboard - <%= Danbooru.config.app_name %>
-<% end %>

app/views/admin/users/edit.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Edit User: #{@user.pretty_name}" %>
+<%= render "users/secondary_links" %>
+
 <div id="c-admin-users">
   <div id="a-edit">
     <h1>Edit User: <%= @user.name %></h1>
@@ -10,9 +13,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "users/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit User - <%= Danbooru.config.app_name %>
-<% end %>

app/views/artists/_show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "#{@artist.pretty_name.titleize} | Artist Profile" %>
+<%= render "secondary_links" %>
+
 <div id="c-artists">
   <div id="a-show">
     <h1>Artist: <%= link_to @artist.pretty_name, posts_path(:tags => @artist.name), :class => "tag-type-#{@artist.category_name}" %></h1>
@@ -25,9 +28,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Artist - <%= @artist.name %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/bans/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Ban: #{@ban.user.pretty_name}" %>
+<%= render "secondary_links" %>
+
 <div id="c-bans">
   <div id="a-show">
     <h1>Show Ban</h1>
@@ -17,9 +20,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Ban - <%= @ban.user.name %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/counts/posts.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Post Counts" %>
+<%= render "posts/partials/common/secondary_links" %>
+
 <div id="c-counts">
   <div id="a-posts">
     Post count for <%= link_to params[:tags].present? ? params[:tags] : "/posts", posts_path(:tags => params[:tags]) %>:
@@ -8,9 +11,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Post Counts - <%= Danbooru.config.app_name %>
-<% end %>
-
-<%= render "posts/partials/common/secondary_links" %>

app/views/dmails/index.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Messages" %>
+<%= render "secondary_links" %>
+
 <div id="c-dmails">
   <div id="a-index">
     <% if params[:folder] == "sent" %>
@@ -31,9 +34,3 @@
     <%= numbered_paginator(@dmails) %>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Messages - <%= Danbooru.config.app_name %>
-<% end %>

app/views/dmails/new.html.erb

@@ -1,12 +1,9 @@
+<% page_title "New Message" %>
+<%= render "secondary_links" %>
+
 <div id="c-dmails">
   <div id="a-new">
     <h1>New Message</h1>
     <%= render "form", :dmail => @dmail %>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Message - <%= Danbooru.config.app_name %>
-<% end %>

app/views/dmails/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Message: #{@dmail.title}" %>
+<%= render "secondary_links" %>
+
 <div id="c-dmails">
   <div id="a-show">
     <div class="dmail">
@@ -38,9 +41,3 @@
     </div>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Message - <%= @dmail.title %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/explore/posts/missed_searches.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Missed Searches" %>
+<%= render "posts/partials/common/secondary_links" %>
+
 <div id="c-explore-posts">
   <div id="a-missed-searches">
     <h1>Missed Searches</h1>
@@ -27,9 +30,3 @@
     </table>
   </div>
 </div>
-
-<%= render "posts/partials/common/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Missed Searches - <%= Danbooru.config.app_name %>
-<% end %>

app/views/explore/posts/popular.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Popular Posts" %>
+<%= render "posts/partials/common/secondary_links" %>
+
 <div id="c-explore-posts">
   <div id="a-popular">
     <h1>
@@ -24,12 +27,6 @@
   </div>
 </div>
 
-<%= render "posts/partials/common/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Popular - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <meta name="description" content="The most popular posts per <%= @scale %>">
 <% end %>

app/views/explore/posts/searches.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Popular Searches" %>
+<%= render "posts/partials/common/secondary_links" %>
+
 <div id="c-explore-posts">
   <div id="a-searches">
     <h1>Popular Searches - <%= @search_service.date %></h1>
@@ -27,9 +30,3 @@
     </div>
   </div>
 </div>
-
-<%= render "posts/partials/common/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Popular Searches - <%= Danbooru.config.app_name %>
-<% end %>

app/views/explore/posts/viewed.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Most Viewed" %>
+<%= render "posts/partials/common/secondary_links" %>
+
 <div id="c-explore-posts">
   <div id="a-viewed">
     <h1>Most Viewed - <%= @date %></h1>
@@ -15,12 +18,6 @@
   </div>
 </div>
 
-<%= render "posts/partials/common/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Most Viewed - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <meta name="description" content="The most viewed posts per day">
 <% end %>

app/views/favorite_group_orders/edit.html.erb

@@ -20,7 +20,3 @@
 </div>
 
 <%= render "favorite_groups/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Order Favorite Group - <%= Danbooru.config.app_name %>
-<% end %>

app/views/favorite_groups/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Favgroup: #{@favorite_group.pretty_name.titleize}" %>
+<%= render "secondary_links" %>
+
 <div id="c-favorite-groups">
   <div id="a-show">
     <h1>
@@ -22,9 +25,3 @@
     </section>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Favorite Group - <%= @favorite_group.pretty_name %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/forum_topics/index.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Forum" %>
+<%= render "secondary_links" %>
+
 <div id="c-forum-topics">
   <div id="a-index">
     <h1>Forum</h1>
@@ -17,10 +20,4 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Forum - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header, auto_discovery_link_tag(:atom, forum_topics_url(:atom), title: "Forum Topics")) %>

app/views/forum_topics/show.html.erb

@@ -1,3 +1,5 @@
+<% page_title @forum_topic.title %>
+
 <div id="c-forum-topics">
   <div id="a-show">
     <h1>
@@ -38,10 +40,6 @@
 
 <%= render "secondary_links" %>
 
-<% content_for(:page_title) do %>
-  <%= @forum_topic.title %> - Forum - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <%= auto_discovery_link_tag(:atom, {format: :atom}, {title: @forum_topic.title}) %>
 

app/views/iqdb_queries/show.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Similar Images Search" %>
+
 <div id="c-iqdb-queries">
   <div id="a-check">
     <h1>Similar Images Search</h1>
@@ -15,8 +17,3 @@
     <%= render "iqdb_queries/matches" %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Similar Images Search - <%= Danbooru.config.app_name %>
-<% end %>
-

app/views/maintenance/user/api_keys/show.html.erb

@@ -1,3 +1,5 @@
+<% page_title "API Key" %>
+
 <div id="c-maintenance-user-api-keys">
   <div id="a-show">
     <h1>API Key</h1>
@@ -9,7 +11,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  API Key - <%= Danbooru.config.app_name %>
-<% end %>

app/views/maintenance/user/api_keys/view.html.erb

@@ -1,3 +1,5 @@
+<% page_title "API Key" %>
+
 <div id="c-maintenance-user-api-keys">
   <div id="a-view">
     <h1>API Key</h1>
@@ -26,7 +28,3 @@
     </table>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  API Key - <%= Danbooru.config.app_name %>
-<% end %>

app/views/maintenance/user/count_fixes/new.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Refresh Counts" %>
+
 <div id="c-maintenance-user-count-fixes">
   <div id="a-new">
     <h1>Refresh Counts</h1>
@@ -9,7 +11,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Refresh Counts - <%= Danbooru.config.app_name %>
-<% end %>

app/views/maintenance/user/deletions/show.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Delete Account" %>
+
 <div id="c-maintenance-user-deletions">
   <div id="a-show" class="prose">
     <h1>Delete Account</h1>
@@ -25,7 +27,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Delete Account - <%= Danbooru.config.app_name %>
-<% end %>

app/views/maintenance/user/password_resets/edit.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Reset Password" %>
+<%= render "sessions/secondary_links" %>
+
 <div id="c-maintenance-user-password-resets">
   <div id="a-edit">
     <h1>Reset Password</h1>
@@ -14,9 +17,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "sessions/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Reset Password - <%= Danbooru.config.app_name %>
-<% end %>

app/views/maintenance/user/password_resets/new.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Reset Password" %>
+<%= render "sessions/secondary_links" %>
+
 <div id="c-maintenance-user-password-resets">
   <div id="a-new">
     <h1>Reset Password</h1>
@@ -15,9 +18,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "sessions/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Reset Password - <%= Danbooru.config.app_name %>
-<% end %>

app/views/maintenance/user/passwords/edit.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Change Password" %>
+
 <div id="c-maintenance-user-passwords">
   <div id="a-edit">
     <h1>Change Password</h1>
@@ -9,7 +11,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Change Password - <%= Danbooru.config.app_name %>
-<% end %>

app/views/moderator/dashboards/show.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Mod Dashboard" %>
+
 <div id="c-moderator-dashboards">
   <div id="a-show">
     <h1>Moderator Dashboard</h1>
@@ -23,7 +25,3 @@
     </section>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Mod Dashboard - <%= Danbooru.config.app_name %>
-<% end %>

app/views/moderator/ip_addrs/index.html.erb

@@ -1,3 +1,5 @@
+<% page_title "IP Addresses" %>
+
 <div id="c-moderator-ip-addrs">
   <div id="a-index">
     <h1>IP Addresses</h1>
@@ -13,7 +15,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  IP Addresses - <%= Danbooru.config.app_name %>
-<% end %>

app/views/moderator/ip_addrs/search.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Search IP Addresses" %>
+
 <div id="c-moderator-ip-addrs">
   <div id="a-search">
     <h1>Search IP Addresses</h1>
@@ -9,7 +11,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Search IP Addresses - <%= Danbooru.config.app_name %>
-<% end %>

app/views/moderator/post/disapprovals/index.html.erb

@@ -38,7 +38,3 @@
     <%= numbered_paginator(@post_disapprovals) %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Post Disapprovals - <%= Danbooru.config.app_name %>
-<% end %>

app/views/moderator/post/queues/random.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Mod Queue" %>
+
 <div id="c-moderator-post-queues">
   <div id="a-random">
     <div>
@@ -24,10 +26,6 @@
 <%= render "post_disapprovals/detailed_rejection_dialog" %>
 <%= render "posts/partials/common/secondary_links" %>
 
-<% content_for(:page_title) do %>
-  Mod Queue - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <meta name="random-mode" content="1">
   <meta name="return-to" content="<%= params[:return_to] %>">

app/views/moderator/post/queues/show.html.erb

@@ -1,3 +1,5 @@
+<% page_Title "Mod Queue" %>
+
 <div id="c-moderator-post-queues">
   <div id="a-show">
     <div>
@@ -36,7 +38,3 @@
 
 <%= render "post_disapprovals/detailed_rejection_dialog" %>
 <%= render "posts/partials/common/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Mod Queue - <%= Danbooru.config.app_name %>
-<% end %>

app/views/moderator/tags/edit.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Mass Edit" %>
+
 <div id="c-moderator-tags">
   <div id="a-edit">
     <h1>Mass Edit</h1>
@@ -9,7 +11,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Mass Edit - <%= Danbooru.config.app_name %>
-<% end %>

app/views/pool_orders/edit.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Order Pool" %>
+<%= render "pools/secondary_links" %>
+
 <div id="c-pool-orders">
   <div id="a-edit">
     <h1>Order Pool: <%= @pool.pretty_name %></h1>
@@ -25,9 +28,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "pools/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Order Pool - <%= Danbooru.config.app_name %>
-<% end %>

app/views/pool_versions/diff.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Pool Comparison: #{@pool_version.pretty_name.titleize}" %>
+<%= render "secondary_links" %>
+
 <div id="c-pool-versions">
   <div id="a-diff">
     <h1>Pool Version Comparison: <%= @pool_version.name %></h1>
@@ -31,9 +34,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Pool Version Comparison - <%= @pool_version.name %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/pools/gallery.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Pool Gallery" %>
+<%= render "secondary_links" %>
+
 <div id="c-pools">
   <div id="a-gallery">
     <%= render "search", :path => gallery_pools_path %>
@@ -13,9 +16,3 @@
     </section>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Pool Gallery - <%= Danbooru.config.app_name %>
-<% end %>

app/views/pools/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "#{@pool.pretty_name.titleize} | Pool" %>
+<%= render "secondary_links" %>
+
 <div id="c-pools">
   <div id="a-show">
     <h1>
@@ -26,12 +29,6 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Pool - <%= @pool.pretty_name %> - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <meta name="description" content="<%= strip_dtext(@pool.description) %>">
 <% end %>

app/views/posts/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title @post.presenter.humanized_essential_tag_string %>
+<%= render "posts/partials/common/secondary_links" %>
+
 <% content_for(:sidebar) do %>
   <%= render "posts/partials/common/search", :path => posts_path, :tags => params[:q], :tags_dom_id => "tags" %>
 
@@ -151,10 +154,6 @@
 
 <%= post_view_count_js %>
 
-<% content_for(:page_title) do %>
-  <%= @post.presenter.humanized_essential_tag_string %> - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <%= tag.meta name: "description", content: "View this #{@post.image_width}x#{@post.image_height} #{number_to_human_size(@post.file_size)} image" %>
   <meta name="post-id" content="<%= @post.id %>">
@@ -201,5 +200,3 @@
     window._paq.push(["setCustomVariable", 3, "blocked", <%= @post.levelblocked? %>, "page"]);
   </script>
 <% end %>
-
-<%= render "posts/partials/common/secondary_links" %>

app/views/recommended_posts/index.html.erb

@@ -15,7 +15,3 @@
 </div>
 
 <%= render "posts/partials/common/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Recommended Posts - <%= Danbooru.config.app_name %>
-<% end %>

app/views/related_tags/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Related tags" %>
+<%= render "tags/secondary_links" %>
+
 <div id="c-related-tags">
   <div id="a-show">
     <h1>Related tags</h1>
@@ -18,9 +21,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "tags/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Related tags - <%= Danbooru.config.app_name %>
-<% end %>

app/views/reports/upload_tags.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Upload Tags: #{@user.pretty_name}" %>
+
 <div id="c-reports">
   <div id="a-upload-tags">
     <h1>Upload tag changes report for <%= @user.pretty_name %></h1>
@@ -19,8 +21,3 @@
     <%= numbered_paginator(@upload_reports) %>
     </div>
 </div>
-
-
-<% content_for(:page_title) do %>
-  Upload tag changes for <%= @user.pretty_name %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/sessions/new.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Login" %>
+<%= render "secondary_links" %>
+
 <div id="c-sessions">
   <div id="a-new">
     <section>
@@ -15,9 +18,3 @@
       </p>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
- Login - <%= Danbooru.config.app_name %>
-<% end %>
-
-<%= render "secondary_links" %>

app/views/static/access_denied.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Access Denied" %>
+
 <h1>Access Denied</h1>
 
 <p>
@@ -10,7 +12,3 @@
 </p>
 
 <%= link_to "Go back", :back, :rel => "prev" %>
-
-<% content_for(:page_title) do %>
-  Access Denied - <%= Danbooru.config.app_name %>
-<% end %>

app/views/static/bookmarklet.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Upload Bookmarklet" %>
+
 <div id="c-static">
   <div id="a-bookmarklet">
     <h1>Bookmarklet</h1>
@@ -12,7 +14,3 @@
     </div>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Bookmarklet - <%= Danbooru.config.app_name %>
-<% end %>

app/views/static/contact.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Contact" %>
+
 <div id="c-static">
   <div id="a-contact">
     <h1>Contact</h1>
@@ -5,9 +7,5 @@
     <h2>Questions &amp; Comments</h2>
 
     <p>You can reach the administrator of this site at <%= mail_to Danbooru.config.contact_email, nil, :encode => :hex %>.</p>
-
-    <% content_for(:page_title) do %>
-      Contact - <%= Danbooru.config.app_name %>
-    <% end %>
   </div>
 </div>

app/views/static/error.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Error: #{@message}" %>
+
 <h1>Error</h1>
 <p><%= @message %></p>
 
@@ -5,7 +7,3 @@
   <h6>Details</h6>
   <%= render "static/backtrace", exception: @exception, backtrace: @backtrace %>
 <% end %>
-
-<% content_for(:page_title) do %>
-  Error - <%= @message %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/static/keyboard_shortcuts.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Keyboard Shortcuts" %>
+
 <div id="c-static">
   <div id="a-keyboard-shortcuts">
     <h1>Keyboard Shortcuts</h1>
@@ -65,7 +67,3 @@
     </div>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Keyboard Shortcuts - <%= Danbooru.config.app_name %>
-<% end %>

app/views/static/pagination_error.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Page Limit Exceeded" %>
+
 <h1>Search Error</h1>
 
 <p>
@@ -11,7 +13,3 @@
 </p>
 
 <%= link_to "Go back", :back, rel: "prev" %>
-
-<% content_for(:page_title) do %>
-  Search Error - <%= Danbooru.config.app_name %>
-<% end %>

app/views/static/search_timeout.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Search Timeout" %>
+
 <div id="c-static">
   <div id="a-search-timeout" class="fixed-width-container">
     <h1>Search Timeout</h1>
@@ -49,7 +51,3 @@
     <%= link_to "Go back", :back, rel: "prev" %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Search Timeout - <%= Danbooru.config.app_name %>
-<% end %>

app/views/static/site_map.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Site Map" %>
+
 <div id="c-static">
   <div id="a-site-map" class="fixed-width-container">
     <section>
@@ -169,7 +171,3 @@
     </section>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Site Map - <%= Danbooru.config.app_name %>
-<% end %>

app/views/static/tag_limit_error.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Search Error" %>
+
 <h1>Search Error</h1>
 
 <p>
@@ -9,7 +11,3 @@
 </p>
 
 <%= link_to "Go back", :back, rel: "prev" %>
-
-<% content_for(:page_title) do %>
-  Search Error - <%= Danbooru.config.app_name %>
-<% end %>

app/views/static/terms_of_service.html.erb

@@ -1,3 +1,5 @@
+<% page_title "Terms of Service" %>
+
 <div id="c-static">
   <div id="a-terms-of-service" class="prose fixed-width-container">
     <h1>Rules</h1>
@@ -66,7 +68,3 @@
       <p>Account sharing is not permitted. If you are suspected of sharing an account, then it will be banned.</p>
     </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Rules - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tags/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Tag: #{@tag.pretty_name.titleize}" %>
+<%= render "secondary_links" %>
+
 <div id="c-tags">
   <div id="a-show">
     <h1>Tag: <%= @tag.name %></h1>
@@ -8,9 +11,3 @@
     </ul>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Tag - <%= @tag.name %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/uploads/batch.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Batch Upload" %>
+<%= render "uploads/secondary_links" %>
+
 <div id="c-uploads">
   <div id="a-batch">
     <h1>Batch Upload</h1>
@@ -33,10 +36,6 @@
   </div>
 </div>
 
-<% content_for(:page_title) do %>
-  Batch Upload - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <script type="text/javascript">
     $(function() {
@@ -48,5 +47,3 @@
     })
   </script>
 <% end %>
-
-<%= render "uploads/secondary_links" %>

app/views/user_feedbacks/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Feedback: @#{@user_feedback.user.name}" %>
+<%= render "secondary_links" %>
+
 <div id="c-user-feedbacks">
   <div id="a-show">
     <h1>User Feedback For <%= link_to_user @user_feedback.user %></h1>
@@ -19,9 +22,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Feedback - <%= @user_feedback.user.name %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/user_name_change_requests/show.html.erb

@@ -28,7 +28,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  User Name Change Request - <%= @change_request.user.name %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/user_upgrades/new.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Account Upgrade" %>
+<%= render "users/secondary_links" %>
+
 <div id="c-user-upgrades">
   <div id="a-new" class="fixed-width-container">
     <h1>Upgrade Account</h1>
@@ -117,12 +120,6 @@
   </div>
 </div>
 
-<%= render "users/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Upgrade - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <script>
     $(function() {

app/views/user_upgrades/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Account Upgraded" %>
+<%= render "users/secondary_links" %>
+
 <div id="c-user-upgrades">
   <div id="a-show">
     <% if flash[:success] %>
@@ -17,9 +20,3 @@
     <% end %>
   </div>
 </div>
-
-<%= render "users/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Upgrade - <%= Danbooru.config.app_name %>
-<% end %>

app/views/users/edit.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Settings" %>
+<%= render "secondary_links" %>
+
 <div id="c-users">
   <div id="a-edit">
     <h1>Settings</h1>
@@ -74,10 +77,6 @@
   </div>
 </div>
 
-<% content_for(:page_title) do %>
-  Settings - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <script type="text/javascript">
     $(function() {
@@ -93,5 +92,3 @@
     });
   </script>
 <% end %>
-
-<%= render "secondary_links" %>

app/views/users/new.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Sign up" %>
+<%= render "secondary_links" %>
+
 <div id="c-users">
   <div id="a-new" class="fixed-width-container">
     <h1>Sign Up</h1>
@@ -23,9 +26,3 @@
     </div>
   </div>
 </div>
-
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Sign up - <%= Danbooru.config.app_name %>
-<% end %>

app/views/users/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "@#{@user.pretty_name}" %>
+<%= render "secondary_links" %>
+
 <div id="c-users">
   <div id="a-show">
     <h1><%= link_to_user @user %></h1>
@@ -17,11 +20,5 @@
   </div>
 </div>
 
-<%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  User - <%= @user.presenter.name %> - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header, auto_discovery_link_tag(:atom, comments_url(:atom, search: { post_tags_match: "user:#{@user.name}" }), title: "Comments on #{@user.name}'s uploads")) %>
 <% content_for(:html_header, auto_discovery_link_tag(:atom, comments_url(:atom, search: { post_tags_match: "commenter:#{@user.name}" }), title: "Comments on posts commented on by #{@user.name}")) %>

app/views/wiki_page_versions/diff.html.erb

@@ -1,3 +1,6 @@
+<% page_title "Wiki Comparison: #{@thispage.pretty_title.titleize}" %>
+
+<%= render "wiki_pages/secondary_links" %>
 <%= render "wiki_pages/sidebar" %>
 
 <% content_for(:content) do %>
@@ -15,9 +18,3 @@
     <p>The artist requested removal of this page.</p>
   <% end %>
 <% end %>
-
-<%= render "wiki_pages/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Wiki Page Versions Comparison - <%= @thispage.pretty_title %> - <%= Danbooru.config.app_name %>
-<% end %>

app/views/wiki_pages/show.html.erb

@@ -1,3 +1,6 @@
+<% page_title "#{@wiki_page.pretty_title.titleize} Wiki" %>
+
+<%= render "secondary_links" %>
 <%= render "sidebar" %>
 
 <% content_for(:content) do %>
@@ -38,12 +41,6 @@
   <%= render "wiki_pages/posts", wiki_page: @wiki_page %>
 <% end %>
 
-<% content_for(:page_title) do %>
-  Wiki - <%= @wiki_page.pretty_title %> - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <%= tag.meta name: "description", content: wiki_page_excerpt(@wiki_page) %>
 <% end %>
-
-<%= render "secondary_links" %>