diff --git a/app/controllers/admin/site_customization/content_blocks_controller.rb b/app/controllers/admin/site_customization/content_blocks_controller.rb index 417291d51..eb6076dbe 100644 --- a/app/controllers/admin/site_customization/content_blocks_controller.rb +++ b/app/controllers/admin/site_customization/content_blocks_controller.rb @@ -9,6 +9,8 @@ class Admin::SiteCustomization::ContentBlocksController < Admin::SiteCustomizati def index @content_blocks = SiteCustomization::ContentBlock.order(:name, :locale) @headings_content_blocks = Budget::ContentBlock.all + all_settings = Setting.all.group_by { |setting| setting.type } + @html_settings = all_settings["html"] end def create diff --git a/app/views/admin/site_customization/content_blocks/index.html.erb b/app/views/admin/site_customization/content_blocks/index.html.erb index 26579fd4c..1172e7f8b 100644 --- a/app/views/admin/site_customization/content_blocks/index.html.erb +++ b/app/views/admin/site_customization/content_blocks/index.html.erb @@ -6,6 +6,8 @@

<%= t("admin.site_customization.content_blocks.index.title") %>

+<%= render "admin/settings/settings_table", settings: @html_settings %> +

<%= t("admin.site_customization.content_blocks.information") %>

<%= t("admin.site_customization.content_blocks.about") %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 84d8f6860..0166b2d0f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,10 +14,10 @@ type: "image/png" %> <%= content_for :social_media_meta_tags %> - <%= setting["per_page_code_head"].try(:html_safe) %> + <%= setting["html.per_page_code_head"].try(:html_safe) %> - <%= setting["per_page_code_body"].try(:html_safe) %> + <%= setting["html.per_page_code_body"].try(:html_safe) %>

<%= setting["org_name"] %>

diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index 976261f53..368625e18 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -3,9 +3,11 @@ <%= render "layouts/common_head", default_title: "Gobierno abierto" %> <%= render "layouts/meta_tags" %> + <%= setting["html.per_page_code_head"].try(:html_safe) %> + <%= setting["html.per_page_code_body"].try(:html_safe) %>

diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml index b039d547b..21dd46f23 100644 --- a/config/locales/en/settings.yml +++ b/config/locales/en/settings.yml @@ -28,10 +28,6 @@ en: months_to_archive_proposals_description: "After this number of months the Proposals will be archived and will no longer be able to receive supports" email_domain_for_officials: "Email domain for public officials" email_domain_for_officials_description: "All users registered with this domain will have their account verified at registration" - per_page_code_head: "Code to be included on every page ()" - per_page_code_head_description: "This code will appear inside the label. Useful for entering custom scripts, analytics..." - per_page_code_body: "Code to be included on every page ()" - per_page_code_body_description: "This code will appear inside the label. Useful for entering custom scripts, analytics..." twitter_handle: "Twitter handle" twitter_handle_description: "If filled in it will appear in the footer" twitter_hashtag: "Twitter hashtag" @@ -126,3 +122,8 @@ en: budgets_description: "With participatory budgets, citizens decide which projects presented by their neighbours will receive a part of the budget" legislation: "Legislation" legislation_description: "In participatory processes, citizens are offered the opportunity to participate in the drafting and modification of regulations that affect the society and to give their opinion on certain actions that are planned to be carried out" + html: + per_page_code_head: "Code to be included on every page ()" + per_page_code_head_description: "This code will appear inside the label. Useful for entering custom scripts, analytics..." + per_page_code_body: "Code to be included on every page ()" + per_page_code_body_description: "This code will appear inside the label. Useful for entering custom scripts, analytics..." diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml index c33e2f6f7..5f098045f 100644 --- a/config/locales/es/settings.yml +++ b/config/locales/es/settings.yml @@ -28,10 +28,6 @@ es: months_to_archive_proposals_description: "Pasado este número de meses las Propuestas se archivarán y ya no podrán recoger apoyos" email_domain_for_officials: "Dominio de email para cargos públicos" email_domain_for_officials_description: "Todos los usuarios registrados con este dominio tendrán su cuenta verificada al registrarse" - per_page_code_head: "Código a incluir en cada página ()" - per_page_code_head_description: "Esté código aparecerá dentro de la etiqueta . Útil para introducir scripts personalizados, analitycs..." - per_page_code_body: "Código a incluir en cada página ()" - per_page_code_body_description: "Esté código aparecerá dentro de la etiqueta . Útil para introducir scripts personalizados, analitycs..." twitter_handle: "Usuario de Twitter" twitter_handle_description: "Si está rellenado aparecerá en el pie de página" twitter_hashtag: "Hashtag para Twitter" @@ -126,3 +122,8 @@ es: budgets_description: "Con los presupuestos participativos la ciudadanía decide a qué proyectos presentados por los vecinos y vecinas va destinada una parte del presupuesto" legislation: "Legislación" legislation_description: "En los procesos participativos se ofrece a la ciudadanía la oportunidad de participar en la elaboración y modificación de normativa que afecta a la sociedad y de dar su opinión sobre ciertas actuaciones que se tiene previsto llevar a cabo" + html: + per_page_code_head: "Código a incluir en cada página ()" + per_page_code_head_description: "Esté código aparecerá dentro de la etiqueta . Útil para introducir scripts personalizados, analitycs..." + per_page_code_body: "Código a incluir en cada página ()" + per_page_code_body_description: "Esté código aparecerá dentro de la etiqueta . Útil para introducir scripts personalizados, analitycs..." diff --git a/db/dev_seeds/settings.rb b/db/dev_seeds/settings.rb index 6823c2c80..c58bb8164 100644 --- a/db/dev_seeds/settings.rb +++ b/db/dev_seeds/settings.rb @@ -51,8 +51,9 @@ section "Creating Settings" do Setting.create(key: "feature.public_stats", value: "true") Setting.create(key: "feature.help_page", value: "true") - Setting.create(key: "per_page_code_head", value: "") - Setting.create(key: "per_page_code_body", value: "") + Setting.create(key: "html.per_page_code_head", value: "") + Setting.create(key: "html.per_page_code_body", value: "") + Setting.create(key: "comments_body_max_length", value: "1000") Setting.create(key: "mailer_from_name", value: "CONSUL") Setting.create(key: "mailer_from_address", value: "noreply@consul.dev") diff --git a/db/seeds.rb b/db/seeds.rb index 3b012f406..a2942ae35 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -41,10 +41,10 @@ Setting["months_to_archive_proposals"] = 12 Setting["email_domain_for_officials"] = "" # Code to be included at the top (inside ) of every page (useful for tracking) -Setting["per_page_code_head"] = "" +Setting["html.per_page_code_head"] = "" # Code to be included at the top (inside ) of every page -Setting["per_page_code_body"] = "" +Setting["html.per_page_code_body"] = "" # Social settings Setting["twitter_handle"] = nil