-
<%= t('admin.budgets.show.groups') %>
- <% if groups.blank? %>
-
- <%= t("admin.budgets.form.no_groups") %>
- <%= link_to t("admin.budgets.form.add_group"), "#",
- class: "js-toggle-link",
- data: { "toggle-selector" => "#new-group-form" } %>
-
- <% else %>
- <%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %>
- <% end %>
+
<%= t('admin.budgets.show.groups') %>
+<% if groups.blank? %>
+
+ <%= t("admin.budgets.form.no_groups") %>
+ <%= link_to t("admin.budgets.form.add_group"), "#",
+ class: "js-toggle-link",
+ data: { "toggle-selector" => "#new-group-form" } %>
+
+<% else %>
+ <%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %>
+<% end %>
- <%= form_for [:admin, @budget, Budget::Group.new], html: {id: "new-group-form", style: "display:none"}, remote: true do |f| %>
-
\ No newline at end of file
+<% groups.each do |group| %>
+
+ <%= render "admin/budgets/group", group: group, headings: group.headings %>
+
+<% end %>
diff --git a/app/views/admin/budgets/edit.html.erb b/app/views/admin/budgets/edit.html.erb
index 6fd1e3e1f..34672bf7a 100644
--- a/app/views/admin/budgets/edit.html.erb
+++ b/app/views/admin/budgets/edit.html.erb
@@ -1,3 +1,8 @@
+<%= link_to admin_budgets_path do %>
+
+ <%= t('shared.back') %>
+<% end %>
+
<%= t("admin.budgets.edit.title") %>
diff --git a/app/views/admin/budgets/index.html.erb b/app/views/admin/budgets/index.html.erb
index d4de771db..7bf4b0659 100644
--- a/app/views/admin/budgets/index.html.erb
+++ b/app/views/admin/budgets/index.html.erb
@@ -6,23 +6,39 @@
<%= render 'shared/filter_subnav', i18n_namespace: "admin.budgets.index" %>
-
<%= page_entries_info @budgets %>
- <% @budgets.each do |budget| %>
-
- |
- <%= link_to budget.name, admin_budget_budget_investments_path(budget_id: budget.id) %>
- |
-
- <%= t("budget.phase.#{budget.phase}") %>
- |
-
- <%= link_to t("admin.budgets.index.info_link"), admin_budget_path(budget) %>
- |
+
+
+ | <%= t("admin.budgets.index.table_name") %> |
+ <%= t("admin.budgets.index.table_phase") %> |
+ <%= t("admin.budgets.index.table_investments") %> |
+ <%= t("admin.budgets.index.table_edit_groups") %> |
+ <%= t("admin.budgets.index.table_edit_budget") %> |
- <% end %>
+
+
+ <% @budgets.each do |budget| %>
+
+ |
+ <%= budget.name %>
+ |
+
+ <%= t("budget.phase.#{budget.phase}") %>
+ |
+
+ <%= link_to t("admin.budgets.index.budget_investments"), admin_budget_budget_investments_path(budget_id: budget.id) %>
+ |
+
+ <%= link_to t("admin.budgets.index.edit_groups"), admin_budget_path(budget) %>
+ |
+
+ <%= link_to t("admin.budgets.index.edit_budget"), edit_admin_budget_path(budget) %>
+ |
+
+ <% end %>
+
<%= paginate @budgets %>
\ No newline at end of file
diff --git a/app/views/admin/budgets/show.html.erb b/app/views/admin/budgets/show.html.erb
index 4468f7599..1f3292019 100644
--- a/app/views/admin/budgets/show.html.erb
+++ b/app/views/admin/budgets/show.html.erb
@@ -1,16 +1,10 @@
-
-
-
<%= @budget.name %> <%= link_to(t('shared.edit'), edit_admin_budget_path(@budget)) %>
+<%= link_to admin_budgets_path do %>
+
+ <%= t('shared.back') %>
+<% end %>
- <%= @budget.description %>
+
<%= @budget.name %>
-
- <%= t('admin.budgets.show.phase') %>: <%= t("budget.phase.#{@budget.phase}") %> |
- <%= t('admin.budgets.show.currency') %>: <%= @budget.currency_symbol %>
-
-
-
-
-
+
<%= render "groups", groups: @budget.groups %>
diff --git a/app/views/valuation/budget_investments/edit.html.erb b/app/views/valuation/budget_investments/edit.html.erb
index e03d850a4..16dc3b59d 100644
--- a/app/views/valuation/budget_investments/edit.html.erb
+++ b/app/views/valuation/budget_investments/edit.html.erb
@@ -1,4 +1,8 @@
-<%= link_to "#{t('valuation.budget_investments.show.title')} #{@investment.id}", valuation_budget_budget_investment_path(@budget, @investment), class: 'back' %>
+<%= link_to valuation_budget_budget_investment_path(@budget, @investment), class: 'back' do %>
+
+ <%= "#{t('valuation.budget_investments.show.title')} #{@investment.id}"%>
+<% end %>
+
<%= t("valuation.budget_investments.edit.dossier") %>
<%= form_for(@investment, url: valuate_valuation_budget_budget_investment_path(@budget, @investment), html: {id: "valuation_budget_investment_edit_form"}) do |f| %>
diff --git a/app/views/valuation/budget_investments/index.html.erb b/app/views/valuation/budget_investments/index.html.erb
index 9b82f7f5a..b44a129aa 100644
--- a/app/views/valuation/budget_investments/index.html.erb
+++ b/app/views/valuation/budget_investments/index.html.erb
@@ -1,4 +1,7 @@
-
<%= @budget.name %> - <%= t("valuation.budget_investments.index.title") %>
+
+ <%= @budget.name %> - <%= t("valuation.budget_investments.index.title") %>
+ (Asignadas a EVALUADOR)
+
<% @heading_filters.each_slice(8) do |slice| %>
@@ -18,25 +21,34 @@
<%= page_entries_info @investments %>
- <% @investments.each do |investment| %>
-
- |
- <%= investment.id %>
- |
-
- <%= link_to investment.title, valuation_budget_budget_investment_path(@budget, investment) %>
- |
-
- <%= link_to t("valuation.budget_investments.index.edit"), edit_valuation_budget_budget_investment_path(@budget, investment) %>
- |
-
- <%= assigned_valuators_info(investment.valuators) %>
- |
-
- <%= investment.heading.name %>
- |
+
+
+ | <%= t("valuation.budget_investments.index.table_id") %> |
+ <%= t("valuation.budget_investments.index.table_title") %> |
+ <%= t("valuation.budget_investments.index.table_heading_name") %> |
+ <%= t("valuation.budget_investments.index.table_actions") %> |
- <% end %>
+
+
+ <% @investments.each do |investment| %>
+
+ |
+ <%= investment.id %>
+ |
+
+ <%= link_to investment.title, valuation_budget_budget_investment_path(@budget, investment) %>
+ |
+
+ <%= investment.heading.name %>
+ |
+
+ <%= link_to t("valuation.budget_investments.index.edit"),
+ edit_valuation_budget_budget_investment_path(@budget, investment),
+ class: "button hollow expanded" %>
+ |
+
+ <% end %>
+
<%= paginate @investments %>
diff --git a/app/views/valuation/budget_investments/show.html.erb b/app/views/valuation/budget_investments/show.html.erb
index 602c53dda..f0eaed2c8 100644
--- a/app/views/valuation/budget_investments/show.html.erb
+++ b/app/views/valuation/budget_investments/show.html.erb
@@ -1,4 +1,7 @@
-<%= render "shared/back_link" %>
+<%= link_to valuation_budget_budget_investments_path do %>
+
+ <%= t('shared.back') %>
+<% end %>
<%= t("valuation.budget_investments.show.title") %> <%= @investment.id %>
<%= @investment.title %>
diff --git a/app/views/valuation/budgets/index.html.erb b/app/views/valuation/budgets/index.html.erb
index 47571688f..4f2b7ffa6 100644
--- a/app/views/valuation/budgets/index.html.erb
+++ b/app/views/valuation/budgets/index.html.erb
@@ -3,13 +3,34 @@
<%= page_entries_info @budgets %>
- <% @budgets.each do |budget| %>
-
- |
- <%= link_to budget.name, valuation_budget_budget_investments_path(budget_id: budget.id) %>
- |
+
+
+ | <%= t("valuation.budgets.index.table_name") %> |
+ <%= t("valuation.budgets.index.table_phase") %> |
+ <%= t("valuation.budgets.index.table_assigned_headings") %> |
+ <%= t("valuation.budgets.index.table_actions") %> |
- <% end %>
+
+
+ <% @budgets.each do |budget| %>
+
+ |
+ <%= budget.name %>
+ |
+
+ <%= t("budget.phase.#{budget.phase}") %>
+ |
+
+ 3 partidas
+ |
+
+ <%= link_to t("valuation.budgets.index.evaluate"),
+ valuation_budget_budget_investments_path(budget_id: budget.id),
+ class: "button hollow expanded" %>
+ |
+
+ <% end %>
+
<%= paginate @budgets %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 222d11c78..4aec846cb 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -62,10 +62,17 @@ en:
index:
title: Participatory budgets
new_link: Create new budget
- info_link: Info
filters:
- open: Open
+ current: Open
finished: Finished
+ budget_investments: See budget investments
+ table_name: Name
+ table_phase: Phase
+ table_investments: Investments
+ table_edit_groups: Headings groups
+ table_edit_budget: Edit
+ edit_groups: Edit headings groups
+ edit_budget: Edit budget
create:
notice: New participatory budget created successfully!
update:
@@ -75,8 +82,6 @@ en:
new:
title: New participatory budget
show:
- phase: Current phase
- currency: Currency
groups: Groups of budget headings
form:
group: Group name
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index d8c9036a8..f79f76a17 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -62,10 +62,17 @@ es:
index:
title: Presupuestos participativos
new_link: Crear nuevo presupuesto
- info_link: Info
filters:
- open: Abiertos
+ current: Abiertos
finished: Terminados
+ budget_investments: Ver propuestas de inversión
+ table_name: Nombre
+ table_phase: Fase
+ table_investments: Propuestas de inversión
+ table_edit_groups: Grupos de partidas
+ table_edit_budget: Editar
+ edit_groups: Editar grupos de partidas
+ edit_budget: Editar presupuesto
create:
notice: ¡Nueva campaña de presupuestos participativos creada con éxito!
update:
@@ -75,8 +82,6 @@ es:
new:
title: Nuevo presupuesto ciudadano
show:
- phase: Fase actual
- currency: Divisa
groups: Grupos de partidas presupuestarias
form:
group: Nombre del grupo
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 83988ab85..adfec0e84 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -441,7 +441,6 @@ en:
collective: Collective
flag: Flag as inappropriate
hide: Hide
- edit: Editar
print:
print_button: Print this info
search: Search
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8fd9b2c37..06a68286b 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -445,7 +445,6 @@ es:
print_button: Imprimir esta información
search: Buscar
show: Mostrar
- edit: Editar
suggest:
debate:
found:
diff --git a/config/locales/valuation.en.yml b/config/locales/valuation.en.yml
index a5195deca..4aafe160b 100644
--- a/config/locales/valuation.en.yml
+++ b/config/locales/valuation.en.yml
@@ -9,8 +9,13 @@ en:
index:
title: Participatory budgets
filters:
- open: Open
+ current: Open
finished: Finished
+ table_name: Name
+ table_phase: Phase
+ table_assigned_headings: Assigned headings
+ table_actions: Actions
+ evaluate: Evaluate
budget_investments:
index:
headings_filter_all: All headings
@@ -19,11 +24,15 @@ en:
valuating: Under valuation
valuation_finished: Valuation finished
title: Investment projects
- edit: Edit
+ edit: Edit dossier
valuators_assigned:
one: Assigned valuator
other: "%{count} valuators assigned"
no_valuators_assigned: No valuators assigned
+ table_id: ID
+ table_title: Title
+ table_heading_name: Heading name
+ table_actions: Actions
show:
back: Back
title: Investment project
diff --git a/config/locales/valuation.es.yml b/config/locales/valuation.es.yml
index 67302437b..641f9c003 100644
--- a/config/locales/valuation.es.yml
+++ b/config/locales/valuation.es.yml
@@ -9,8 +9,13 @@ es:
index:
title: Presupuestos participativos
filters:
- open: Abiertos
+ current: Abiertos
finished: Terminados
+ table_name: Nombre
+ table_phase: Fase
+ table_assigned_headings: Partidas asignadas
+ table_actions: Acciones
+ evaluate: Evaluar
budget_investments:
index:
headings_filter_all: Todas las partidas
@@ -19,11 +24,15 @@ es:
valuating: En evaluación
valuation_finished: Evaluación finalizada
title: Propuestas de inversión
- edit: Editar
+ edit: Editar informe
valuators_assigned:
one: Evaluador asignado
other: "%{count} evaluadores asignados"
no_valuators_assigned: Sin evaluador
+ table_id: ID
+ table_title: Título
+ table_heading_name: Nombre de la partida
+ table_actions: Acciones
show:
back: Volver
title: Propuesta de inversión