consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adds section header on polls, make filter styles consistent

Browse Source
This commit is contained in:
decabeza
2017-08-30 18:10:59 +02:00
parent c15b78b802
commit e24e9df4a5
5 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/participation.scss
View File

@@ -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 {

25
app/views/polls/index.html.erb
View File

@@ -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 %>
<div class="expanded no-margin-top dark-heading">
<div class="row">
<div class="small-12 medium-6 column padding">
<h1><%= t("polls.index.title") %></h1>
</div>
</div>
</div>
<%= render "shared/section_header", i18n_namespace: "polls.index.section_header", image: "polls" %>
<div class="row">
<div class="small-12 medium-3 column">
<%= render 'shared/filter_subnav_vertical', i18n_namespace: "polls.index" %>
</div>
<div class="small-12 medium-9 column">
<%= render 'shared/filter_subnav', i18n_namespace: "polls.index" %>
<div class="small-12 medium-9 column margin-top">
<% polls_by_geozone_restriction = @polls.group_by(&:geozone_restricted) %>
<% if polls_by_geozone_restriction[false].present? %>
@@ -31,5 +22,15 @@
<% end %>
<%= paginate @polls %>
<div id="section_help" class="margin" data-magellan-target="section_help">
<p class="lead">
<strong><%= t("polls.index.section_footer.title") %></strong>
</p>
<p><%= t("polls.index.section_footer.help_text_1") %></p>
<p><%= t("polls.index.section_footer.help_text_2",
org: link_to(setting['org_name'], new_user_registration_path)).html_safe %></p>
</p>
</div>
</div>
</div>

1
app/views/polls/show.html.erb
View File

@@ -1,5 +1,4 @@
<% provide :title do %><%= @poll.name %><% end %>
<% content_for :wrapper_class, "light" %>
<div class="polls-show">
<div class="expanded no-margin-top dark-heading polls-show-header">

9
config/locales/en/general.yml
View File

@@ -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."

9
config/locales/es/general.yml
View File

@@ -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."