From adacd505883a27f8043fe24a8a96d53dfa6958ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Fri, 11 Mar 2016 13:59:20 +0100 Subject: [PATCH 1/2] unifies styles for edit links --- app/views/admin/spending_proposals/show.html.erb | 9 +++++---- config/locales/admin.en.yml | 2 +- config/locales/admin.es.yml | 2 +- spec/features/admin/spending_proposals_spec.rb | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb index 536597545..187e53c63 100644 --- a/app/views/admin/spending_proposals/show.html.erb +++ b/app/views/admin/spending_proposals/show.html.erb @@ -6,6 +6,11 @@

<%= t("admin.spending_proposals.show.classification") %>

+

+ <%= link_to t("admin.spending_proposals.show.edit_classification"), + edit_admin_spending_proposal_path(@spending_proposal, anchor: "form") %> +

+

<%= t("admin.spending_proposals.show.assigned_admin") %>: <%= @spending_proposal.administrator.try(:name_and_email) || t("admin.spending_proposals.show.undefined") %>

@@ -25,10 +30,6 @@ <% end %>

-<%= link_to t("admin.spending_proposals.show.edit_button"), - edit_admin_spending_proposal_path(@spending_proposal, anchor: "form"), - class: "button" %> -

<%= t("admin.spending_proposals.show.dossier") %>

diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 8b045dbd1..4ecf9cbda 100755 --- a/config/locales/admin.en.yml +++ b/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 diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 6dcf1c0c9..bc882fab2 100644 --- a/config/locales/admin.es.yml +++ b/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 diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb index 776f55d45..6530400c1 100644 --- a/spec/features/admin/spending_proposals_spec.rb +++ b/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' From 648527e32c075ef2a887c8aed6b3f7a407137f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Fri, 11 Mar 2016 14:04:05 +0100 Subject: [PATCH 2/2] changes order of fields in admin edit form --- app/views/admin/spending_proposals/edit.html.erb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/views/admin/spending_proposals/edit.html.erb b/app/views/admin/spending_proposals/edit.html.erb index 10b99acce..4743f5c50 100644 --- a/app/views/admin/spending_proposals/edit.html.erb +++ b/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") %>
<% @tags.each do |tag| %> <%= tag.name %> <% end %>
- <%= 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 %> +

<%= f.submit(class: "button", value: t("admin.spending_proposals.edit.submit_button")) %>