From 3c8ec4169fb4db0d5aecb53839d91ac8350aeedc Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 4 Jan 2018 16:55:23 +0100 Subject: [PATCH] improves messages on header --- app/assets/stylesheets/participation.scss | 6 ++++++ app/views/budgets/ballot/_progress_bar.html.erb | 4 ++-- app/views/budgets/investments/_header.html.erb | 5 ++++- config/locales/en/budgets.yml | 4 +++- config/locales/es/budgets.yml | 4 +++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 38eaf7d91..0adc7c81f 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1145,6 +1145,12 @@ color: #fff; } + .tagline { + display: block; + font-size: $small-font-size; + font-weight: normal; + } + .callout.warning { font-size: $base-font-size; diff --git a/app/views/budgets/ballot/_progress_bar.html.erb b/app/views/budgets/ballot/_progress_bar.html.erb index ec9d28457..4c7035b41 100644 --- a/app/views/budgets/ballot/_progress_bar.html.erb +++ b/app/views/budgets/ballot/_progress_bar.html.erb @@ -19,9 +19,9 @@ <%= progress_bar_width(@budget.heading_price(@heading), @ballot.amount_spent(@heading)) %>">

- <%= @ballot.formatted_amount_spent(@heading) %> + <%= t("budgets.progress_bar.assigned") %><%= @ballot.formatted_amount_spent(@heading) %> - <%= t("budgets.progress_bar.available") %> + <%= t("budgets.progress_bar.available") %> <%= @ballot.formatted_amount_available(@heading) %>

diff --git a/app/views/budgets/investments/_header.html.erb b/app/views/budgets/investments/_header.html.erb index 42e133d5a..99f867367 100644 --- a/app/views/budgets/investments/_header.html.erb +++ b/app/views/budgets/investments/_header.html.erb @@ -53,7 +53,10 @@ <% end %> <% else %>

<%= @heading.name %>

-

<%= @budget.formatted_heading_price(@heading) %>

+

+ <%= t("budgets.investments.header.price") %> + <%= @budget.formatted_heading_price(@heading) %> +

<% end %> diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 14c68798c..51a4571f2 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -131,8 +131,10 @@ en: different_heading_assigned_html: "You have active votes in another heading: %{heading_link}" change_ballot: "If your change your mind you can remove your votes in %{check_ballot} and start again." check_ballot_link: "check my ballot" + price: "This heading have a budget of" progress_bar: - available: "Available: " + assigned: "You have assigned: " + available: "Available budget: " show: group: Group phase: Actual phase diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 0f5092368..bfd55f9cc 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -131,8 +131,10 @@ es: different_heading_assigned_html: 'Ya apoyaste propuestas de otra sección del presupuesto: %{heading_link}' change_ballot: "Si cambias de opinión puedes borrar tus votos en %{check_ballot} y volver a empezar." check_ballot_link: "revisar mis votos" + price: "Esta partida tiene un presupuesto de" progress_bar: - available: 'Disponible: ' + assigned: "Has asignado: " + available: "Presupuesto disponible: " show: group: Grupo phase: Fase actual