Merge pull request #986 from consul/admin-edit-spendings

Minor changes in spending proposals' admin

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

@@ -13,23 +13,22 @@
                { include_blank: t("admin.spending_proposals.edit.undefined") },
                class: "small-12 medium-6") %>
 
-  <%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %>
-  <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :name_and_email  do |b| %>
-     <%= b.label { b.check_box + b.text } %>
-  <% end %>
-
   <%= 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>
-
   <%= 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' %>
 
+  <%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %>
+  <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :name_and_email  do |b| %>
+     <%= b.label { b.check_box + b.text } %>
+  <% end %>
+
   <p>
     <%= f.submit(class: "button", value: t("admin.spending_proposals.edit.submit_button")) %>
   </p>

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

@@ -6,6 +6,11 @@
 
 <h2 id="classification"><%= t("admin.spending_proposals.show.classification") %></h2>
 
+<p>
+  <%= link_to t("admin.spending_proposals.show.edit_classification"),
+            edit_admin_spending_proposal_path(@spending_proposal, anchor: "form") %>
+</p>
+
 <p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong>
   <%= @spending_proposal.administrator.try(:name_and_email) || t("admin.spending_proposals.show.undefined") %>
 </p>
@@ -25,10 +30,6 @@
   <% end %>
 </p>
 
-<%= link_to t("admin.spending_proposals.show.edit_button"),
-            edit_admin_spending_proposal_path(@spending_proposal, anchor: "form"),
-            class: "button" %>
-
 <hr>
 
 <h2><%= t("admin.spending_proposals.show.dossier") %></h2>

config/locales/admin.en.yml

@@ -167,7 +167,7 @@ en:
         back: Back
         classification: Clasification
         heading: "Investment project %{id}"
-        edit_button: Edit
+        edit_classification: Edit classification
         association_name: Association
         by: By
         sent: Sent

config/locales/admin.es.yml

@@ -167,7 +167,7 @@ es:
         back: Volver
         classification: Clasificación
         heading: Propuesta de inversión %{id}
-        edit_button: Editar
+        edit_classification: Editar clasificación
         association_name: Asociación
         by: Autor
         sent: Fecha

spec/features/admin/spending_proposals_spec.rb

@@ -231,7 +231,7 @@ feature 'Admin spending proposals' do
       administrator = create(:administrator, user: create(:user, username: 'Marta', email: 'marta@admins.org'))
 
       visit admin_spending_proposal_path(spending_proposal)
-      click_link 'Edit'
+      click_link 'Edit classification'
 
       select 'Marta (marta@admins.org)', from: 'spending_proposal[administrator_id]'
       click_button 'Update'
@@ -248,7 +248,7 @@ feature 'Admin spending proposals' do
       valuator3 = create(:valuator, user: create(:user, username: 'Val',       email: 'v3@valuators.org'))
 
       visit admin_spending_proposal_path(spending_proposal)
-      click_link 'Edit'
+      click_link 'Edit classification'
 
       check "spending_proposal_valuator_ids_#{valuator1.id}"
       check "spending_proposal_valuator_ids_#{valuator3.id}"
@@ -271,7 +271,7 @@ feature 'Admin spending proposals' do
       spending_proposal = create(:spending_proposal)
 
       visit admin_spending_proposal_path(spending_proposal)
-      click_link 'Edit'
+      click_link 'Edit classification'
 
       find('.js-add-tag-link', text: 'Education').click
       click_button 'Update'
@@ -288,7 +288,7 @@ feature 'Admin spending proposals' do
       spending_proposal = create(:spending_proposal)
 
       visit admin_spending_proposal_path(spending_proposal)
-      click_link 'Edit'
+      click_link 'Edit classification'
 
       fill_in 'spending_proposal_tag_list', with: 'Refugees, Solidarity'
       click_button 'Update'