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

unifies styles for edit links

Browse Source
This commit is contained in:
Juanjo Bazán
2016-03-11 13:59:20 +01:00
parent e560f718aa
commit adacd50588
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

8
spec/features/admin/spending_proposals_spec.rb
View File

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