diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 4f6d1f7a4..0771f0ee1 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -332,7 +332,7 @@ body.admin { } } -.account-info, .login-as { +.account-info, .login-as, .info { background-color: #e7e7e7; border-radius: rem-calc(3); font-size: rem-calc(16); @@ -344,3 +344,8 @@ body.admin { font-size: rem-calc(18); } } + +.info p { + margin-bottom: 0; +} + diff --git a/app/views/admin/spending_proposals/_written_by_author.html.erb b/app/views/admin/spending_proposals/_written_by_author.html.erb index dec203ca9..a8eb9e758 100644 --- a/app/views/admin/spending_proposals/_written_by_author.html.erb +++ b/app/views/admin/spending_proposals/_written_by_author.html.erb @@ -1,22 +1,26 @@ -

<%= t "admin.spending_proposals.show.heading", id: @spending_proposal.id %>

-

<%= @spending_proposal.title %>

+
+ <%= t "admin.spending_proposals.show.heading", id: @spending_proposal.id %> +
-
-
+
+

<%= @spending_proposal.title %>

+ +
+

<%= t("admin.spending_proposals.show.geozone") %>: <%= geozone_name(@spending_proposal) %>

-
+

<%= t("admin.spending_proposals.show.by") %>: <%= link_to @spending_proposal.author.name, admin_user_path(@spending_proposal.author) %>

-
+

<%= t("admin.spending_proposals.show.sent") %>: <%= l @spending_proposal.created_at, format: :datetime %> @@ -32,7 +36,7 @@ <% end %> <% if @spending_proposal.external_url.present? %> -

<%= text_with_links @spending_proposal.external_url %>

+

<%= text_with_links @spending_proposal.external_url %> 

<% end %> <%= safe_html_with_links @spending_proposal.description %> diff --git a/app/views/admin/spending_proposals/index.html.erb b/app/views/admin/spending_proposals/index.html.erb index b40c63ab4..83903cc2e 100644 --- a/app/views/admin/spending_proposals/index.html.erb +++ b/app/views/admin/spending_proposals/index.html.erb @@ -1,27 +1,27 @@

<%= t("admin.spending_proposals.index.title") %>

-
+
<%= form_tag admin_spending_proposals_path, method: :get, enforce_utf8: false do %> -
- <%= select_tag :tag_name, - options_for_select(spending_proposal_tags_select_options, params[:tag_name]), - { prompt: t("admin.spending_proposals.index.tags_filter_all"), - label: false, - class: "js-submit-on-change" } %> +
+ <%= select_tag :administrator_id, + options_for_select(admin_select_options, params[:administrator_id]), + { prompt: t("admin.spending_proposals.index.administrator_filter_all"), + label: false, + class: "js-submit-on-change" } %>
-
+
<%= select_tag :geozone_id, options_for_select(geozone_select_options.unshift([t("geozones.none"), "all"]), params[:geozone_id]), { prompt: t("admin.spending_proposals.index.geozone_filter_all"), label: false, class: "js-submit-on-change" } %>
-
- <%= select_tag :administrator_id, - options_for_select(admin_select_options, params[:administrator_id]), - { prompt: t("admin.spending_proposals.index.administrator_filter_all"), - label: false, - class: "js-submit-on-change" } %> +
+ <%= select_tag :tag_name, + options_for_select(spending_proposal_tags_select_options, params[:tag_name]), + { prompt: t("admin.spending_proposals.index.tags_filter_all"), + label: false, + class: "js-submit-on-change" } %>
<% end %>
@@ -41,23 +41,16 @@ <% if spending_proposal.administrator.present? %> - <%= spending_proposal.administrator.name %> + <%= spending_proposal.administrator.name %> <% else %> <%= t("admin.spending_proposals.index.no_admin_assigned") %> <% end %> - <% case spending_proposal.valuators.size %> - <% when 0 %> + <% if spending_proposal.valuators.size == 0 %> <%= t("admin.spending_proposals.index.no_valuators_assigned") %> - <% when 1 %> - - <%= spending_proposal.valuators.first.name %> - <% else %> - - <%= t('admin.spending_proposals.index.valuators_assigned', count: spending_proposal.valuators.size) %> - + <%= spending_proposal.valuators.collect(&:name).join(', ') %> <% end %> diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 1ee1f72a4..3a8d1bf84 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -158,14 +158,14 @@ en: valuating: Under valuation valuation_finished: Valuation finished title: Investment projects for participatory budgeting - admin_assigned: Assigned administrator + assigned_admin: Assigned administrator no_admin_assigned: No admin assigned - valuators_assigned: - one: Assigned valuator - other: "%{count} valuators assigned" no_valuators_assigned: No valuators assigned show: + assigned_admin: Assigned administrator + assigned_valuators: Assigned valuators back: Back + classification: Clasification heading: "Investment project %{id}" edit_button: Edit association_name: Association @@ -173,6 +173,8 @@ en: sent: Sent geozone: Scope dossier: Dossier + tags: Tags + undefined: Undefined edit: classification: Clasification assigned_valuators: Valuators diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 993a3269a..81af24d36 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -158,14 +158,14 @@ es: valuating: En evaluación valuation_finished: Evaluación finalizada title: Propuestas de inversión para presupuestos participativos - admin_assigned: Administrador asignado + assigned_admin: Administrador asignado no_admin_assigned: Sin admin asignado - valuators_assigned: - one: Evaluador asignado - other: "%{count} evaluadores asignados" no_valuators_assigned: Sin evaluador show: + assigned_admin: Administrador asignado + assigned_valuators: Evaluadores asignados back: Volver + classification: Clasificación heading: Propuesta de inversión %{id} edit_button: Editar association_name: Asociación @@ -173,6 +173,8 @@ es: sent: Fecha geozone: Ámbito dossier: Informe + tags: Etiquetas + undefined: Sin definir edit: classification: Clasificación assigned_valuators: Evaluadores