consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kikito
2016-03-08 13:55:28 +01:00
parent 57386349a2
commit 837ad5fb1b
4 changed files with 69 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.rb
View File

@@ -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

85
app/views/admin/spending_proposals/show.html.erb
View File

@@ -1,18 +1,37 @@
<%= link_to t("admin.spending_proposals.show.back"), :back, class: 'back' %>
<h2><%= t("admin.spending_proposals.show.heading") %> <%= @spending_proposal.id %></h2>
<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>
<%= link_to :back, class: 'back' do %>
<i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
<% end %>
<h2><%= t("admin.spending_proposals.show.info") %></h2>
<p><strong><%= t("admin.spending_proposals.show.by") %>:</strong>
<%= link_to @spending_proposal.author.name, admin_user_path(@spending_proposal.author) %>
</p>
<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>
<%= geozone_name(@spending_proposal) %>
</p>
<% if @spending_proposal.external_url.present? %>
<p><%= text_with_links @spending_proposal.external_url %></p>
<% end %>
<p><strong><%= t("admin.spending_proposals.show.sent") %>:</strong>
<%= l @spending_proposal.created_at, format: :datetime %>
</p>
<%= safe_html_with_links @spending_proposal.description %>
<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>
<%= render 'shared/tags', taggable: @spending_proposal %>
<p>
<strong><%= t("admin.spending_proposals.show.tags") %>:</strong>
<%= render 'shared/tags', taggable: @spending_proposal %>
</p>
<p>
<strong><%= t("admin.spending_proposals.show.assigned_valuators") %>:</strong>
<% if @spending_proposal.valuators.any? %>
<% @spending_proposal.valuators.collect(&:name_and_email).join(', ') %>
<% else %>
<%= t("admin.spending_proposals.show.undefined") %>
<% end %>
</p>
<p><strong><%= t("admin.spending_proposals.show.assigned_valuators") %>:</strong></p>
<div id="assigned_valuators">
<ul>
<% if @spending_proposal.valuators.any? %>
<% @spending_proposal.valuators.each do |valuator| %>
<li><%= valuator.name %> (<%= valuator.email %>)</li>
<% end %>
<% else %>
<li><%= t("admin.spending_proposals.show.undefined") %></li>
<% end %>
</ul>
</div>
<%= 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"} %>
<hr>
<h2><%= t("admin.spending_proposals.show.dossier") %></h2>

13
config/locales/admin.en.yml
View File

@@ -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:

11
config/locales/admin.es.yml
View File

@@ -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: