From 9765b1e908414ee2bb1dff55eaf667cf1e7d2e47 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 16 Jul 2019 15:44:00 +0100 Subject: [PATCH] Move admin/shared/_head/replace_spree_title deface to head view --- .../shared/_head/replace_spree_title.html.haml.deface | 7 ------- app/views/spree/admin/shared/_head.html.haml | 7 +++++-- 2 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 app/overrides/spree/admin/shared/_head/replace_spree_title.html.haml.deface diff --git a/app/overrides/spree/admin/shared/_head/replace_spree_title.html.haml.deface b/app/overrides/spree/admin/shared/_head/replace_spree_title.html.haml.deface deleted file mode 100644 index 906a09bd8c..0000000000 --- a/app/overrides/spree/admin/shared/_head/replace_spree_title.html.haml.deface +++ /dev/null @@ -1,7 +0,0 @@ -/ replace_contents "title" - -- if content_for? :html_title - = yield :html_title -- else - = t(controller.controller_name, :default => controller.controller_name.titleize) -= " - OFN #{t(:administration)}" diff --git a/app/views/spree/admin/shared/_head.html.haml b/app/views/spree/admin/shared/_head.html.haml index 919f2a5f8a..21ecebf9a5 100644 --- a/app/views/spree/admin/shared/_head.html.haml +++ b/app/views/spree/admin/shared/_head.html.haml @@ -3,8 +3,11 @@ = csrf_meta_tags %title - = "Spree #{Spree.t('administration')}: " - = Spree.t(controller.controller_name, :default => controller.controller_name.titleize) + - if content_for? :html_title + = yield :html_title + - else + = t(controller.controller_name, :default => controller.controller_name.titleize) + = " - OFN #{t(:administration)}" %link{:href => "//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese", :rel => "stylesheet", :type => "text/css"}