From b42533062ef919ff9742f3d2d28c55a46e60439d Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 19 May 2017 17:32:10 +0200 Subject: [PATCH] Improves styles and i18n for budget results --- app/assets/stylesheets/admin.scss | 5 +++ app/assets/stylesheets/layout.scss | 18 +++++++++ .../budgets/results/_results_table.html.erb | 38 +++++++++---------- app/views/budgets/results/show.html.erb | 36 ++++++------------ app/views/budgets/show.html.erb | 8 ++-- config/locales/budgets.en.yml | 8 ++-- config/locales/budgets.es.yml | 8 ++-- 7 files changed, 61 insertions(+), 60 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index e864d9781..fd6ed0815 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -312,6 +312,11 @@ body.admin { } } +[class^="icon-"].delete { + border: 0; + font-size: $base-font-size; +} + .verified { color: $check; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 64684505c..fa0fd3455 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -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 // ---------- diff --git a/app/views/budgets/results/_results_table.html.erb b/app/views/budgets/results/_results_table.html.erb index cb3407f9c..9024899b6 100644 --- a/app/views/budgets/results/_results_table.html.erb +++ b/app/views/budgets/results/_results_table.html.erb @@ -1,31 +1,28 @@ -
-

+
+

<%= heading.name %> -

+

- - <%= link_to t("budgets.results.show_all_link"), "#", - class: "js-toggle-link button hollow margin-bottom", - data: {'toggle-selector' => '.js-discarded', - 'toggle-text' => t("budgets.results.hide_discarded_link")} %> - + <%= link_to t("budgets.results.show_all_link"), "#", + class: "js-toggle-link button hollow margin-bottom float-right", + data: {'toggle-selector' => '.js-discarded', + 'toggle-text' => t("budgets.results.hide_discarded_link")} %> - +
- - - @@ -48,7 +45,7 @@ <% else %> - + <%= t("budgets.results.discarded") %> @@ -57,10 +54,10 @@ <%= link_to investment.title, budget_investment_path(@budget, investment) %> - -
<%= t("budgets.results.spending_proposal") %> + <%= t("budgets.results.ballot_lines_count") %> + <%= t("budgets.results.price") %> " - style="width:120px"> - <%= format_price(heading.price) %> + + <%= format_price(heading.price) %>
+ <%= t("budgets.results.amount_available") %>
+ <%= investment.ballot_lines_count %> + <%= format_price investment.price %>
- -
\ No newline at end of file + diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb index dd83aebfb..d9253b785 100644 --- a/app/views/budgets/results/show.html.erb +++ b/app/views/budgets/results/show.html.erb @@ -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 %> -
+
- <%= link_to budgets_path, class: "left back" do %> - - <%= t("shared.back") %> - <% end %> + <%= back_link_to budget_path(@budget) %> -

+

+ <%= @budget.name %>
<%= t("budgets.results.heading") %> -

+
-
-
    -
  • - - <%= t("shared.you_are_in") %> - - <%= link_to t("budgets.results.results_link"), "#", class: "is-active" %> -
    • -
-
-
- -
-
-
    +
    +
    • <%= t("budgets.results.geozone_selection_title") %> @@ -39,7 +27,7 @@ <% @budget.headings.each do |heading| %>
    • - <%= link_to content_tag(:strong, heading.name), + <%= link_to heading.name, budget_results_path(@budget, heading_id: heading.id) %>
      • <% end %> diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb index fb56c04c3..814488d9d 100644 --- a/app/views/budgets/show.html.erb +++ b/app/views/budgets/show.html.erb @@ -37,11 +37,9 @@ <% end %> <% if @budget.finished? %> -
      - <%= link_to "Results", - budget_results_path(@budget, - heading_id: @budget.headings.first) %> -
      + <%= link_to t("budgets.show.see_results"), + budget_results_path(@budget, heading_id: @budget.headings.first), + class: "button margin-top expanded" %> <% end %>
diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index eb786c66e..570f9da35 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -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: " \ No newline at end of file diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml index 1ba37b110..a8e7fa5fa 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -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: "