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

makes admin/spending_proposal/edit visually pleasant

Browse Source
This commit is contained in:
kikito
2016-03-08 15:26:03 +01:00
parent 35b296cf0e
commit 2ac12ef4a9
10 changed files with 121 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/spending_proposals_controller.rb
View File

@@ -21,7 +21,7 @@ class Admin::SpendingProposalsController < Admin::BaseController
def update
if @spending_proposal.update(spending_proposal_params)
redirect_to admin_spending_proposal_path(@spending_proposal), notice: t("flash.actions.update.spending_proposal")
redirect_to admin_spending_proposal_path(@spending_proposal, anchor: 'classification'), notice: t("flash.actions.update.spending_proposal")
else
render :edit
end

38
app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb Normal file
View File

@@ -0,0 +1,38 @@
<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>
<%= @spending_proposal.association_name %>
</p>
<% end %>
<% if @spending_proposal.external_url.present? %>
<p><%= text_with_links @spending_proposal.external_url %></p>
<% end %>
<%= safe_html_with_links @spending_proposal.description %>

23
app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb Normal file
View File

@@ -0,0 +1,23 @@
<h2><%= t("admin.spending_proposals.show.dossier") %></h2>
<p><strong><%= t("admin.spending_proposals.show.price") %> (<%= t("admin.spending_proposals.show.currency") %>):</strong>
<%= @spending_proposal.price.present? ? @spending_proposal.price : t("admin.spending_proposals.show.undefined") %>
</p>
<p><strong><%= t("admin.spending_proposals.show.price_first_year") %> (<%= t("admin.spending_proposals.show.currency") %>):</strong>
<%= @spending_proposal.price_first_year.present? ? @spending_proposal.price_first_year : t("admin.spending_proposals.show.undefined") %>
</p>
<%= simple_format(safe_html_with_links(@spending_proposal.price_explanation.html_safe), {}, sanitize: false) if @spending_proposal.price_explanation.present? %>
<p><strong><%= t("admin.spending_proposals.show.feasibility") %>:</strong>
<%= t("admin.spending_proposals.show.#{@spending_proposal.feasibility}") %>
</p>
<%= simple_format(safe_html_with_links(@spending_proposal.feasible_explanation.html_safe), {}, sanitize: false) if @spending_proposal.feasible_explanation.present? %>
<% if @spending_proposal.valuation_finished %>
<p><strong><%= t("admin.spending_proposals.show.valuation_finished") %></strong>
<% end %>
<% if @spending_proposal.internal_comments.present? %>
<h2><%= t("admin.spending_proposals.show.internal_comments") %></h2>
<%= simple_format(safe_html_with_links(@spending_proposal.internal_comments.html_safe), {}, sanitize: false) %>
<% end %>

62
app/views/admin/spending_proposals/edit.html.erb
View File

@@ -1,37 +1,41 @@
<%= link_to admin_spending_proposals_path(@spending_proposal), class: 'back' do %>
<i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
<% end %>
<%= render 'admin/spending_proposals/spending_proposal_data_written_by_author' %>
<h2 id="form"><%= t("admin.spending_proposals.edit.classification") %></h2>
<%= form_for @spending_proposal, url: admin_spending_proposal_path(@spending_proposal) do |f| %>
<%= f.select :administrator_id,
@admins.collect { |a| [ "#{a.name} (#{a.email})", a.id ] },
{ include_blank: t("admin.spending_proposals.show.undefined"),
label: false },
class: "js-submit-on-change" %>
<%= f.select(:administrator_id,
@admins.collect{ |a| [a.name_and_email, a.id ] },
{ include_blank: t("admin.spending_proposals.edit.undefined") },
class: "small-12 medium-6") %>
<div class="row">
<div class="small-12 medium-4 column end">
<%= f.collection_check_boxes :valuator_ids, @valuators, :id, :name %>
</div>
<%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %>
<%= f.collection_check_boxes :valuator_ids, @valuators, :id, :name_and_email %>
<%= f.label :tag_list, t("admin.spending_proposals.edit.tags") %>
<div class="tags">
<% @tags.each do |tag| %>
<a class="js-add-tag-link"><%= tag.name %></a>
<% end %>
</div>
<div class="small-12 column">
<%= f.label :tag_list, t("proposals.form.tags_label") %>
<p class="note"><%= t("proposals.form.tags_instructions") %></p>
<%= f.text_field :tag_list, value: @spending_proposal.tag_list.to_s,
label: false,
placeholder: t("admin.spending_proposals.edit.tags_placeholder"),
class: 'js-tag-list' %>
<div id="category_tags" class="tags">
<%= f.label :category_tag_list, t("proposals.form.tag_category_label") %>
<% @tags.each do |tag| %>
<a class="js-add-tag-link"><%= tag.name %></a>
<% end %>
</div>
<br>
<%= f.text_field :tag_list, value: @spending_proposal.tag_list.to_s,
label: false,
placeholder: t("proposals.form.tags_placeholder"),
class: 'js-tag-list' %>
</div>
<div class="actions small-12 column">
<p>
<%= f.submit(class: "button", value: t("admin.spending_proposals.edit.submit_button")) %>
</div>
</p>
<% end %>
<hr>
<%= render 'admin/spending_proposals/spending_proposal_data_written_by_valuators' %>
<% end %>

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

@@ -1,49 +1,10 @@
<%= link_to :back, class: 'back' do %>
<%= link_to admin_spending_proposals_path, class: 'back' do %>
<i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
<% end %>
<h2><%= t "admin.spending_proposals.show.heading", id: @spending_proposal.id %>
<%= render 'admin/spending_proposals/spending_proposal_data_written_by_author' %>
</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>
<%= @spending_proposal.association_name %>
</p>
<% end %>
<% if @spending_proposal.external_url.present? %>
<p><%= text_with_links @spending_proposal.external_url %></p>
<% end %>
<%= safe_html_with_links @spending_proposal.description %>
<h2><%= t("admin.spending_proposals.show.classification") %></h2>
<h2 id="classification"><%= 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") %>
@@ -54,44 +15,21 @@
<%= render 'shared/tags', taggable: @spending_proposal %>
</p>
<p>
<p id="assigned_valuators">
<strong><%= t("admin.spending_proposals.show.assigned_valuators") %>:</strong>
<div id="assigned_valuators">
<% if @spending_proposal.valuators.any? %>
<%= @spending_proposal.valuators.collect(&:name_and_email).join(', ') %>
<% else %>
<%= t("admin.spending_proposals.show.undefined") %>
<% end %>
</div>
<% if @spending_proposal.valuators.any? %>
<%= @spending_proposal.valuators.collect(&:name_and_email).join(', ') %>
<% else %>
<%= t("admin.spending_proposals.show.undefined") %>
<% end %>
</p>
<%= link_to t("admin.spending_proposals.show.edit_button"),
edit_admin_spending_proposal_path(@spending_proposal),
edit_admin_spending_proposal_path(@spending_proposal, anchor: "form"),
class: "button" %>
<hr>
<h2><%= t("admin.spending_proposals.show.dossier") %></h2>
<%= render 'admin/spending_proposals/spending_proposal_data_written_by_valuators' %>
<p><strong><%= t("admin.spending_proposals.show.price") %> (<%= t("admin.spending_proposals.show.currency") %>):</strong>
<%= @spending_proposal.price.present? ? @spending_proposal.price : t("admin.spending_proposals.show.undefined") %>
</p>
<p><strong><%= t("admin.spending_proposals.show.price_first_year") %> (<%= t("admin.spending_proposals.show.currency") %>):</strong>
<%= @spending_proposal.price_first_year.present? ? @spending_proposal.price_first_year : t("admin.spending_proposals.show.undefined") %>
</p>
<%= simple_format(safe_html_with_links(@spending_proposal.price_explanation.html_safe), {}, sanitize: false) if @spending_proposal.price_explanation.present? %>
<p><strong><%= t("admin.spending_proposals.show.feasibility") %>:</strong>
<%= t("admin.spending_proposals.show.#{@spending_proposal.feasibility}") %>
</p>
<%= simple_format(safe_html_with_links(@spending_proposal.feasible_explanation.html_safe), {}, sanitize: false) if @spending_proposal.feasible_explanation.present? %>
<% if @spending_proposal.valuation_finished %>
<p><strong><%= t("admin.spending_proposals.show.valuation_finished") %></strong>
<% end %>
<% if @spending_proposal.internal_comments.present? %>
<h2><%= t("admin.spending_proposals.show.internal_comments") %></h2>
<%= simple_format(safe_html_with_links(@spending_proposal.internal_comments.html_safe), {}, sanitize: false) %>
<% end %>

2
config/initializers/acts_as_taggable_on.rb
View File

@@ -39,7 +39,7 @@ module ActsAsTaggableOn
end
def self.spending_proposal_tags
ActsAsTaggableOn::Tag.where('taggings.taggable_type' => 'SpendingProposal').includes(:taggings).uniq
ActsAsTaggableOn::Tag.where('taggings.taggable_type' => 'SpendingProposal').includes(:taggings).order(:name).uniq
end
private

2
config/locales/activerecord.en.yml
View File

@@ -77,3 +77,5 @@ en:
attributes:
tag_list:
less_than_or_equal_to: "tags must be less than or equal to %{count}"
spending_proposal:
administrator_id: "Administrator"

2
config/locales/activerecord.es.yml
View File

@@ -67,6 +67,8 @@ es:
organization:
name: "Nombre de organización"
responsible_name: "Persona responsable del colectivo"
spending_proposal:
administrator_id: "Administrador"
errors:
models:
debate:

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

@@ -190,7 +190,12 @@ en:
assign: Assign
tags: Tags
edit:
classification: Clasification
assigned_valuators: Valuators
submit_button: Update
tags: Tags
tags_placeholder: "Write the tags you want separated by commas (,)"
undefined: Undefined
stats:
show:
stats_title: Stats

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

@@ -190,7 +190,12 @@ es:
assign: Asignar
tags: Etiquetas
edit:
classification: Clasificación
assigned_valuators: Evaluadores
submit_button: Actualizar
tags: Etiquetas
tags_placeholder: "Escribe las etiquetas que desees separadas por comas (,)"
undefined: Sin definir
stats:
show:
stats_title: Estadísticas