From 2ac12ef4a95f621a38287064aedfbbbdf701fdaa Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Tue, 8 Mar 2016 15:26:03 +0100
Subject: [PATCH] makes admin/spending_proposal/edit visually pleasant

---
 .../admin/spending_proposals_controller.rb    |  2 +-
 ...g_proposal_data_written_by_author.html.erb | 38 +++++++++
 ...roposal_data_written_by_valuators.html.erb | 23 +++++
 .../admin/spending_proposals/edit.html.erb    | 62 +++++++-------
 .../admin/spending_proposals/show.html.erb    | 84 +++----------------
 config/initializers/acts_as_taggable_on.rb    |  2 +-
 config/locales/activerecord.en.yml            |  2 +
 config/locales/activerecord.es.yml            |  2 +
 config/locales/admin.en.yml                   |  5 ++
 config/locales/admin.es.yml                   |  5 ++
 10 files changed, 121 insertions(+), 104 deletions(-)
 create mode 100644 app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb
 create mode 100644 app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb

diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb
index 2ef48f320..3ae4872db 100644
--- a/app/controllers/admin/spending_proposals_controller.rb
+++ b/app/controllers/admin/spending_proposals_controller.rb
@@ -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
diff --git a/app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb b/app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb
new file mode 100644
index 000000000..dec203ca9
--- /dev/null
+++ b/app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb
@@ -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 %>
diff --git a/app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb b/app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb
new file mode 100644
index 000000000..e231d1d23
--- /dev/null
+++ b/app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb
@@ -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 %>
diff --git a/app/views/admin/spending_proposals/edit.html.erb b/app/views/admin/spending_proposals/edit.html.erb
index 502c9baae..64148f04b 100644
--- a/app/views/admin/spending_proposals/edit.html.erb
+++ b/app/views/admin/spending_proposals/edit.html.erb
@@ -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 %>
\ No newline at end of file
diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb
index 18e3eec5e..65cf5daf4 100644
--- a/app/views/admin/spending_proposals/show.html.erb
+++ b/app/views/admin/spending_proposals/show.html.erb
@@ -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 %>
diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
index d9882dff8..7b534897a 100644
--- a/config/initializers/acts_as_taggable_on.rb
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -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
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index 9451a2875..faebcb449 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -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"
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index c18288bdc..50dd53006 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -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:
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 9b5d8f5c5..b86c01a23 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -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
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 8b8624bde..a0ce036e4 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -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