Improves the visual aspect of app/views/spending_proposals/show

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

app/views/admin/spending_proposals/show.html.erb

@@ -1,18 +1,37 @@
-<%= link_to t("admin.spending_proposals.show.back"), :back, class: 'back' %>
+<%= link_to :back, class: 'back' do %>
-<h2><%= t("admin.spending_proposals.show.heading") %> <%= @spending_proposal.id %></h2>
+  <i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
-<h1><%= @spending_proposal.title %></h1>
-
-<%= safe_html_with_links @spending_proposal.description %>
-
-<% if @spending_proposal.external_url.present? %>
-  <p><%= text_with_links @spending_proposal.external_url %></p>
 <% end %>
 
-<h2><%= t("admin.spending_proposals.show.info") %></h2>
 
-<p><strong><%= t("admin.spending_proposals.show.by") %>:</strong>
+
+<h2><%= t "admin.spending_proposals.show.heading", id: @spending_proposal.id %>
+
+</h2>
+<h1><%= @spending_proposal.title %></h1>
+
+<div class="row small-collapse">
+  <div class="small-12 medium-4 columns">
+    <p>
+      <strong><%= t("admin.spending_proposals.show.geozone") %>:</strong>
+      <%= geozone_name(@spending_proposal) %>
+    </p>
+  </div>
+
+  <div class="small-12 medium-4 columns">
+    <p>
+      <strong><%= t("admin.spending_proposals.show.by") %>:</strong>
       <%= link_to @spending_proposal.author.name, admin_user_path(@spending_proposal.author) %>
     </p>
+  </div>
+
+  <div class="small-12 medium-4 columns">
+    <p>
+      <strong><%= t("admin.spending_proposals.show.sent") %>:</strong>
+      <%= l @spending_proposal.created_at, format: :datetime %>
+    </p>
+  </div>
+
+</div>
 
 <% if @spending_proposal.association_name.present? %>
   <p><strong><%= t("admin.spending_proposals.show.association_name") %>:</strong>
@@ -20,37 +39,37 @@
   </p>
 <% end %>
 
-<p><strong><%= t("admin.spending_proposals.show.geozone") %>:</strong>
+<% if @spending_proposal.external_url.present? %>
-  <%= geozone_name(@spending_proposal) %>
+  <p><%= text_with_links @spending_proposal.external_url %></p>
-</p>
+<% end %>
 
-<p><strong><%= t("admin.spending_proposals.show.sent") %>:</strong>
+<%= safe_html_with_links @spending_proposal.description %>
-  <%= l @spending_proposal.created_at, format: :datetime %>
-</p>
 
-<h2><%= t("admin.spending_proposals.show.responsibles") %></h2>
+<h2><%= t("admin.spending_proposals.show.classification") %></h2>
 
 <p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong>
   <%= @spending_proposal.administrator.try(:name_and_email) || t("admin.spending_proposals.show.undefined") %>
 </p>
 
+<p>
+  <strong><%= t("admin.spending_proposals.show.tags") %>:</strong>
   <%= render 'shared/tags', taggable: @spending_proposal %>
+</p>
 
-
+<p>
-<p><strong><%= t("admin.spending_proposals.show.assigned_valuators") %>:</strong></p>
+  <strong><%= t("admin.spending_proposals.show.assigned_valuators") %>:</strong>
-<div id="assigned_valuators">
-  <ul>
   <% if @spending_proposal.valuators.any? %>
-      <% @spending_proposal.valuators.each do |valuator| %>
+    <% @spending_proposal.valuators.collect(&:name_and_email).join(', ') %>
-        <li><%= valuator.name %> (<%= valuator.email %>)</li>
-      <% end %>
   <% else %>
-      <li><%= t("admin.spending_proposals.show.undefined") %></li>
+    <%= t("admin.spending_proposals.show.undefined") %>
   <% end %>
-  </ul>
+</p>
-</div>
 
-<%= link_to t("admin.spending_proposals.show.assign_valuators"), "", class: "js-toggle-link", data: {"toggle-selector" => "#valuators-assign-list"} %>
+<%= link_to t("admin.spending_proposals.show.edit_button"),
+            edit_admin_spending_proposal_path(@spending_proposal),
+            class: "button" %>
+
+<hr>
 
 <h2><%= t("admin.spending_proposals.show.dossier") %></h2>
 

config/locales/admin.en.yml

@@ -165,11 +165,11 @@ en:
         no_valuators_assigned: No valuators assigned
       show:
         back: Back
-        heading: Investment project
+        heading: "Investment project %{id}"
-        info: Author info
+        edit_button: Update
-        association_name: Asociación
+        association_name: Association
-        by: Sent by
+        by: By
-        sent: Sent at
+        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:

config/locales/admin.es.yml

@@ -165,11 +165,11 @@ es:
         no_valuators_assigned: Sin evaluador
       show:
         back: Volver
-        heading: Propuesta de inversión
+        heading: Propuesta de inversión %{id}
-        info: Datos de envío
+        edit_button: Editar
         association_name: Asociación
-        by: Enviada por
+        by: Autor
-        sent: Fecha de creación
+        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: