From 4e7e1410e9d7b383cdef8fe375704bfe39cd5e36 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 29 Aug 2017 18:46:10 +0200 Subject: [PATCH 1/8] includes help header and footer on debates and proposals --- app/assets/images/help/help_icon_debates.png | Bin 0 -> 2676 bytes .../images/help/help_icon_proposals.png | Bin 0 -> 3579 bytes app/assets/stylesheets/layout.scss | 4 +++ app/assets/stylesheets/participation.scss | 14 ++++++++++ app/views/debates/index.html.erb | 19 ++++++++++++-- app/views/proposals/index.html.erb | 16 ++++++++++-- app/views/shared/_section_header.html.erb | 10 ++++++++ config/locales/en/general.yml | 24 ++++++++++++++++-- config/locales/es/general.yml | 24 ++++++++++++++++-- 9 files changed, 103 insertions(+), 8 deletions(-) create mode 100644 app/assets/images/help/help_icon_debates.png create mode 100644 app/assets/images/help/help_icon_proposals.png create mode 100644 app/views/shared/_section_header.html.erb diff --git a/app/assets/images/help/help_icon_debates.png b/app/assets/images/help/help_icon_debates.png new file mode 100644 index 0000000000000000000000000000000000000000..a1cb51247252768a50cf5e3e3ca03b31e5452454 GIT binary patch literal 2676 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 Iox%?O2VVM&YXATM literal 0 HcmV?d00001 diff --git a/app/assets/images/help/help_icon_proposals.png b/app/assets/images/help/help_icon_proposals.png new file mode 100644 index 0000000000000000000000000000000000000000..51b826b02a4e7360a62546160ea5c0ed0cf7fae3 GIT binary patch literal 3579 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index c2f872526..7f6f44001 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -318,6 +318,10 @@ a { background: $brand; } +.align-top { + vertical-align: top; +} + // 02. Header // ---------- diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index be5cb4a7c..bf2646583 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -875,6 +875,20 @@ } } +.help-link { + margin-left: $line-height; + position: relative; + + &::before { + color: $link; + content: '\4e'; + font-family: 'icons'; + position: absolute; + left: -24px; + top: -2px; + } +} + // 05. Featured // ------------ diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index b6356ffb2..28a5a69bd 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -9,8 +9,6 @@ <% end %>
-

<%= t("shared.outline.debates") %>

- <% if @search_terms || @advanced_search_terms || @tag_filter %>
@@ -33,6 +31,8 @@
+ <% else %> + <%= render "shared/section_header", i18n_namespace: "debates.index.section_header", image: "debates" %> <% end %>
@@ -56,6 +56,21 @@ <%= render @debates %> <%= paginate @debates %> + + <% unless @search_terms || @advanced_search_terms || @tag_filter %> +
+

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

+

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

+

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

+

<%= t("debates.index.section_footer.help_text_3", + proposal: link_to(t("debates.index.section_footer.proposals_link"), proposals_path), + budget: link_to(t("debates.index.section_footer.budget_link"), budgets_path)).html_safe %> +

+
+ <% end %>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 40cce19c1..072d88ccb 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -9,8 +9,6 @@ <% end %>
-

<%= t("shared.outline.proposals") %>

- <% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %>
@@ -35,6 +33,8 @@
+ <% else %> + <%= render "shared/section_header", i18n_namespace: "proposals.index.section_header", image: "proposals" %> <% end %>
@@ -70,6 +70,18 @@
<%= render partial: 'proposals/proposal', collection: @proposals %> <%= paginate @proposals %> + + <% unless @search_terms || @advanced_search_terms || @tag_filter %> +
+

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

+

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

+

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

+

<%= t("proposals.index.section_footer.help_text_3") %>

+
+ <% end %>
diff --git a/app/views/shared/_section_header.html.erb b/app/views/shared/_section_header.html.erb new file mode 100644 index 000000000..8336cd3f4 --- /dev/null +++ b/app/views/shared/_section_header.html.erb @@ -0,0 +1,10 @@ +
+
+
+ <%= image_tag "help/help_icon_#{image}.png", alt: t("#{i18n_namespace}.icon_alt"), class: "align-top" %> +

<%= t("#{i18n_namespace}.title") %>

+

<%= t("#{i18n_namespace}.description") %>

+ <%= link_to t("#{i18n_namespace}.help"), "#section_help", class: "help-link" %> +
+
+
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index b0067fb7f..3f71910bb 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -118,6 +118,18 @@ en: select_order: Order by start_debate: Start a debate title: Debates + section_header: + icon_alt: Debates icon + title: Debates + description: Start a debate to share points of view with others about the topics you are concerned about. + help: Help about debates + section_footer: + title: Help about debates + help_text_1: "The space for citizen debates is aimed at anyone who can expose issues that concern them and those who want to share points of view with other people." + help_text_2: 'To open a debate you need to sign up on %{org}. Users can also comment on open debates and rate them with the "I agree" or "I disagree" buttons found in each of them.' + help_text_3: "Keep in mind that a debate does not start any specific action. If you want to make a %{proposal} for the city or raise a investment project of %{budget} when the phase is open, go to the corresponding section." + proposals_link: proposal + budget_link: participatory budgeting new: form: submit_button: Start a debate @@ -351,6 +363,16 @@ en: title: Proposals top: Top weekly top_link_proposals: The most supported proposals by category + section_header: + icon_alt: Proposals icon + title: Proposals + description: Make a citizen proposal. If get the enough supports and go to vote, you can get all the citizen decide how they want it to be our city. + help: Help about proposals + section_footer: + title: Help about proposals + help_text_1: "The citizen proposals are an opportunity to neighbours and collective decide directly how the want it to be their city. Any person can make a proposal about a topic of their interest or concern for the City Council make it, after get the enough supports and to be put to a citizen vote." + help_text_2: "To create a proposal, you must sign up on %{org}. The proposals that get the support of 1% of the users in the web, goes to vote. To support proposals it is necessary to have a verified account." + help_text_3: "A citizen vote is celebrated when the proposals get the necessary supports. Once celebrated, if there are more people in favor than against, the City Council assumes the proposal and carries it out." new: form: submit_button: Create proposal @@ -556,8 +578,6 @@ en: unfollow: "Unfollow" unfollow_entity: "Unfollow %{entity}" outline: - debates: Debates - proposals: Proposals budget: Participatory budget searcher: Searcher go_to_page: "Go to page of " diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 313e24e8a..d98ece009 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -118,6 +118,18 @@ es: select_order: Ordenar por start_debate: Empieza un debate title: Debates + section_header: + icon_alt: Icono de Debates + title: Debates + description: Inicia un debate para compartir puntos de vista con otras personas sobre los temas que te preocupan. + help: Ayuda sobre los debates + section_footer: + title: Ayuda sobre los debates + help_text_1: "El espacio de debates ciudadanos está dirigido a que cualquier persona pueda exponer temas que le preocupan y sobre los que quiera compartir puntos de vista con otras personas." + help_text_2: 'Para abrir un debate es necesario registrarse en %{org}. Los usuarios ya registrados también pueden comentar los debates abiertos y valorarlos con los botones de "Estoy de acuerdo" o "No estoy de acuerdo" que se encuentran en cada uno de ellos.' + help_text_3: "Ten en cuenta que un debate no activa ningún mecanismo de actuación concreto. Si quieres hacer una %{proposal} para la ciudad o plantear un proyecto de %{budget} cuando se abra la convocatoria, ve a la sección correspondiente." + proposals_link: propuesta + budget_link: presupuestos participativos new: form: submit_button: Empieza un debate @@ -351,6 +363,16 @@ es: title: Propuestas ciudadanas top: Top semanal top_link_proposals: Propuestas más apoyadas por categoría + section_header: + icon_alt: Icono de Propuestas + title: Propuestas + description: Haz una propuesta ciudadana. Si obtiene los apoyos suficientes y pasa a votación, puedes conseguir que todos los habitantes decidan cómo quieren que sea nuestra ciudad. + help: Ayuda sobre las propuestas + section_footer: + title: Ayuda sobre las propuestas + help_text_1: "Las propuestas ciudadanas son una oportunidad para que los vecinos y colectivos decidan directamente cómo quieren que sea su ciudad. Cualquier persona puede hacer una propuesta sobre un tema que le interese o preocupe para que el ayuntamiento la lleve a cabo, después de conseguir los apoyos suficientes y de someterse a votación ciudadana." + help_text_2: "Para crear una propuesta hay que registrarse en %{org}. Las propuestas que consigan el apoyo del 1% de la gente en la web, pasan a votación. Para apoyar propuestas es necesario tener una cuenta verificada." + help_text_3: "Se convoca una votación ciudadana cuando las propuestas consiguen los apoyos necesarios. Una vez celebrada, si hay más gente a favor que en contra, el Consistorio asume la propuesta y la lleva a cabo." new: form: submit_button: Crear propuesta @@ -556,8 +578,6 @@ es: unfollow: Dejar de seguir unfollow_entity: "Dejar de seguir %{entity}" outline: - debates: Debates - proposals: Propuestas budget: Presupuestos participativos searcher: Buscador go_to_page: "Ir a la página de " From c15b78b8023787f0aa91c52a60c5e23b7c7b9766 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 30 Aug 2017 17:53:02 +0200 Subject: [PATCH 2/8] adds i18n ignore for section_header keys --- config/i18n-tasks.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index ee992ca2b..cc289ba3c 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -114,6 +114,7 @@ ignore_missing: ignore_unused: - 'budgets.phase.*' - 'budgets.investments.index.orders.*' + - 'budgets.index.section_header.*' - 'activerecord.*' - 'activemodel.*' - 'unauthorized.*' @@ -148,16 +149,20 @@ ignore_unused: - 'valuation.budget_investments.index.filter*' - 'users.show.filters.*' - 'polls.index.filters.*' + - 'polls.index.section_header.*' - 'debates.index.select_order' - 'debates.index.orders.*' + - 'debates.index.section_header.*' - 'proposals.index.select_order' - 'proposals.index.orders.*' + - 'proposals.index.section_header.*' - 'spending_proposals.index.search_form.*' - '*.index.search_form.*' - 'notifications.index.comments_on*' - 'notifications.index.replies_to*' - 'notifications.index.proposal_notification*' - 'legislation.processes.index.filter*' + - 'legislation.processes.index.section_header.*' - 'helpers.page_entries_info.*' # kaminari - 'views.pagination.*' # kaminari - 'shared.suggest.*' From e24e9df4a532bc5bddb95fb6b8da1b37a366c2e6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 30 Aug 2017 18:10:59 +0200 Subject: [PATCH 3/8] adds section header on polls, make filter styles consistent --- app/assets/stylesheets/participation.scss | 8 ++------ app/views/polls/index.html.erb | 25 ++++++++++++----------- app/views/polls/show.html.erb | 1 - config/locales/en/general.yml | 9 ++++++++ config/locales/es/general.yml | 9 ++++++++ 5 files changed, 33 insertions(+), 19 deletions(-) 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." From 7a1a18b9624e1666ac666ec7a163bfac4b8a929d Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 30 Aug 2017 18:11:29 +0200 Subject: [PATCH 4/8] improves icons for help sections --- app/assets/images/help/help_icon_debates.png | Bin 2676 -> 2637 bytes app/assets/images/help/help_icon_polls.png | Bin 0 -> 2586 bytes .../images/help/help_icon_proposals.png | Bin 3579 -> 3533 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/help/help_icon_polls.png diff --git a/app/assets/images/help/help_icon_debates.png b/app/assets/images/help/help_icon_debates.png index a1cb51247252768a50cf5e3e3ca03b31e5452454..c8d59e4c181c31d53ee3c6bf306d4cdbf5fc2c3d 100644 GIT binary patch delta 1913 zcmV-<2Zs3c6wMSNiBL{Q4GJ0x0000DNk~Le0000o0000y2nGNE03tR{P@v(_3G7sZrir)_xSkuZd(hDEiEm%4<0=D0aV4q!^7<~-PhMgA3l7DW<~ol zkRNRVdG+d5(3B}th^^tCzW=XWFJHb4v$xLZ>FGIu3wI@tU%q@1Fw>?@>$eMk*d5); z79c(SPD&v5T+kid)9^I_;GaW7LpC$p;Najl2W0#j5bxf-6JdRPe8}J5UoxDkJ8$2< zm0a)T(^6hX(=Tp zCepyb01XchyN^YbRw3xFUAriMKR=(i-pF&NG~#A&-n=1`$wX()oS`{$=1_QeI9JcQ54$PmGx>6Daz6ngylF@ert ze$Spgv~=lGdh+B6rKP3Oty{NHea*rkF~H5B5bS{%dj9;mxFz<6;JC;088c?cwY`Mm zkVW7g>(;HKxVSjEKX>k&Ji|+&!H9?m+OlPf%$+}fo|>AP$lKdnVoGTp*Rb5~-Mi`1 zrAt&%Q9+wGZ>ghP5(#S!rVz}ADcZH_bR0TA=&&mZ-7 z;|2mP;YF7(UzR|BwH)u?zo(v_9?4Qj0G0!S<2kerP%!uD)2Ag)tOwQ>7Z($|<%s8~ zLkM_BV&p$SAOI@#-Me=wGc(g{8JrItIz$~E9r8kCG+Zmea&mI0s;bKDlGp>v;I2+m z^Zonx<@v*h4<)-{eR!v4a4(o;h=- z%-_3rkCKyJn{2z*)0qNesbi0Q&m%YpSfQ6kwF3SuRWzY+-FlNr~)*G(X--KPG8}fR=8jUVt-V0f+S*1_T8UD=aLe zsHiBp&(6+9?=7GZ)F)4#qzxN3$a=5_xZ9#diyWdWW0q0NTs@vS#0@mQV8H@O$LZ{~m0pU_0D#jqBEt(EX;jrbNZUbbj zK4T&~N&Rz>4#ZVJI8%7q%H3a^(_Qr$NHuAQC6?1}JR5nDHwu<@Z=k3O=z^{G6E9J8 z-BnVJfyq3TNpOTrd=Qq3_gy9(6XWt5DLK9v|cJkFsHsW9z1w3Gchso7`~vO zt8;{Uk6Epmwm@mhmB&@tAuM_i#g#ydRII4L<4*A>ZmRM?{2XmfUHZvX35*^D!hwcl zGu7^au;}UlBr-BGgL{ZP^zZKU2UMeVCW4EhZ^kuDyK2>{yw=v%P;PZ&Qc_ZWW!EZ1 zYm45&orZ`0A9Okp9f%G@2ciSfflMMG{|GPuGf(k6iCcZ>00000NkvXXu0mjfC=iz- delta 1900 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 AFaQ7m literal 0 HcmV?d00001 diff --git a/app/assets/images/help/help_icon_proposals.png b/app/assets/images/help/help_icon_proposals.png index 51b826b02a4e7360a62546160ea5c0ed0cf7fae3..05861d042f3b6dae4a1ca69a1060966cdc0ec7db 100644 GIT binary patch delta 2823 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 delta 2853 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 DVkBx8 From ff66909cd58e438a06208b8cabf0a581b7292dbc Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 31 Aug 2017 13:50:40 +0200 Subject: [PATCH 5/8] includes help sections to legislation processes --- .../help/help_icon_legislation_processes.png | Bin 0 -> 2047 bytes .../legislation/processes/index.html.erb | 19 ++++++++++++++---- config/locales/en/legislation.yml | 10 +++++++++ config/locales/es/legislation.yml | 10 +++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 app/assets/images/help/help_icon_legislation_processes.png diff --git a/app/assets/images/help/help_icon_legislation_processes.png b/app/assets/images/help/help_icon_legislation_processes.png new file mode 100644 index 0000000000000000000000000000000000000000..9dd93ad8c3410430e1b0cd7bbe2a7d3f0969461f GIT binary patch literal 2047 zcmaJ?dsGu=77rE?A*rk-1QBF92*_iSOdcc?iINavqVf=ErIux#Bm>D}9wvi97Co4Q zvaYl%i`o^7D6mv00go)`p@0Phc_~Om!L^)H)D=W%58zr6+=+}Apis66)OVQ|r;M6x) zK|rGtf;+j9%t%8xrq;+Zj96SoRJ<}HRf(v;&6|MGbOB*Ni{U7cuHB;I#^#Dg+lvB}B#m;d&zmaOokC5@z!O9zut?2%p6X23Sluguz4@Fb8770wyA0 z!oZscB)l0_$%0sk^o=j#Bm~tsZV)gSX0w@YX4Cb?6b6hS2!qLDuvieG0h#vea5Np# znS7QkNHCMqs4?Igy$-NhL>2lpTnG|O7emk*A|u}#)|uWUibxqF9W^juI+LN*+Twbx zZNg)*UunEk+Z4awfH7h*lRnL;BGajE7P=?4wp-W zAaO%iX;cC(4`D@!!`Xa}ln28RJduba7KI?;oCs++%;rj#Y`hDL@Wt#9v6RUV;Yw{- zu|&i|_ym?CfkO~3a|tWgnQ&C6#FqSO2)~Qi2r^v#r4K`y?)P92gIoLxZb4J z8-Va|Tg7?6hDcPY(b& zgA^<-6JjAOj2)unag_)PzQL=0lfA_*B_u>7h9yD*j32_{@%UUwiLn$A4D(P3!FU*i zv0(+wMo|@4$paY#MTV_$e$z-xBBDEO+qYvu9NrEVrX!}wNQ{jaKYt5}WdDI&B8pGH zH&L){+u9wj*P|7yBP&bgE>L!zjACc4?`T==baM5v^~=YkF|>%yVWP(?F07?JE#5|} zzaZ<2HROr+!m*#pnnBQUQ*j-rUDj0Geq6o1ccq->mc}ya+q)9obN%u+Uj0kbD^qm= zE}-yG^~e!2RkD1CDBguC$vZziH(%G>+{{aG_oh;*oeM4Tf&VJ6taJ?w3{1K^FmR|% zaj3jJVDSF^(*LoFV0ZGlfj^JT%(zBHMP)r2P;-7T@V_1XIV>(NZUL|W4WA|^W|rT5 za=MZ%oS2-{*)ujk(DFoJ>du`z(94Beo{qF*JvVL$p@0B8w>uq&Txm4_pDgq92L^|S z4>C7yoNFp8^TRkEoAanwu5}CzeNxcVrR@9h+}gI4It+W*Ix;fi{IT=1RgPlA&d*#| zxjUED*4E}F1V0+Ji@R8PlA;r~1_-=20B6DlM($ElU zIfXiu$VBV^DFIQ+VX^n<&(D=^%)fo~EV$?C?CdO@z4yDRS5`@9%OI1x!lm8!IxA6h z;b2TzF_?bqa2lEE`)SM{Guw)yWlge*iBM9^snW3zySuyPW!V$^=28-$IzORORsYVl zn;kUus706mQyA-+UAen<*KATX?aL^CPfyQW|NPFqg;8c|rh}vJjoFKizswI04~O60 zm3;f-9hP#dm72!TG<9}%KCu%AdB2}C^*))LIW{qo`AtpD2fiA{vn0IQz3JttsfL0V zFJ5@xQqP>dKVv@lU>V{q+N#sk47E5rJDaa0WWW4kU0^j;oHadmVqxDJcgU})=)t31 z_M(NLos&vyR(EjG@<@{%vT4(isw(>9$;q3c*|!@N869B&>A-;lS@Ns{IUCyVuJ!OZ zS5dL`nTr0!u|ItsRMy>E;ha#)s(v^z+}qo0dhZV>Yd1){y1G-0VEzN3f2yzGPPj2+`A=3VX1pBU=zUuLyhFI{q@{KNa;)uOs% zPOB`IRRw3xH2-(H^K9-uubiBmUuHrS_di^HlzE!Wb^l3F)6ft4<*$4(H-~0q2zJ#0ZPs&X2DnJ7Cp*Z4T9i(jA`!T~56Trpjvr^LKwWYS)#B(DEv3larHK zTgb6<#-Xvxjg4Lcfj|{4E&TD?HG7(iHQ}yepf||RBcPj1q1^JbOoUPG?W*o&|KK3j zU97KnYHV!04dvt+2#eEjU!RaFbVD@(1`rvvTn4%ChQ3@os2yu|YS`@z9MA9;8At1rtf7l6RO fIu&1g?(;3lzvjV;(U?}6?UyW%h>}!^cU%4sr)@4V literal 0 HcmV?d00001 diff --git a/app/views/legislation/processes/index.html.erb b/app/views/legislation/processes/index.html.erb index b9afd5f59..063e4048f 100644 --- a/app/views/legislation/processes/index.html.erb +++ b/app/views/legislation/processes/index.html.erb @@ -2,12 +2,13 @@ <%= t("layouts.header.collaborative_legislation") %> - <%= t("legislation.processes.index.filters.#{@current_filter}") %> <% end %> -
-
- <%= render 'shared/filter_subnav', i18n_namespace: "legislation.processes.index" %> -
+<%= render "shared/section_header", i18n_namespace: "legislation.processes.index.section_header", image: "legislation_processes" %> +
+ + <%= render 'shared/filter_subnav', i18n_namespace: "legislation.processes.index" %> +
<% if @processes.any? %> <%= render @processes %> @@ -17,6 +18,16 @@ <%= t(".no_#{@current_filter}_processes") %>
<% end %> + +
+

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

+

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

+

<%= t("legislation.processes.index.section_footer.help_text_2", + org: setting['org_name']) %>

+

<%= t("legislation.processes.index.section_footer.help_text_3") %>

+
diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 793341bac..85f0b444d 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -64,6 +64,16 @@ en: no_open_processes: There aren't open processes no_next_processes: There aren't planned processes no_past_processes: There aren't past processes + section_header: + icon_alt: Legislation processes icon + title: Legislation processes + description: Participates in the debates and processes prior to the approval of a ordinance or a municipal action. Your opinion will be consider by the City Council. + help: Help about legislation processes + section_footer: + title: Help about legislation processes + help_text_1: "In participatory processes, the City Council offers to citizens the opportunity to participate in the drafting and modification of regulations affecting the city and to give its opinion on certain actions that it plans to carry out." + help_text_2: "People registered in %{org} can participate with contributions in the public consultation of new ordinances, regulations and guidelines, among others. Your comments are analyzed by the corresponding area and considered for the final drafting of the ordinances." + help_text_3: "The City Council also opens processes to receive contributions and opinions on municipal actions." phase_not_open: not_open: This phase is not open yet phase_empty: diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index 59ed9b64c..c8cca657e 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -64,6 +64,16 @@ es: no_open_processes: No hay procesos activos no_next_processes: No hay procesos planeados no_past_processes: No hay procesos terminados + section_header: + icon_alt: Icono de Procesos legislativos + title: Procesos legislativos + description: Participa en los debates y procesos previos a la aprobación de una norma o de una actuación municipal. Tu opinión será tenida en cuenta por el Ayuntamiento. + help: Ayuda sobre procesos legislativos + section_footer: + title: Ayuda sobre procesos legislativos + help_text_1: "En los procesos participativos, el Ayuntamiento ofrece a la ciudadanía la oportunidad de participar en la elaboración y modificación de normativa que afecta a la ciudad y de dar su opinión sobre ciertas actuaciones que tiene previsto llevar a cabo." + help_text_2: "Las personas registradas en %{org} pueden participar con aportaciones en la consulta pública de nuevas ordenanzas, reglamentos y directrices, entre otros. Sus comentarios son analizados por el área correspondiente y tenidos en cuenta de cara a la redacción final de las normas." + help_text_3: "El Ayuntamiento también abre procesos para recibir aportaciones y opiniones sobre actuaciones municipales." phase_not_open: not_open: Esta fase del proceso todavía no está abierta phase_empty: From 6e58a321fe3b552e575e7ccef7a219c3872f89c7 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 31 Aug 2017 14:01:37 +0200 Subject: [PATCH 6/8] includes help sections to budgets --- app/assets/images/help/help_icon_budgets.png | Bin 0 -> 3129 bytes app/views/budgets/index.html.erb | 20 ++++++++++++------- config/locales/en/budgets.yml | 11 ++++++++++ config/locales/es/budgets.yml | 11 ++++++++++ 4 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 app/assets/images/help/help_icon_budgets.png diff --git a/app/assets/images/help/help_icon_budgets.png b/app/assets/images/help/help_icon_budgets.png new file mode 100644 index 0000000000000000000000000000000000000000..f8a909d7e64900c8071ccbf0cf37ac4a5f6571c9 GIT binary patch literal 3129 zcmaJ@c|26>8y{nhWUH7IV=QqsW;aVDW9(UC5_4N-JD8XmX2#w^Bw4awZAzA#QlV7n z+Lh{(HQX#WOOh02?<&7hxxf3z{oM0@&UxSSoag&I-}hPG&pG4jY^x~0MIHnKDcajn z+{80le4EM1h@X16w{_wPBC_@rx%0h6Aq)WkvSjm_0Mwq#@B!Qa20JY9DPRTyNuK0T zJw={Qdq^xk*MzaEV-m^@5TnJ$EJ6bqEI&X5Wdc4No;hslVGRt*VVlGDb*xA{%D03u+ch5*y$GA_g>+>(3LCLd{{{?2^RmRWSkv{iY)FGlzXA z<>}-Kwc-l^D9*$b&O%`bP(0BDg(DKs*d0(b5@m`&5)mjY9ElVRu#o;NG<}7I4KN&3ZE6k1$ZKRiaAXD z#e~galW=$<+L~;IAz*FrD3mqc(h^IyG$mSLt!=DO7#wBI#=l{S1Tw~yY=b43;%rv2 zWQrx4NDyPO6qG3uhg`$j^MoP>j|Hsx<%s?Mz+(OrOR^FG3=v;I<@5d5D!|p3FX9V* z`2kQXtJRF-p@vQj7KgVgG+Is4_dQbp0Vfz>+X(nv=(i}7IRC-|3lNY577+<25-~V9 z7J~xdOf(J&M-$Ni#*~G}v4{-V4?O!H(feMdVu^Ss0c(Uv0KpWE#}jaH7Jz2LQ7AkE zP6Y4(9KfKMC=7$a#;CLb9g~g* zI~pb}^nws9oPo00S zBCKw1dD+`5H$Ok0D?2$kDP?PG+aABHX}TD*z~yqU96ud7@$TK1z=Gi=#KgqJ{M)(D z@M(&dt!-10G+AMugO!bG>T=97NqRKJ(lQIp(ZYD|F{!`ljhs%C1$hc5x~?}WsGBsl zT)@36N=Zq9g9d=T&<>eb5-soh9*h(f73KX*qs_*>w|BX0rc%{5FaQVH;h5##U4?tC zE~INUEMzOl%XgsO)Q^vkznGrpCV&{@wZp{&l|g=zWZ2cx(m*u6rG(jw%qNg`?p%sc z$1l2doe9HkNeWo{^g86#kS;W`{B7s8!>)7ZVuAsa3g4a*DKY5Bjru%{G%gnw+}u% z8@**N&HB(BG%3%p*erZ@JOZmXlbm1gxY^Fnuc$WR$@$tG@y zDruROZ+cdHO2(V2k&t*z^;BV$$Gu~J%~$30&}r;)S;ch@^U~)=!)C?`BvU@JPg9hC ztE#d-7CoGCbbj)W!cFwi4%IU)D!SnE!(8F1w74G zIfCR`@^zmF&t0ZZCgvC0mBBGcuvH%c6yoa~+W z)^jM;-)O9t{Ij?Bn2zWozw?6s-l6l_X=!QQYH>#N&*UQK&2r^SM{6YU1?D3enVFdi zb@(iuQ@7LUcR=3JM)XB9*m(I4;x231zMGg?xBS8vyX~$|>mj9%LIni{ zO~T5JeMM5`MG6Cqk@FazT_x2#mAD4jt)cr1AfMrV-{y+?N^A{U|~^1E;(29;K9N`Mn(pO;^=b1 zBYoxxrb^BNv(#prue%|PT6SK|Gydrln*(Yf=jb{bC+NPK*+a77F`E$we#&7(&!lZ} zQLvgb$;m4kY7YX*1*fSm7$t{UELIjQUs1~7V83L~wj;0iD+O1|RzE*k;E<4z(5bWV zrVTR|Zu?S?Mz^xFd-7)d;PK(umKWg@>T`o_4E@4og;G~l)c~=T5h;_;=;DFJ-)8S* z%z=p|nwJ+hlparAG0cgf?^Dv3DmfGEiBM}!bEnZhn@}f7T^C)Koy_V-ZS_pZp&=&q<^J literal 0 HcmV?d00001 diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 9f5ab0ab2..494568706 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -1,14 +1,9 @@ +<% provide :title do %><%= t('budgets.index.title') %><% end %> <% content_for :canonical do %> <%= render "shared/canonical", href: budgets_url %> <% end %> -
-
-
-

<%= t('budgets.index.title') %>

-
-
-
+<%= render "shared/section_header", i18n_namespace: "budgets.index.section_header", image: "budgets" %>
@@ -32,5 +27,16 @@ <% end %> + +
+

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

+

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

+

<%= t("budgets.index.section_footer.help_text_2") %>

+

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

+

<%= t("budgets.index.section_footer.help_text_4") %>

+
diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index a6b9fbc19..59406499f 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -38,6 +38,17 @@ en: finished: Finished budget index: title: Participatory budgets + section_header: + icon_alt: Participatory budgets icon + title: Participatory budgets + description: With the participatory budgets the citizens decide to which projects presented by the neighbors is destined a part of the municipal budget. + help: Help about participatory budgets + section_footer: + title: Help about participatory budgets + help_text_1: "Participatory budgets are processes in which citizens decide directly on what is spent part of the municipal budget. Any registered person over 16 years old can propose an investment project that is preselected in a phase of citizen supports." + help_text_2: "The most voted projects are evaluated and passed to a final vote in which they decide the actions to be carried out by the City Council once the municipal budgets of the next year are approved." + help_text_3: "The presentation of participatory budgeting projects takes place from January and over a period of one and a half months. To participate and propose proposals for the entire city and / or districts, you must sign up on %{org} and verify your account." + help_text_4: "To get as many supports and votes as possible, choose a descriptive and understandable headline for your project. Then you have a space to develop the approach of your proposal. Provide all the data and explanations, and even documents and images, to help other participants to better understand what you are proposing." investments: form: tag_category_label: "Categories" diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 6d80f0a51..cc6b27e2f 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -38,6 +38,17 @@ es: finished: Resultados index: title: Presupuestos participativos + section_header: + icon_alt: Icono de Presupuestos participativos + title: Presupuestos participativos + description: Con los presupuestos participativos la ciudadanía decide a qué proyectos presentados por los vecinos y vecinas va destinada una parte del presupuesto municipal. + help: Ayuda sobre presupuestos participativos + section_footer: + title: Ayuda sobre presupuestos participativos + help_text_1: "Los presupuestos participativos son unos procesos en los que la ciudadanía decide de forma directa en qué se gasta una parte del presupuesto municipal. Cualquier persona empadronada mayor de 16 años puede proponer un proyecto de gasto que se preselecciona en una fase de apoyos ciudadanos." + help_text_2: "Los proyectos más votados se evalúan y pasan a una votación final en la que se deciden las actuaciones que llevará a cabo el Ayuntamiento una vez se aprueben los presupuestos municipales del año próximo." + help_text_3: "La presentación de proyectos de presupuestos participativos se lleva a cabo desde enero y a lo largo de un periodo de mes y medio, aproximadamente. Para participar y plantear propuestas para toda la ciudad y/ los distritos hay que registrarse en %{org} y verificar la cuenta." + help_text_4: "Para conseguir el mayor número de apoyos y votos posible, elige un titular descriptivo y comprensible de tu proyecto. Después tienes un espacio para desarrollar el planteamiento de tu propuesta. Aporta todos los datos y explicaciones, e incluso documentos e imágenes, para ayudar a otras personas participantes a entender mejor lo que planteas." investments: form: tags_instructions: "Etiqueta esta propuesta. Puedes elegir entre las categorías propuestas o introducir las que desees" From 79a461fa86071ee2089f74c67dc60c5aead61e43 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 31 Aug 2017 17:43:03 +0200 Subject: [PATCH 7/8] simplifies css classes on section header partial --- app/views/shared/_section_header.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_section_header.html.erb b/app/views/shared/_section_header.html.erb index 8336cd3f4..29688b487 100644 --- a/app/views/shared/_section_header.html.erb +++ b/app/views/shared/_section_header.html.erb @@ -1,4 +1,4 @@ -
+
<%= image_tag "help/help_icon_#{image}.png", alt: t("#{i18n_namespace}.icon_alt"), class: "align-top" %> From 9665548f7715a01afe455feb4bf1d2728e4ffe07 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 1 Sep 2017 13:52:39 +0200 Subject: [PATCH 8/8] Small corrections on english translations for help texts --- config/locales/en/general.yml | 12 ++++++------ config/locales/en/legislation.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 8d895e886..7af6d31ec 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -121,11 +121,11 @@ en: section_header: icon_alt: Debates icon title: Debates - description: Start a debate to share points of view with others about the topics you are concerned about. + description: Start a debate to share opinions with others about the topics you are concerned about. help: Help about debates section_footer: title: Help about debates - help_text_1: "The space for citizen debates is aimed at anyone who can expose issues that concern them and those who want to share points of view with other people." + help_text_1: "The space for citizen debates is aimed at anyone who can expose issues of their concern and those who want to share opinions with other people." help_text_2: 'To open a debate you need to sign up on %{org}. Users can also comment on open debates and rate them with the "I agree" or "I disagree" buttons found in each of them.' help_text_3: "Keep in mind that a debate does not start any specific action. If you want to make a %{proposal} for the city or raise a investment project of %{budget} when the phase is open, go to the corresponding section." proposals_link: proposal @@ -366,12 +366,12 @@ en: section_header: icon_alt: Proposals icon title: Proposals - description: Make a citizen proposal. If get the enough supports and go to vote, you can get all the citizen decide how they want it to be our city. + description: Make a citizen proposal. If it gets enough supports it will go to voting phase, so you can get all the citizens to decide how they want their city to be. help: Help about proposals section_footer: title: Help about proposals - help_text_1: "The citizen proposals are an opportunity to neighbours and collective decide directly how the want it to be their city. Any person can make a proposal about a topic of their interest or concern for the City Council make it, after get the enough supports and to be put to a citizen vote." - help_text_2: "To create a proposal, you must sign up on %{org}. The proposals that get the support of 1% of the users in the web, goes to vote. To support proposals it is necessary to have a verified account." + help_text_1: "The citizen proposals are an opportunity for neighbours and collectives to decide directly how they want to shape their city. Any person can make a proposal about a topic or concern of their interest, for the City Council to make it, after it gets enough supports to be put to a citizens vote." + help_text_2: "To create a proposal, you must sign up on %{org}. The proposals that get the support of 1% of the users in the web, goes to voting phase. To support proposals it is necessary to have a verified account." help_text_3: "A citizen vote is celebrated when the proposals get the necessary supports. Once celebrated, if there are more people in favor than against, the City Council assumes the proposal and carries it out." new: form: @@ -462,7 +462,7 @@ en: 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_1: "Voting takes place when a citizen proposal supports reaches 1% of the census 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" diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 85f0b444d..4c5350e8b 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -67,11 +67,11 @@ en: section_header: icon_alt: Legislation processes icon title: Legislation processes - description: Participates in the debates and processes prior to the approval of a ordinance or a municipal action. Your opinion will be consider by the City Council. + description: Participate in the debates and processes prior to the approval of a ordinance or a municipal action. Your opinion will be consider by the City Council. help: Help about legislation processes section_footer: title: Help about legislation processes - help_text_1: "In participatory processes, the City Council offers to citizens the opportunity to participate in the drafting and modification of regulations affecting the city and to give its opinion on certain actions that it plans to carry out." + help_text_1: "In participatory processes, the City Council offers to its citizens the opportunity to participate in the drafting and modification of regulations, affecting the city and to be able to give their opinion on certain actions that it plans to carry out." help_text_2: "People registered in %{org} can participate with contributions in the public consultation of new ordinances, regulations and guidelines, among others. Your comments are analyzed by the corresponding area and considered for the final drafting of the ordinances." help_text_3: "The City Council also opens processes to receive contributions and opinions on municipal actions." phase_not_open: