views: standardize page titles.

app/controllers/application_controller.rb

@@ -4,7 +4,6 @@ class ApplicationController < ActionController::Base
   before_action :reset_current_user
   before_action :set_current_user
   after_action :reset_current_user
-  before_action :set_title
   before_action :normalize_search
   before_action :set_started_at_session
   before_action :api_check
@@ -190,10 +189,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def set_title
-    @page_title = Danbooru.config.app_name + "/#{params[:controller]}"
-  end
-
   # Remove blank `search` params from the url.
   #
   # /tags?search[name]=touhou&search[category]=&search[order]=

app/helpers/application_helper.rb

@@ -198,7 +198,25 @@ module ApplicationHelper
       [:"#{prefix}-#{name}", value]
     end.to_h
   end
-  
+
+  def page_title
+    if content_for(:page_title).present?
+      content_for(:page_title)
+    elsif action_name == "index"
+      "#{controller_name.titleize} - #{Danbooru.config.app_name}"
+    elsif action_name == "show"
+      "#{controller_name.singularize.titleize} - #{Danbooru.config.app_name}"
+    elsif action_name == "new"
+      "New #{controller_name.singularize.titleize} - #{Danbooru.config.app_name}"
+    elsif action_name == "edit"
+      "Edit #{controller_name.singularize.titleize} - #{Danbooru.config.app_name}"
+    elsif action_name == "search"
+      "Search #{controller_name.titleize} - #{Danbooru.config.app_name}"
+    else
+      "#{Danbooru.config.app_name}/#{controller_name}"
+    end
+  end
+
 protected
   def nav_link_match(controller, url)
     url =~ case controller

app/views/artist_commentaries/index.html.erb

@@ -38,7 +38,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Artist Commentary - <%= Danbooru.config.app_name %>
-<% end %>

app/views/artist_commentaries/search.html.erb

@@ -14,7 +14,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Artist Commentary - <%= Danbooru.config.app_name %>
-<% end %>

app/views/artist_commentary_versions/index.html.erb

@@ -16,7 +16,3 @@
 </div>
 
 <%= render "artist_commentaries/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Artist Commentary Versions - <%= Danbooru.config.app_name %>
-<% end %>

app/views/artist_urls/index.html.erb

@@ -43,7 +43,3 @@
 </div>
 
 <%= render "artists/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Artist URLs - <%= Danbooru.config.app_name %>
-<% end %>

app/views/artist_versions/index.html.erb

@@ -8,7 +8,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Artist Versions - <%= Danbooru.config.app_name %>
-<% end %>

app/views/artist_versions/search.html.erb

@@ -13,7 +13,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Artist Changes - <%= Danbooru.config.app_name %>
-<% end %>

app/views/artists/edit.html.erb

@@ -16,7 +16,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Artist - <%= Danbooru.config.app_name %>
-<% end %>

app/views/artists/index.html.erb

@@ -32,7 +32,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Artists - <%= Danbooru.config.app_name %>
-<% end %>

app/views/artists/new.html.erb

@@ -9,7 +9,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Artist - <%= Danbooru.config.app_name %>
-<% end %>

app/views/bans/edit.html.erb

@@ -13,7 +13,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Ban - <%= Danbooru.config.app_name %>
-<% end %>

app/views/bans/index.html.erb

@@ -45,7 +45,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Bans - <%= Danbooru.config.app_name %>
-<% end %>

app/views/bans/new.html.erb

@@ -6,7 +6,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Ban - <%= Danbooru.config.app_name %>
-<% end %>

app/views/bulk_update_requests/edit.html.erb

@@ -6,7 +6,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Bulk Update Request - <%= Danbooru.config.app_name %>
-<% end %>

app/views/bulk_update_requests/index.html.erb

@@ -10,7 +10,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Bulk Update Requests - <%= Danbooru.config.app_name %>
-<% end %>

app/views/bulk_update_requests/new.html.erb

@@ -7,7 +7,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Bulk Update Request - <%= Danbooru.config.app_name %>
-<% end %>

app/views/bulk_update_requests/show.html.erb

@@ -22,7 +22,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Bulk Update Request - <%= Danbooru.config.app_name %>
-<% end %>

app/views/comments/edit.html.erb

@@ -7,7 +7,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Comment - <%= Danbooru.config.app_name %>
-<% end %>

app/views/comments/index.html.erb

@@ -13,7 +13,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Comments - <%= Danbooru.config.app_name %>
-<% end %>

app/views/comments/new.html.erb

@@ -7,7 +7,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Comment - <%= Danbooru.config.app_name %>
-<% end %>

app/views/comments/search.html.erb

@@ -17,7 +17,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Comments - <%= Danbooru.config.app_name %>
-<% end %>

app/views/comments/show.html.erb

@@ -17,7 +17,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Comment - <%= Danbooru.config.app_name %>
-<% end %>

app/views/delayed_jobs/index.html.erb

@@ -55,7 +55,3 @@
     <%= numbered_paginator(@delayed_jobs) %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Delayed Jobs - <%= Danbooru.config.app_name %>
-<% end %>

app/views/favorite_groups/edit.html.erb

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

app/views/favorite_groups/index.html.erb

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

app/views/favorite_groups/new.html.erb

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

app/views/forum_posts/edit.html.erb

@@ -7,7 +7,3 @@
 </div>
 
 <%= render "forum_topics/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Forum Post - <%= Danbooru.config.app_name %>
-<% end %>

app/views/forum_posts/index.html.erb

@@ -30,7 +30,3 @@
 </div>
 
 <%= render "forum_topics/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Forum Posts - <%= Danbooru.config.app_name %>
-<% end %>

app/views/forum_posts/new.html.erb

@@ -11,7 +11,3 @@
 </div>
 
 <%= render "forum_topics/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Forum Post - <%= Danbooru.config.app_name %>
-<% end %>

app/views/forum_posts/search.html.erb

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

app/views/forum_posts/show.html.erb

@@ -6,7 +6,3 @@
 </div>
 
 <%= render "forum_topics/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Forum Post - <%= Danbooru.config.app_name %>
-<% end %>

app/views/forum_topics/edit.html.erb

@@ -5,7 +5,3 @@
     <%= render "form", :forum_topic => @forum_topic %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Edit Forum Topic - <%= Danbooru.config.app_name %>
-<% end %>

app/views/forum_topics/new.html.erb

@@ -7,7 +7,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Forum Topic - <%= Danbooru.config.app_name %>
-<% end %>

app/views/ip_bans/index.html.erb

@@ -28,7 +28,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  IP Bans - <%= Danbooru.config.app_name %>
-<% end %>

app/views/ip_bans/new.html.erb

@@ -13,7 +13,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New IP Ban - <%= Danbooru.config.app_name %>
-<% end %>

app/views/janitor_trials/index.html.erb

@@ -27,7 +27,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Janitor Trials - <%= Danbooru.config.app_name %>
-<% end %>

app/views/janitor_trials/new.html.erb

@@ -15,6 +15,3 @@
 </div>
 
 <%= render "secondary_links" %>
-<% content_for(:page_title) do %>
-  New Janitor - <%= Danbooru.config.app_name %>
-<% end %>

app/views/layouts/blank.html.erb

@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-  <title><%= yield :page_title %></title>
+  <title><%= page_title %></title>
   <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
   <link rel="top" title="<%= Danbooru.config.app_name %>" href="/">
   <%= csrf_meta_tag %>

app/views/layouts/default.html.erb

@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-  <title><%= yield :page_title %></title>
+  <title><%= page_title %></title>
   <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
   <link rel="top" title="<%= Danbooru.config.app_name %>" href="/">
   <%= csrf_meta_tag %>

app/views/mod_actions/index.html.erb

@@ -26,7 +26,3 @@
     <%= numbered_paginator(@mod_actions) %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Mod Actions - <%= Danbooru.config.app_name %>
-<% end %>

app/views/news_updates/edit.html.erb

@@ -10,7 +10,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Update - <%= Danbooru.config.app_name %>
-<% end %>

app/views/news_updates/index.html.erb

@@ -26,7 +26,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  News Updates - <%= Danbooru.config.app_name %>
-<% end %>

app/views/news_updates/new.html.erb

@@ -10,7 +10,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Update - <%= Danbooru.config.app_name %>
-<% end %>

app/views/note_versions/index.html.erb

@@ -13,7 +13,3 @@
     <%= render "notes/secondary_links" %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Note Versions - <%= Danbooru.config.app_name %>
-<% end %>

app/views/notes/index.html.erb

@@ -38,7 +38,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Notes - <%= Danbooru.config.app_name %>
-<% end %>

app/views/notes/search.html.erb

@@ -14,7 +14,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Notes - <%= Danbooru.config.app_name %>
-<% end %>

app/views/pool_versions/index.html.erb

@@ -13,7 +13,3 @@
 </div>
 
 <%= render "pools/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Pool Versions - <%= Danbooru.config.app_name %>
-<% end %>

app/views/pools/edit.html.erb

@@ -17,7 +17,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Pool - <%= Danbooru.config.app_name %>
-<% end %>

app/views/pools/index.html.erb

@@ -39,10 +39,6 @@
 
 <%= render "secondary_links" %>
 
-<% content_for(:page_title) do %>
-  Pools - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <meta name="description" content="Pools are groups of posts with something in common. The most common use of pools is for posts that are part of a series (such as a comic, or a group of images released by an artist).">
 <% end %>

app/views/pools/new.html.erb

@@ -17,7 +17,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Pool - <%= Danbooru.config.app_name %>
-<% end %>

app/views/post_appeals/index.html.erb

@@ -53,7 +53,3 @@
     <%= numbered_paginator(@post_appeals) %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Appeals - <%= Danbooru.config.app_name %>
-<% end %>

app/views/post_approvals/index.html.erb

@@ -36,7 +36,3 @@
     <%= numbered_paginator(@post_approvals) %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Approvals - <%= Danbooru.config.app_name %>
-<% end %>

app/views/post_events/index.html.erb

@@ -31,7 +31,3 @@
     </table>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Events - <%= Danbooru.config.app_name %>
-<% end %>

app/views/post_flags/index.html.erb

@@ -61,7 +61,3 @@
     <%= numbered_paginator(@post_flags) %>
   </div>
 </div>
-
-<% content_for(:page_title) do %>
-  Flags - <%= Danbooru.config.app_name %>
-<% end %>

app/views/post_replacements/index.html.erb

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

app/views/post_versions/index.html.erb

@@ -23,7 +23,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Post Changes - <%= Danbooru.config.app_name %>
-<% end %>

app/views/post_versions/search.html.erb

@@ -13,7 +13,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Post Changes - <%= Danbooru.config.app_name %>
-<% end %>

app/views/saved_searches/edit.html.erb

@@ -13,7 +13,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Saved Search - <%= Danbooru.config.app_name %>
-<% end %>

app/views/saved_searches/index.html.erb

@@ -37,7 +37,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Saved Searches - <%= Danbooru.config.app_name %>
-<% end %>

app/views/static/error.html.erb

@@ -5,3 +5,7 @@
   <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/tag_alias_requests/new.html.erb

@@ -38,7 +38,3 @@
 </div>
 
 <%= render "tag_aliases/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Tag Alias Request - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tag_aliases/edit.html.erb

@@ -14,7 +14,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Tag Alias - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tag_aliases/index.html.erb

@@ -8,7 +8,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Tag Aliases - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tag_aliases/show.html.erb

@@ -23,7 +23,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Tag Alias - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tag_corrections/new.html.erb

@@ -15,9 +15,5 @@
       <%= submit_tag "Fix" %>
       <%= submit_tag "Cancel" %>
     <% end %>
-
-    <% content_for(:page_title) do %>
-      Tag Correction - <%= Danbooru.config.app_name %>
-    <% end %>
   </div>
 </div>

app/views/tag_implication_requests/new.html.erb

@@ -38,7 +38,3 @@
 </div>
 
 <%= render "tag_implications/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Tag Implication Request - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tag_implications/edit.html.erb

@@ -14,7 +14,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Tag Implication - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tag_implications/index.html.erb

@@ -8,7 +8,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Tag Implications - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tag_implications/show.html.erb

@@ -23,7 +23,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Tag Implication - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tags/edit.html.erb

@@ -19,7 +19,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Tag - <%= Danbooru.config.app_name %>
-<% end %>

app/views/tags/index.html.erb

@@ -35,7 +35,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Tags - <%= Danbooru.config.app_name %>
-<% end %>

app/views/uploads/index.html.erb

@@ -78,7 +78,3 @@
 </div>
 
 <%= render "uploads/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Uploads - <%= Danbooru.config.app_name %>
-<% end %>

app/views/uploads/new.html.erb

@@ -119,10 +119,6 @@
   </div>
 </div>
 
-<% content_for(:page_title) do %>
-  Upload - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% content_for(:html_header) do %>
   <script>
     $(function() {

app/views/uploads/show.html.erb

@@ -45,10 +45,6 @@
 
 <%= render "uploads/secondary_links" %>
 
-<% content_for(:page_title) do %>
-  Upload - <%= Danbooru.config.app_name %>
-<% end %>
-
 <% if @upload.is_pending? || @upload.is_processing? || @upload.is_preprocessing? || @upload.is_preprocessed? %>
   <% content_for(:html_header) do %>
     <meta http-equiv="refresh" content="2">

app/views/user_feedbacks/edit.html.erb

@@ -17,7 +17,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Feedback - <%= Danbooru.config.app_name %>
-<% end %>

app/views/user_feedbacks/index.html.erb

@@ -38,7 +38,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Feedback - <%= Danbooru.config.app_name %>
-<% end %>

app/views/user_feedbacks/new.html.erb

@@ -24,7 +24,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Feedback - <%= Danbooru.config.app_name %>
-<% end %>

app/views/user_feedbacks/search.html.erb

@@ -20,7 +20,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search User Feedbacks - <%= Danbooru.config.app_name %>
-<% end %>

app/views/user_name_change_requests/show.html.erb

@@ -86,3 +86,7 @@
 </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_reverts/new.html.erb

@@ -13,7 +13,3 @@
 </div>
 
 <%= render "users/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  User Revert - <%= Danbooru.config.app_name %>
-<% end %>

app/views/users/index.html.erb

@@ -59,7 +59,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Users - <%= Danbooru.config.app_name %>
-<% end %>

app/views/users/search.html.erb

@@ -21,7 +21,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Users - <%= Danbooru.config.app_name %>
-<% end %>

app/views/wiki_page_versions/index.html.erb

@@ -17,7 +17,3 @@
 </div>
 
 <%= render "wiki_pages/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Wiki Page Versions - <%= Danbooru.config.app_name %>
-<% end %>

app/views/wiki_page_versions/show.html.erb

@@ -21,7 +21,3 @@
 </div>
 
 <%= render "wiki_pages/secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Wiki Page Version - <%= Danbooru.config.app_name %>
-<% end %>

app/views/wiki_pages/edit.html.erb

@@ -15,7 +15,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Edit Wiki Page - <%= Danbooru.config.app_name %>
-<% end %>

app/views/wiki_pages/index.html.erb

@@ -27,8 +27,4 @@
   </div>
 </div>
 
-<% content_for(:page_title) do %>
-  Wiki - <%= Danbooru.config.app_name %>
-<% end %>
-
 <%= render "secondary_links" %>

app/views/wiki_pages/new.html.erb

@@ -24,7 +24,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  New Wiki Page - <%= Danbooru.config.app_name %>
-<% end %>

app/views/wiki_pages/search.html.erb

@@ -27,7 +27,3 @@
 </div>
 
 <%= render "secondary_links" %>
-
-<% content_for(:page_title) do %>
-  Search Wiki - <%= Danbooru.config.app_name %>
-<% end %>