[Template] Don't explicitly add app_name in every title

- Use a helper function to add it to every title (except the root path
which is just the app_name)
- Remove useless set_title function in application_controllerller
This commit is contained in:
Earlopain 2021-03-21 16:58:35 +01:00
parent 121546a854
commit 9b7c4db852
144 changed files with 154 additions and 155 deletions

View File

@ -4,7 +4,6 @@ class ApplicationController < ActionController::Base
skip_forgery_protection if: -> { SessionLoader.new(request).has_api_authentication? }
before_action :reset_current_user
before_action :set_current_user
before_action :set_title
before_action :normalize_search
before_action :api_check
before_action :set_variant
@ -12,6 +11,7 @@ class ApplicationController < ActionController::Base
after_action :reset_current_user
layout "default"
include TitleHelper
include DeferredPosts
helper_method :deferred_post_ids, :deferred_posts
@ -191,10 +191,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]=

View File

@ -0,0 +1,6 @@
module TitleHelper
def get_title
return Danbooru.config.app_name if current_page? root_path
return content_for(:page_title) + " - " + Danbooru.config.app_name if content_for? :page_title
end
end

View File

@ -40,5 +40,5 @@ mass update aaa -> bbb
</div>
<% content_for(:page_title) do %>
Alias &amp; Implication Import - <%= Danbooru.config.app_name %>
Alias &amp; Implication Import
<% end %>

View File

@ -25,5 +25,5 @@
</div>
<% content_for(:page_title) do %>
Admin Dashboard - <%= Danbooru.config.app_name %>
Admin Dashboard
<% end %>

View File

@ -73,5 +73,5 @@
<%= render "users/secondary_links" %>
<% content_for(:page_title) do %>
Edit User - <%= Danbooru.config.app_name %>
Edit User
<% end %>

View File

@ -40,5 +40,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Artist Commentary - <%= Danbooru.config.app_name %>
Artist Commentary
<% end %>

View File

@ -16,5 +16,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Search Artist Commentary - <%= Danbooru.config.app_name %>
Search Artist Commentary
<% end %>

View File

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

View File

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

View File

@ -10,5 +10,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Artist Versions - <%= Danbooru.config.app_name %>
Artist Versions
<% end %>

View File

@ -15,5 +15,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Search Artist Changes - <%= Danbooru.config.app_name %>
Search Artist Changes
<% end %>

View File

@ -27,5 +27,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Artist - <%= @artist.name %> - <%= Danbooru.config.app_name %>
Artist - <%= @artist.name %>
<% end %>

View File

@ -15,5 +15,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Avoid Posting - <%= Danbooru.config.app_name %>
Avoid Posting
<% end %>

View File

@ -18,5 +18,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Edit Artist - <%= Danbooru.config.app_name %>
Edit Artist
<% end %>

View File

@ -34,5 +34,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Artists - <%= Danbooru.config.app_name %>
Artists
<% end %>

View File

@ -11,5 +11,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
New Artist - <%= Danbooru.config.app_name %>
New Artist
<% end %>

View File

@ -16,5 +16,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Edit Ban - <%= Danbooru.config.app_name %>
Edit Ban
<% end %>

View File

@ -49,5 +49,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Bans - <%= Danbooru.config.app_name %>
Bans
<% end %>

View File

@ -8,5 +8,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
New Ban - <%= Danbooru.config.app_name %>
New Ban
<% end %>

View File

@ -19,5 +19,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Ban - <%= @ban.user.name %> - <%= Danbooru.config.app_name %>
Ban - <%= @ban.user.name %>
<% end %>

View File

@ -8,5 +8,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Edit Bulk Update Request - <%= Danbooru.config.app_name %>
Edit Bulk Update Request
<% end %>

View File

@ -12,5 +12,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Bulk Update Requests - <%= Danbooru.config.app_name %>
Bulk Update Requests
<% end %>

View File

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

View File

@ -24,5 +24,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Bulk Update Request - <%= Danbooru.config.app_name %>
Bulk Update Request
<% end %>

View File

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

View File

@ -15,5 +15,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Comments - <%= Danbooru.config.app_name %>
Comments
<% end %>

View File

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

View File

@ -19,5 +19,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Search Comments - <%= Danbooru.config.app_name %>
Search Comments
<% end %>

View File

@ -18,5 +18,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Comment - <%= Danbooru.config.app_name %>
Comment
<% end %>

View File

@ -54,5 +54,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Messages - <%= Danbooru.config.app_name %>
Messages
<% end %>

View File

@ -8,5 +8,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
New Message - <%= Danbooru.config.app_name %>
New Message
<% end %>

View File

@ -39,5 +39,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Message - <%= @dmail.title %> - <%= Danbooru.config.app_name %>
Message - <%= @dmail.title %>
<% end %>

View File

@ -31,5 +31,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Email Blacklists - <%= Danbooru.config.app_name %>
Email Blacklists
<% end %>

View File

@ -15,5 +15,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
New Email Blacklist - <%= Danbooru.config.app_name %>
New Email Blacklist
<% end %>

View File

@ -22,10 +22,10 @@
<% end %>
<% end %>
</div>
</div>
</div>
<%= render "static/footer" %>
<% content_for(:page_title) do %>
<%= Danbooru.config.app_name %>
Explore
<% end %>

View File

@ -31,5 +31,5 @@
<%= render "posts/partials/common/secondary_links" %>
<% content_for(:page_title) do %>
Missed Searches - <%= Danbooru.config.app_name %>
Missed Searches
<% end %>

View File

@ -17,7 +17,7 @@
<%= render "posts/partials/common/secondary_links" %>
<% content_for(:page_title) do %>
Popular - <%= Danbooru.config.app_name %>
Popular
<% end %>
<% content_for(:html_header) do %>

View File

@ -31,5 +31,5 @@
<%= render "posts/partials/common/secondary_links" %>
<% content_for(:page_title) do %>
Popular Searches - <%= Danbooru.config.app_name %>
Popular Searches
<% end %>

View File

@ -32,5 +32,5 @@
<%= render "posts/partials/common/secondary_links" %>
<% content_for(:page_title) do %>
Favorites - <%= @user.pretty_name %> - <%= Danbooru.config.app_name %>
Favorites - <%= @user.pretty_name %>
<% end %>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -20,7 +20,7 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Forum - <%= Danbooru.config.app_name %>
Forum
<% end %>
<% content_for(:html_header, auto_discovery_link_tag(:atom, forum_topics_url(:atom), title: "Forum Topics")) %>

View File

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

View File

@ -19,5 +19,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Merge Forum Topic - <%= Danbooru.config.app_name %>
Merge Forum Topic
<% end %>

View File

@ -41,7 +41,7 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Forum - <%= @forum_topic.title %> - <%= Danbooru.config.app_name %>
Forum - <%= @forum_topic.title %>
<% end %>
<% content_for(:html_header) do %>

View File

@ -30,5 +30,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
IP Bans - <%= Danbooru.config.app_name %>
IP Bans
<% end %>

View File

@ -15,5 +15,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
New IP Ban - <%= Danbooru.config.app_name %>
New IP Ban
<% end %>

View File

@ -23,6 +23,5 @@
</div>
<% content_for(:page_title) do %>
Similar Images Search - <%= Danbooru.config.app_name %>
Similar Images Search
<% end %>

View File

@ -29,5 +29,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Janitor Trials - <%= Danbooru.config.app_name %>
Janitor Trials
<% end %>

View File

@ -16,5 +16,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
New Janitor - <%= Danbooru.config.app_name %>
New Janitor
<% end %>

View File

@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
<title><%= yield :page_title %></title>
<title><%= get_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 %>

View File

@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
<title><%= yield :page_title %></title>
<title><%= get_title %></title>
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">

View File

@ -11,5 +11,5 @@
</div>
<% content_for(:page_title) do %>
API Key - <%= Danbooru.config.app_name %>
API Key
<% end %>

View File

@ -28,5 +28,5 @@
</div>
<% content_for(:page_title) do %>
API Key - <%= Danbooru.config.app_name %>
API Key
<% end %>

View File

@ -11,5 +11,5 @@
</div>
<% content_for(:page_title) do %>
Refresh Counts - <%= Danbooru.config.app_name %>
Refresh Counts
<% end %>

View File

@ -35,5 +35,5 @@
</div>
<% content_for(:page_title) do %>
Delete Account - <%= Danbooru.config.app_name %>
Delete Account
<% end %>

View File

@ -33,5 +33,5 @@
</div>
<% content_for(:page_title) do %>
Edit Message Filters - <%= Danbooru.config.app_name %>
Edit Message Filters
<% end %>

View File

@ -20,5 +20,5 @@
<%= render "sessions/secondary_links" %>
<% content_for(:page_title) do %>
Login Reminder - <%= Danbooru.config.app_name %>
Login Reminder
<% end %>

View File

@ -25,5 +25,5 @@
<%= render "sessions/secondary_links" %>
<% content_for(:page_title) do %>
Reset Password - <%= Danbooru.config.app_name %>
Reset Password
<% end %>

View File

@ -19,5 +19,5 @@
<%= render "sessions/secondary_links" %>
<% content_for(:page_title) do %>
Reset Password - <%= Danbooru.config.app_name %>
Reset Password
<% end %>

View File

@ -12,5 +12,5 @@
</div>
<% content_for(:page_title) do %>
Change Password - <%= Danbooru.config.app_name %>
Change Password
<% end %>

View File

@ -118,5 +118,5 @@
<%= render "tags/secondary_links" %>
<% content_for(:page_title) do %>
MetaSearch - Tags - <%= Danbooru.config.app_name %>
MetaSearch - Tags
<% end %>

View File

@ -28,5 +28,5 @@
</div>
<% content_for(:page_title) do %>
Mod Actions - <%= Danbooru.config.app_name %>
Mod Actions
<% end %>

View File

@ -23,5 +23,5 @@
</div>
<% content_for(:page_title) do %>
Mod Dashboard - <%= Danbooru.config.app_name %>
Mod Dashboard
<% end %>

View File

@ -19,5 +19,5 @@
</div>
<% content_for(:page_title) do %>
IP Addresses - <%= Danbooru.config.app_name %>
IP Addresses
<% end %>

View File

@ -11,5 +11,5 @@
</div>
<% content_for(:page_title) do %>
Search IP Addresses - <%= Danbooru.config.app_name %>
Search IP Addresses
<% end %>

View File

@ -50,5 +50,5 @@
</div>
<% content_for(:page_title) do %>
Post Disapprovals - <%= Danbooru.config.app_name %>
Post Disapprovals
<% end %>

View File

@ -25,7 +25,7 @@
<%= render "posts/partials/common/secondary_links" %>
<% content_for(:page_title) do %>
Mod Queue - <%= Danbooru.config.app_name %>
Mod Queue
<% end %>
<% content_for(:html_header) do %>

View File

@ -40,5 +40,5 @@
<%= render "posts/partials/common/secondary_links" %>
<% content_for(:page_title) do %>
Mod Queue - <%= Danbooru.config.app_name %>
Mod Queue
<% end %>

View File

@ -21,5 +21,5 @@
</div>
<% content_for(:page_title) do %>
Mass Edit - <%= Danbooru.config.app_name %>
Mass Edit
<% end %>

View File

@ -12,5 +12,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Edit Update - <%= Danbooru.config.app_name %>
Edit Update
<% end %>

View File

@ -30,5 +30,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
News Updates - <%= Danbooru.config.app_name %>
News Updates
<% end %>

View File

@ -12,5 +12,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
New Update - <%= Danbooru.config.app_name %>
New Update
<% end %>

View File

@ -15,5 +15,5 @@
</div>
<% content_for(:page_title) do %>
Note Versions - <%= Danbooru.config.app_name %>
Note Versions
<% end %>

View File

@ -40,5 +40,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Notes - <%= Danbooru.config.app_name %>
Notes
<% end %>

View File

@ -16,5 +16,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Search Notes - <%= Danbooru.config.app_name %>
Search Notes
<% end %>

View File

@ -22,5 +22,5 @@
<%= render "pools/secondary_links" %>
<% content_for(:page_title) do %>
Order Pool - <%= Danbooru.config.app_name %>
Order Pool
<% end %>

View File

@ -15,5 +15,5 @@
<%= render "pools/secondary_links" %>
<% content_for(:page_title) do %>
Pool Version Comparison - <%= @pool_version.name %> - <%= Danbooru.config.app_name %>
Pool Version Comparison
<% end %>

View File

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

View File

@ -19,5 +19,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Edit Pool - <%= Danbooru.config.app_name %>
Edit Pool
<% end %>

View File

@ -15,5 +15,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Pool Gallery - <%= Danbooru.config.app_name %>
Pool Gallery
<% end %>

View File

@ -40,7 +40,7 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Pools - <%= Danbooru.config.app_name %>
Pools
<% end %>
<% content_for(:html_header) do %>

View File

@ -19,5 +19,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
New Pool - <%= Danbooru.config.app_name %>
New Pool
<% end %>

View File

@ -27,7 +27,7 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Pool - <%= @pool.pretty_name %> - <%= Danbooru.config.app_name %>
Pool - <%= @pool.pretty_name %>
<% end %>
<% content_for(:html_header) do %>

View File

@ -55,5 +55,5 @@
</div>
<% content_for(:page_title) do %>
Appeals - <%= Danbooru.config.app_name %>
Appeals
<% end %>

View File

@ -38,5 +38,5 @@
</div>
<% content_for(:page_title) do %>
Approvals - <%= Danbooru.config.app_name %>
Approvals
<% end %>

View File

@ -33,5 +33,5 @@
</div>
<% content_for(:page_title) do %>
Events - <%= Danbooru.config.app_name %>
Events
<% end %>

View File

@ -63,5 +63,5 @@
</div>
<% content_for(:page_title) do %>
Flags - <%= Danbooru.config.app_name %>
Flags
<% end %>

View File

@ -84,5 +84,5 @@
</div>
<% content_for(:page_title) do %>
Post Replacements - <%= Danbooru.config.app_name %>
Post Replacements
<% end %>

View File

@ -42,5 +42,5 @@
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Post Changes - <%= Danbooru.config.app_name %>
Post Changes
<% end %>

View File

@ -53,9 +53,9 @@
<% content_for(:page_title) do %>
<% if @post_set.public_tag_string.present? %>
<%= @post_set.humanized_tag_string %> - <%= Danbooru.config.app_name %>
<%= @post_set.humanized_tag_string %>
<% else %>
<%= Danbooru.config.app_name %>
Posts
<% end %>
<% end %>

View File

@ -218,7 +218,7 @@
</div>
<% content_for(:page_title) do %>
#<%= @post.id %> - <%= Danbooru.config.app_name %>
#<%= @post.id %>
<% end %>
<% content_for(:html_header) do %>

View File

@ -5,12 +5,12 @@
<p>Based on your favorites, you may enjoy these posts. Favorite more to get more accurate results. These recommendations update every hour.</p>
<%= render "posts/partials/common/inline_blacklist" %>
<%= render partial: "show" %>
<%= render partial: "show" %>
</div>
</div>
<%= render "posts/partials/common/secondary_links" %>
<% content_for(:page_title) do %>
Recommended Posts - <%= Danbooru.config.app_name %>
Recommended Posts
<% end %>

View File

@ -35,5 +35,5 @@
<%= render "tags/secondary_links" %>
<% content_for(:page_title) do %>
Related tags - <%= Danbooru.config.app_name %>
Related tags
<% end %>

View File

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

View File

@ -5,5 +5,5 @@
<%= link_to "Go back", :back, :rel => "prev" %>
<% content_for(:page_title) do %>
Access Denied - <%= Danbooru.config.app_name %>
Access Denied
<% end %>

Some files were not shown because too many files have changed in this diff Show More