From ff66909cd58e438a06208b8cabf0a581b7292dbc Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 31 Aug 2017 13:50:40 +0200 Subject: [PATCH] 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: