From 6e4f697ceadcff7daf6f294c7c291870012a4aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Mart=C3=ADn?= Date: Sun, 24 Jun 2018 02:40:15 +0200 Subject: [PATCH] Extract partial with common tags. --- app/views/layouts/_common_head.html.erb | 8 ++++++++ app/views/layouts/admin.html.erb | 9 +-------- app/views/layouts/application.html.erb | 9 +-------- app/views/layouts/devise.html.erb | 9 +-------- app/views/layouts/management.html.erb | 9 +-------- 5 files changed, 12 insertions(+), 32 deletions(-) create mode 100644 app/views/layouts/_common_head.html.erb diff --git a/app/views/layouts/_common_head.html.erb b/app/views/layouts/_common_head.html.erb new file mode 100644 index 000000000..44bf54a2c --- /dev/null +++ b/app/views/layouts/_common_head.html.erb @@ -0,0 +1,8 @@ + + + +<%= content_for?(:title) ? yield(:title) : default_title %> +<%= stylesheet_link_tag "application" %> +<%= javascript_include_tag "application", 'data-turbolinks-track' => true %> +<%= csrf_meta_tags %> +<%= favicon_link_tag "favicon.ico" %> diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index df64a250f..2baf7d3ae 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -2,15 +2,8 @@ - - - - <%= content_for?(:title) ? yield(:title) : "Admin" %> - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= render "layouts/common_head", default_title: "Admin" %> <%= content_for :head %> - <%= csrf_meta_tags %> - <%= favicon_link_tag "favicon.ico" %> <%= javascript_tag "jQuery.fx.off = true" if Rails.env.test? %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4ed17ed3d..4e8299d66 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,20 +1,13 @@ - - - + <%= render "layouts/common_head", default_title: setting['org_name'] %> <%= render "layouts/tracking_data" %> <%= render "layouts/meta_tags" %> - <%= content_for?(:title) ? yield(:title) : setting['org_name'] %> <%= content_for :canonical %> - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> - <%= favicon_link_tag "favicon.ico" %> <%= favicon_link_tag image_path_for("apple-touch-icon-200.png"), rel: "icon apple-touch-icon", sizes: "200x200", diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index 50b84287d..25f36ba0b 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -1,15 +1,8 @@ - - - - <%= content_for?(:title) ? yield(:title) : "Gobierno abierto" %> + <%= render "layouts/common_head", default_title: "Gobierno abierto" %> <%= render "layouts/meta_tags" %> - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> - <%= favicon_link_tag "favicon.ico" %> diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index ba1f9f909..4dc4aec12 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -2,16 +2,9 @@ - - - - <%= content_for?(:title) ? yield(:title) : "Management" %> - <%= stylesheet_link_tag "application", media: "all" %> + <%= render "layouts/common_head", default_title: "Management" %> <%= stylesheet_link_tag "print", media: "print" %> - <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%= content_for :head %> - <%= csrf_meta_tags %> - <%= favicon_link_tag "favicon.ico" %>