From 200fa5da63178ac667fb44de7ed44c5cbb3569b6 Mon Sep 17 00:00:00 2001 From: uu59 Date: Thu, 24 Jul 2014 14:10:51 +0900 Subject: [PATCH] Fix --- app/helpers/application_helper.rb | 4 ++-- app/views/layouts/application.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index fbd88f6..ae573e0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -6,7 +6,7 @@ module ApplicationHelper end def fluentd_ui_title - ENV["FLUENTD_UI_TITLE"] || "Fluentd UI" + ENV["FLUENTD_UI_TITLE"] || "Fluentd" end def language_name(locale) @@ -42,7 +42,7 @@ module ApplicationHelper def page_title(title, &block) content_for(:page_title) do - title + block.try(:call).to_s + title end page_head(title, &block) unless content_for?(:page_head) end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c00f5c9..94596a3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,11 +7,11 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title> - <% fluentd_ui_title %> <% if content_for?(:page_title) %> - | <%= content_for(:page_title) %> + | <% end %> + <%= fluentd_ui_title %> <%= stylesheet_link_tag 'application', media: 'all'%> <%= javascript_include_tag 'application' %>