diff --git a/.env-example b/.env-example index 3efc530ff4..b0f82e43b0 100644 --- a/.env-example +++ b/.env-example @@ -49,6 +49,10 @@ GEOCODER_UNITS=km # Units for geocoder results (e.g., km or m # Delay until deleted authorization's versions are deleted after the authorization creation (in days, default: 30) # DECIDIM_CLEANER_DELETE_DELETED_AUTHORIZATIONS_DATA= +# Custom color for the newsletter banner (hex value, e.g. #FFFFFF for white) +# If not set, the default Decidim color will be used +# DECIDIM_CUSTOM_NEWSLETTER_BAR_COLOR= + #= Decidim AI # DECIDIM_AI_ENABLED="true" Default: true # DECIDIM_AI_USER_SPAM_ANALYZER_ENABLED="true" Default: true diff --git a/app/cells/decidim/data_consent/category.erb b/app/cells/decidim/data_consent/category.erb new file mode 100644 index 0000000000..bfa6c81fd0 --- /dev/null +++ b/app/cells/decidim/data_consent/category.erb @@ -0,0 +1,68 @@ +
+
+ + +
+ + <%= category[:title] %> + + + + <%= icon "arrow-down-s-line", class: "cookies__category-trigger-arrow" %> + <%= icon "arrow-up-s-line", class: "cookies__category-trigger-arrow" %> + +
+ +
+ + +
diff --git a/app/cells/decidim/newsletter_templates/basic_only_text/show.erb b/app/cells/decidim/newsletter_templates/basic_only_text/show.erb index 795431d9b7..641f3ad610 100644 --- a/app/cells/decidim/newsletter_templates/basic_only_text/show.erb +++ b/app/cells/decidim/newsletter_templates/basic_only_text/show.erb @@ -1,3 +1,11 @@ +<% if Decidim::Env.new("DECIDIM_CUSTOM_NEWSLETTER_BAR_COLOR").present? %> + +<% end %> +
diff --git a/app/cells/decidim/newsletter_templates/image_text_cta/show.erb b/app/cells/decidim/newsletter_templates/image_text_cta/show.erb index dc5709d6bd..6be54fc69d 100644 --- a/app/cells/decidim/newsletter_templates/image_text_cta/show.erb +++ b/app/cells/decidim/newsletter_templates/image_text_cta/show.erb @@ -6,6 +6,14 @@ <% end %> +<% if Decidim::Env.new("DECIDIM_CUSTOM_NEWSLETTER_BAR_COLOR").present? %> + +<% end %> +
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index f4ac20b868..401fdb61a6 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -108,6 +108,7 @@ ignore_missing: - decidim.accessibility.logo - decidim.errors.not_found.back_home - layouts.decidim.announcements.* + - layouts.decidim.data_consent.* - decidim.budgets.budget_information_modal.more_information - decidim.budgets.projects.budget_summary.vote - decidim.budgets.projects.budget_summary.cancel_order