Improve layout in budget headings form

This commit is contained in:
Alberto
2020-03-21 03:45:59 +01:00
committed by Javi Martín
parent b304c640e1
commit eff370b279
6 changed files with 45 additions and 46 deletions

View File

@@ -0,0 +1,3 @@
.admin .budget-headings-form {
@include full-width-form;
}

View File

@@ -1,25 +1,20 @@
<%= translatable_form_for heading, url: path, html: { class: "budget-headings-form" } do |f| %>
<%= render "shared/globalize_locales", resource: heading %>
<%= translatable_form_for heading, url: path do |f| %>
<%= render "shared/errors", resource: heading %>
<div class="row">
<%= f.translatable_fields do |translations_form| %>
<div class="small-12 medium-6 column end">
<%= translations_form.text_field :name, maxlength: 50 %>
</div>
<% end %>
</div>
<div class="row">
<div class="small-12 medium-6 column">
<div class="small-12 medium-6">
<%= f.text_field :price, maxlength: 8 %>
<% if heading.budget.approval_voting? %>
<%= f.number_field :max_ballot_lines,
hint: t("admin.budget_headings.form.max_ballot_lines_info") %>
<% end %>
<%= f.text_field :population,
@@ -37,8 +32,9 @@
<p class="help-text" id="budgets-content-blocks-help-text">
<%= t("admin.budget_headings.form.content_blocks_info") %>
</p>
<%= f.submit t("admin.budget_headings.form.#{action}"), class: "button success" %>
</div>
<div class="clear">
<%= f.submit t("admin.budget_headings.form.#{action}"), class: "button hollow" %>
</div>
<% end %>

View File

@@ -220,7 +220,7 @@ en:
latitude: "Latitude (optional)"
longitude: "Longitude (optional)"
name: "Heading name"
price: "Amount"
price: "Money amount"
population: "Population (optional)"
max_ballot_lines: "Votes allowed"
budget/heading/translation:

View File

@@ -220,7 +220,7 @@ es:
latitude: "Latitud (opcional)"
longitude: "Longitud (opcional)"
name: "Nombre de la partida"
price: "Cantidad"
price: "Cantidad de dinero"
population: "Población (opcional)"
max_ballot_lines: "Votos permitidos"
budget/heading/translation:

View File

@@ -88,7 +88,7 @@ describe "Admin budget headings", :admin do
click_link "Create new heading"
fill_in "Heading name", with: "All City"
fill_in "Amount", with: "1000"
fill_in "Money amount", with: "1000"
fill_in "Population (optional)", with: "10000"
check "Allow content block"
@@ -115,7 +115,7 @@ describe "Admin budget headings", :admin do
click_button "Create new heading"
expect(page).not_to have_content "Heading created successfully!"
expect(page).to have_css(".is-invalid-label", text: "Amount")
expect(page).to have_css(".is-invalid-label", text: "Money amount")
expect(page).to have_content "can't be blank"
end
@@ -134,7 +134,7 @@ describe "Admin budget headings", :admin do
expect(page).to have_field "Votes allowed", with: 1
fill_in "Heading name", with: "All City"
fill_in "Amount", with: "1000"
fill_in "Money amount", with: "1000"
fill_in "Votes allowed", with: 14
click_button "Create new heading"
@@ -152,7 +152,7 @@ describe "Admin budget headings", :admin do
within("#budget_heading_#{heading.id}") { click_link "Edit" }
expect(page).to have_field "Heading name", with: heading.name
expect(page).to have_field "Amount", with: heading.price
expect(page).to have_field "Money amount", with: heading.price
expect(page).to have_field "Population (optional)", with: heading.population
expect(page).to have_field "Longitude (optional)", with: heading.longitude
expect(page).to have_field "Latitude (optional)", with: heading.latitude
@@ -204,14 +204,14 @@ describe "Admin budget headings", :admin do
visit edit_admin_budget_group_heading_path(budget, group, heading)
expect(page).to have_field "Heading name", with: "All City"
expect(page).to have_field "Amount", with: 1000
expect(page).to have_field "Money amount", with: 1000
expect(page).to have_field "Population (optional)", with: 10000
expect(page).to have_field "Longitude (optional)", with: 20.50
expect(page).to have_field "Latitude (optional)", with: -10.50
expect(find_field("Allow content block")).to be_checked
fill_in "Heading name", with: "Districts"
fill_in "Amount", with: "2000"
fill_in "Money amount", with: "2000"
fill_in "Population (optional)", with: "20000"
fill_in "Longitude (optional)", with: "-40.47"
fill_in "Latitude (optional)", with: "25.25"
@@ -222,7 +222,7 @@ describe "Admin budget headings", :admin do
visit edit_admin_budget_group_heading_path(budget, group, heading)
expect(page).to have_field "Heading name", with: "Districts"
expect(page).to have_field "Amount", with: 2000
expect(page).to have_field "Money amount", with: 2000
expect(page).to have_field "Population (optional)", with: 20000
expect(page).to have_field "Longitude (optional)", with: -40.47
expect(page).to have_field "Latitude (optional)", with: 25.25

View File

@@ -637,7 +637,7 @@ describe "Ballots" do
in_browser(:admin) do
login_as admin_user
visit edit_admin_budget_group_heading_path(budget, states, new_york)
fill_in "Amount", with: 10
fill_in "Money amount", with: 10
click_button "Save heading"
expect(page).to have_content "Heading updated successfully"