From 4e7e1410e9d7b383cdef8fe375704bfe39cd5e36 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 29 Aug 2017 18:46:10 +0200 Subject: [PATCH] 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 "