diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index bf2646583..38a9fb2f8 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1495,13 +1495,9 @@ .poll, .poll-question { - background: #fff; - border-radius: rem-calc(6); + border: 1px solid $border; margin-bottom: $line-height / 2; -} - -.poll { - padding: $line-height; + padding: $line-height / 2; position: relative; .icon-poll-answer { diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb index 71cd2492a..55cdae8e2 100644 --- a/app/views/polls/index.html.erb +++ b/app/views/polls/index.html.erb @@ -1,23 +1,14 @@ <% provide :title do %><%= t("polls.index.title") %><% end %> -<% content_for :wrapper_class, "light" %> <% content_for :canonical do %> <%= render "shared/canonical", href: polls_url %> <% end %> -
-
-
-

<%= t("polls.index.title") %>

-
-
-
+<%= render "shared/section_header", i18n_namespace: "polls.index.section_header", image: "polls" %>
-
- <%= render 'shared/filter_subnav_vertical', i18n_namespace: "polls.index" %> -
+
+ <%= render 'shared/filter_subnav', i18n_namespace: "polls.index" %> -
<% polls_by_geozone_restriction = @polls.group_by(&:geozone_restricted) %> <% if polls_by_geozone_restriction[false].present? %> @@ -31,5 +22,15 @@ <% end %> <%= paginate @polls %> + +
+

+ <%= t("polls.index.section_footer.title") %> +

+

<%= t("polls.index.section_footer.help_text_1") %>

+

<%= t("polls.index.section_footer.help_text_2", + org: link_to(setting['org_name'], new_user_registration_path)).html_safe %>

+

+
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 27c241d6f..02ab70525 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -1,5 +1,4 @@ <% provide :title do %><%= @poll.name %><% end %> -<% content_for :wrapper_class, "light" %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 3f71910bb..8d895e886 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -455,6 +455,15 @@ en: cant_answer_not_logged_in: "You must sign in or sign up to participate" cant_answer_verify: "You must verify your account in order to answer" already_answer: "You already have participated in this poll" + section_header: + icon_alt: Voting icon + title: Voting + description: Sign up to vote on citizen proposals and questions the City Council ask to the neighbors. Make municipal decisions directly. + help: Help about voting + section_footer: + title: Help about voting + help_text_1: "Voting takes place when a citizen proposal reaches 1% of census supports with voting rights. Voting can also include questions that the City Council ask to the citizens decision." + help_text_2: "To participate in the next vote you have to sign up on %{org} and verify your account. All registered voters in the city over 16 years old can vote. The results of all votes are binding on the government." show: dates_title: "Participation dates" cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate." diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index d98ece009..e280ad254 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -455,6 +455,15 @@ es: cant_answer_not_logged_in: "Necesitas iniciar sesión o registrarte para participar" cant_answer_verify: "Por favor verifica tu cuenta para poder responder" already_answer: "Ya has participado en esta votación" + section_header: + icon_alt: Icono de Votaciones + title: Votaciones + description: Regístrate para poder votar propuestas ciudadanas y las cuestiones que pregunta a sus vecinos el Ayuntamiento. Toma decisiones municipales de forma directa. + help: Ayuda sobre las votaciones + section_footer: + title: Ayuda sobre las votaciones + help_text_1: "Las votaciones se convocan cuando una propuesta ciudadana alcanza el 1% de apoyos del censo con derecho a voto. En las votaciones también se pueden incluir cuestiones que el Ayuntamiento somete a decisión directa de la ciudadanía." + help_text_2: "Para participar en la próxima votación tienes que registrarte en %{org} y verificar tu cuenta. Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años. Los resultados de todas las votaciones serán vinculantes para el gobierno." show: dates_title: "Fechas de participación" cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."