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

Improves styles and i18n for budget results

Browse Source
This commit is contained in:
decabeza
2017-05-19 17:32:10 +02:00
parent 0b68f3c619
commit b42533062e
7 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/admin.scss
View File

@@ -312,6 +312,11 @@ body.admin {
}
}
[class^="icon-"].delete {
border: 0;
font-size: $base-font-size;
}
.verified {
color: $check;

18
app/assets/stylesheets/layout.scss
View File

@@ -234,6 +234,14 @@ a {
color: $brand;
}
}
&.no-margin-top {
margin-top: 0;
}
&.no-padding-top {
padding-top: 0;
}
}
.small {
@@ -1194,6 +1202,16 @@ table {
}
}
.table-for-mobile {
@include breakpoint(medium down) {
th, td {
display: block;
text-align: left;
}
}
}
// 12. Social
// ----------

30
app/views/budgets/results/_results_table.html.erb
View File

@@ -1,31 +1,28 @@
<div class="small-12 medium-10 column" id="results-container">
<h2 class="inline-block">
<div class="small-12 medium-9 column" id="results-container">
<h3 class="inline-block">
<%= heading.name %>
</h2>
</h3>
<span class="float-right">
<%= link_to t("budgets.results.show_all_link"), "#",
class: "js-toggle-link button hollow margin-bottom",
class: "js-toggle-link button hollow margin-bottom float-right",
data: {'toggle-selector' => '.js-discarded',
'toggle-text' => t("budgets.results.hide_discarded_link")} %>
</span>
<table id="budget-investments-results">
<table id="budget-investments-results" class="table-for-mobile">
<thead>
<tr>
<th scope="col">
<%= t("budgets.results.spending_proposal") %>
</th>
<th scope="col" class="text-right">
<th scope="col" class="text-center">
<%= t("budgets.results.ballot_lines_count") %>
</th>
<th scope="col" class="text-right">
<th scope="col" class="text-center">
<%= t("budgets.results.price") %>
</th>
<th scope="col" class="text-right"
title="<%= t("budgets.results.amount_available") %>"
style="width:120px">
<%= format_price(heading.price) %>
<th scope="col" class="text-right">
<%= format_price(heading.price) %><br>
<small><%= t("budgets.results.amount_available") %></small>
</th>
</tr>
</thead>
@@ -48,7 +45,7 @@
</span>
</span>
<% else %>
<span class="icon-x">
<span class="icon-x delete">
<span class="sr-only">
<%= t("budgets.results.discarded") %>
</span>
@@ -57,10 +54,10 @@
<%= link_to investment.title,
budget_investment_path(@budget, investment) %>
</td>
<td class="text-right">
<td class="text-center">
<%= investment.ballot_lines_count %>
</td>
<td class="text-right" style="width:100px">
<td class="text-center">
<%= format_price investment.price %>
</td>
<td class="small text-right"
@@ -72,5 +69,4 @@
<% end %>
</tbody>
</table>
</div>

36
app/views/budgets/results/show.html.erb
View File

@@ -1,36 +1,24 @@
<% provide :title, t("budgets.results.page_title") %>
<% provide :title, t("budgets.results.page_title", budget: @budget.name) %>
<% content_for :canonical do %>
<%= render "shared/canonical", href: budget_results_url(@budget, heading_id: @result.heading) %>
<% end %>
<div class="expanded spending-proposals results no-margin-top">
<div class="expanded budget no-margin-top">
<div class="row">
<div class="small-12 column padding text-center">
<%= link_to budgets_path, class: "left back" do %>
<i class="icon-angle-left"></i>
<%= t("shared.back") %>
<% end %>
<%= back_link_to budget_path(@budget) %>
<h1 class="title">
<h2 class="title">
<%= @budget.name %><br>
<%= t("budgets.results.heading") %>
</h1>
</h2>
</div>
</div>
</div>
<div class="row margin-top">
<div class="small-12 column">
<ul class="tabs">
<li class="tabs-title is-active">
<span class="sr-only">
<%= t("shared.you_are_in") %>
</span>
<%= link_to t("budgets.results.results_link"), "#", class: "is-active" %>
</li>
</ul>
</div>
</div>
<div class="row">
<div class="small-12 medium-2 column">
<ul class="menu vertical no-padding">
<div class="small-12 medium-3 column">
<ul class="menu vertical no-margin-top no-padding-top">
<li>
<strong>
<%= t("budgets.results.geozone_selection_title") %>
@@ -39,7 +27,7 @@
<% @budget.headings.each do |heading| %>
<li>
<%= link_to content_tag(:strong, heading.name),
<%= link_to heading.name,
budget_results_path(@budget, heading_id: heading.id) %>
</li>
<% end %>

8
app/views/budgets/show.html.erb
View File

@@ -37,11 +37,9 @@
<% end %>
<% if @budget.finished? %>
<div>
<%= link_to "Results",
budget_results_path(@budget,
heading_id: @budget.headings.first) %>
</div>
<%= link_to t("budgets.show.see_results"),
budget_results_path(@budget, heading_id: @budget.headings.first),
class: "button margin-top expanded" %>
<% end %>
</div>
</div>

8
config/locales/budgets.en.yml
View File

@@ -115,11 +115,10 @@ en:
unfeasible: See unfeasible investments
unselected_title: Investments not selected for balloting phase
unselected: See investments not selected for balloting phase
see_results: See results
results:
page_title: "Participatory budget | Results"
heading: "PARTICIPATORY BUDGET"
results_link: Results
stats_link: "Participation stats"
page_title: "%{budget} - Results"
heading: "Participatory budget results"
geozone_selection_title: "By district"
spending_proposal: Proposal title
ballot_lines_count: Times selected
@@ -127,6 +126,5 @@ en:
show_all_link: Show all
price: Cost
amount_available: Available budget
incompatible: Incompatibles
accepted: "Accepted spending proposal: "
discarded: "Discarded spending proposal: "

8
config/locales/budgets.es.yml
View File

@@ -115,11 +115,10 @@ es:
unfeasible: Ver las propuestas inviables
unselected_title: Propuestas no seleccionadas para la votación final
unselected: Ver las propuestas no seleccionadas para la votación final
see_results: Ver resultados
results:
page_title: "Presupuestos participativos | Resultados"
heading: "PRESUPUESTOS PARTICIPATIVOS"
results_link: Resultados
stats_link: "Estadísticas de participación"
page_title: "%{budget} - Resultados"
heading: "Resultados presupuestos participativos"
geozone_selection_title: "Ámbito de actuación"
spending_proposal: Título
ballot_lines_count: Votos
@@ -127,6 +126,5 @@ es:
show_all_link: Mostrar todas
price: Coste
amount_available: Presupuesto disponible
incompatible: Incompatibles
accepted: "Propuesta de inversión aceptada: "
discarded: "Propuesta de inversión descartada: "