diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 7eb3433f5..ee9217777 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -894,6 +894,11 @@ .info { background: #6A2A72; + p { + margin-bottom: 0; + text-transform: uppercase; + } + @include breakpoint(medium) { border-top: rem-calc(6) solid #54225C; } diff --git a/app/views/budgets/groups/show.html.erb b/app/views/budgets/groups/show.html.erb index 0f368cd4f..73fb3288f 100644 --- a/app/views/budgets/groups/show.html.erb +++ b/app/views/budgets/groups/show.html.erb @@ -7,11 +7,13 @@ -
- <% if params[:unfeasible] %> - Propuestas inviables - <% end %> -
+<% if params[:unfeasible] %> +
+
+

<%= t("budgets.groups.show.unfeasible_title") %>

+
+
+<% end %>
@@ -39,7 +41,9 @@ <% if params[:unfeasible].blank? %>
- <%= link_to t("budgets.investments.index.sidebar.unfeasible"), - budget_path(@budget, unfeasible: 1) %> +
+ <%= link_to t("budgets.groups.show.unfeasible"), + budget_path(@budget, unfeasible: 1) %> +
-<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index b3bcf03fe..50a2866f9 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -17,14 +17,15 @@
<% if params[:unfeasible].present? %> -

<%= t("budgets.investments.index.unfeasible") %>

-

+

<%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %>

+
<%= t("budgets.investments.index.unfeasible_text", definitions: link_to(t("budgets.investments.index.unfeasible_text_definitions"), "https://decide.madrid.es/participatory_budget_info#20")).html_safe %> -

+
+ <% else %> + <%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %> <% end %> - <%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %> <% if params[:search].present? %>

<%= page_entries_info @investments %> diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb index 28cc29d44..958dd2b30 100644 --- a/app/views/budgets/show.html.erb +++ b/app/views/budgets/show.html.erb @@ -1,5 +1,5 @@
-
+
<%= back_link_to budgets_path %> @@ -10,9 +10,8 @@

<%= t('budgets.show.phase') %> -
- <%= t("budgets.phase.#{@budget.phase}") %>

+

<%= t("budgets.phase.#{@budget.phase}") %>

<% if @budget.accepting? %> <% if current_user %> @@ -38,12 +37,12 @@
+ <% if params[:unfeasible] %> +

<%= t("budgets.show.unfeasible_title") %>

+ <% end %> - <% if params[:unfeasible] %> - Propuestas inviables - <% end %> <% @budget.groups.each do |group| %> @@ -71,7 +70,9 @@ <% unless params[:unfeasible] %>
- <%= link_to t("budgets.investments.index.sidebar.unfeasible"), - budget_path(@budget, unfeasible: 1) %> +
+ <%= link_to t("budgets.show.unfeasible"), + budget_path(@budget, unfeasible: 1) %> +
-<% end %> \ No newline at end of file +<% end %> diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index 9b57f6b22..5e4861a16 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -22,6 +22,8 @@ en: groups: show: title: Select an option + unfeasible_title: Unfeasible investments + unfeasible: See unfeasible investments phase: accepting: Accepting proposals reviewing: Reviewing proposals @@ -103,3 +105,5 @@ en: show: group: Group phase: Actual phase + unfeasible_title: Unfeasible investments + unfeasible: See unfeasible investments \ No newline at end of file diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml index 93c7a15aa..08a33bde8 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -22,6 +22,8 @@ es: groups: show: title: Selecciona una opción + unfeasible_title: Propuestas inviables + unfeasible: Ver propuestas inviables phase: accepting: Aceptando propuestas reviewing: Revisando propuestas @@ -103,3 +105,5 @@ es: show: group: Grupo phase: Fase actual + unfeasible_title: Propuestas inviables + unfeasible: Ver las propuestas inviables
<%= t('budgets.show.group') %>