From 837ad5fb1bd3a4b5206c59b6f2d21daa20e70bbe Mon Sep 17 00:00:00 2001 From: kikito Date: Tue, 8 Mar 2016 13:55:28 +0100 Subject: [PATCH] Improves the visual aspect of app/views/spending_proposals/show --- app/models/user.rb | 4 + .../admin/spending_proposals/show.html.erb | 85 ++++++++++++------- config/locales/admin.en.yml | 13 +-- config/locales/admin.es.yml | 11 +-- 4 files changed, 69 insertions(+), 44 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 1316c1348..3bf54b3ca 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -204,6 +204,10 @@ class User < ActiveRecord::Base self.update(oauth_email: nil) if oauth_email.present? end + def name_and_email + "#{name} (#{email})" + end + def save_requiring_finish_signup self.update(registering_with_oauth: true) end diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb index d85181f55..c5d7d92a5 100644 --- a/app/views/admin/spending_proposals/show.html.erb +++ b/app/views/admin/spending_proposals/show.html.erb @@ -1,18 +1,37 @@ -<%= link_to t("admin.spending_proposals.show.back"), :back, class: 'back' %> -

<%= t("admin.spending_proposals.show.heading") %> <%= @spending_proposal.id %>

-

<%= @spending_proposal.title %>

- -<%= safe_html_with_links @spending_proposal.description %> - -<% if @spending_proposal.external_url.present? %> -

<%= text_with_links @spending_proposal.external_url %>

+<%= link_to :back, class: 'back' do %> + <%= t("admin.spending_proposals.show.back") %> <% end %> -

<%= t("admin.spending_proposals.show.info") %>

-

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

+ +

<%= 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 %> +

+
+ +
<% if @spending_proposal.association_name.present? %>

<%= t("admin.spending_proposals.show.association_name") %>: @@ -20,37 +39,37 @@

<% end %> -

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

+<% if @spending_proposal.external_url.present? %> +

<%= text_with_links @spending_proposal.external_url %>

+<% end %> -

<%= t("admin.spending_proposals.show.sent") %>: - <%= l @spending_proposal.created_at, format: :datetime %> -

+<%= safe_html_with_links @spending_proposal.description %> -

<%= t("admin.spending_proposals.show.responsibles") %>

+

<%= t("admin.spending_proposals.show.classification") %>

<%= t("admin.spending_proposals.show.assigned_admin") %>: <%= @spending_proposal.administrator.try(:name_and_email) || t("admin.spending_proposals.show.undefined") %>

-<%= render 'shared/tags', taggable: @spending_proposal %> +

+ <%= t("admin.spending_proposals.show.tags") %>: + <%= render 'shared/tags', taggable: @spending_proposal %> +

+

+ <%= t("admin.spending_proposals.show.assigned_valuators") %>: + <% if @spending_proposal.valuators.any? %> + <% @spending_proposal.valuators.collect(&:name_and_email).join(', ') %> + <% else %> + <%= t("admin.spending_proposals.show.undefined") %> + <% end %> +

-

<%= t("admin.spending_proposals.show.assigned_valuators") %>:

-
- -
+<%= link_to t("admin.spending_proposals.show.edit_button"), + edit_admin_spending_proposal_path(@spending_proposal), + class: "button" %> -<%= link_to t("admin.spending_proposals.show.assign_valuators"), "", class: "js-toggle-link", data: {"toggle-selector" => "#valuators-assign-list"} %> +

<%= t("admin.spending_proposals.show.dossier") %>

diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index ae9f7ad08..f625d45e5 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -165,11 +165,11 @@ en: no_valuators_assigned: No valuators assigned show: back: Back - heading: Investment project - info: Author info - association_name: Asociación - by: Sent by - sent: Sent at + heading: "Investment project %{id}" + edit_button: Update + association_name: Association + by: By + sent: Sent geozone: Scope dossier: Dossier price: Price @@ -180,12 +180,13 @@ en: undefined: Undefined valuation_finished: Valuation finished internal_comments: Internal comments - responsibles: Responsibles + classification: Clasificación assigned_admin: Assigned admin assigned_valuators: Assigned valuators assign_valuators: Assign valuators no_valuators: There is not any valuator user assign: Assign + tags: Tags edit: submit_button: Update stats: diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index f97ac9067..05ec213f0 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -165,11 +165,11 @@ es: no_valuators_assigned: Sin evaluador show: back: Volver - heading: Propuesta de inversión - info: Datos de envío + heading: Propuesta de inversión %{id} + edit_button: Editar association_name: Asociación - by: Enviada por - sent: Fecha de creación + by: Autor + sent: Fecha geozone: Ámbito dossier: Informe price: Coste @@ -180,12 +180,13 @@ es: undefined: Sin definir valuation_finished: Informe finalizado internal_comments: Commentarios internos - responsibles: Responsables + classification: Clasificación assigned_admin: Administrador asignado assigned_valuators: Evaluadores asignados assign_valuators: Asignar evaluadores no_valuators: No hay ningún usuario evaluador assign: Asignar + tags: Etiquetas edit: submit_button: Actualizar stats: