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 @@