From 52e0b4b19742a3ed11910a98f6c9f8d0e1fea2c0 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Mon, 3 Dec 2018 18:21:31 +0100 Subject: [PATCH 1/3] Ignore valencia files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 79239dd972..73b7ad4c67 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ vendor/gobierto_engines/* !vendor/gobierto_engines/.keep app/javascript/gencat app/javascript/packs/gencat.js +app/javascript/valencia +app/javascript/packs/valencia.js From 7e6beec69d3a18856bff471bf855224eaf3259ec Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Mon, 3 Dec 2018 18:21:43 +0100 Subject: [PATCH 2/3] Add new mapping of engines with CSS themes --- config/application.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/application.rb b/config/application.rb index a35bb92df0..30166ce4f8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -54,20 +54,21 @@ class Application < Rails::Application # Auth Strategies base_strategies_path = %w(vendor auth_strategies) available_strategies = Dir.chdir(config.root.join(*base_strategies_path)) do - Dir.glob('*').select{ |file| File.directory?(file) } + Dir.glob("*").select { |file| File.directory?(file) } end available_strategies.each do |strategy| - require_dependency config.root.join(*base_strategies_path).join(strategy, 'lib', 'initializer') + require_dependency config.root.join(*base_strategies_path).join(strategy, "lib", "initializer") end # Engine Overrides config.engine_sass_config_overrides = [] config.engine_sass_theme_dependencies = [] + config.gobierto_engines_themes = {} base_engines_path = %w(vendor gobierto_engines) available_engines = Dir.chdir(config.root.join(*base_engines_path)) do - Dir.glob('*').select { |item| File.directory?(item) } + Dir.glob("*").select { |item| File.directory?(item) } end available_engines.each do |engine_dir| From ca564e5e14dbe8b62a76290296d91dbc3e099893 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Mon, 3 Dec 2018 18:21:54 +0100 Subject: [PATCH 3/3] Dynamic body class based on engine theme --- app/helpers/application_helper.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f2b7233e39..1967c2429d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -4,6 +4,9 @@ module ApplicationHelper def body_css_classes classes = [] + if current_site&.configuration&.engine_overrides&.any? + classes.push(Rails.configuration.gobierto_engines_themes[current_site.configuration.engine_overrides.first]) + end classes.push current_module == "gobierto_participation" ? "gobierto_participation theme-participation" : current_module classes.push controller_name classes.push action_name