From 1711305ee8cd671d46a299cdb7dc04e6841c18be Mon Sep 17 00:00:00 2001 From: Skud Date: Wed, 19 Dec 2012 14:14:41 +1100 Subject: [PATCH] Made the form prettier using Bootstrap's horizontal form css --- app/views/plantings/_form.html.haml | 40 +++++++++++---------- spec/views/plantings/edit.html.haml_spec.rb | 4 +-- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/app/views/plantings/_form.html.haml b/app/views/plantings/_form.html.haml index 7448d0b0b..3d72d7f36 100644 --- a/app/views/plantings/_form.html.haml +++ b/app/views/plantings/_form.html.haml @@ -1,4 +1,4 @@ -= form_for @planting do |f| += form_for(@planting, :html => {:class => "form-horizontal"}) do |f| - if @planting.errors.any? #error_explanation %h2= "#{pluralize(@planting.errors.count, "error")} prohibited this planting from being saved:" @@ -6,20 +6,24 @@ - @planting.errors.full_messages.each do |msg| %li= msg - .field - = f.label :garden_id - = collection_select(:planting, :garden_id, Garden.where(:user_id => current_user), :id, :name) - .field - = f.label :crop_id - = collection_select(:planting, :crop_id, Crop.all(:order => :system_name), :id, :system_name) - .field - = f.label :planted_at - = f.datetime_select :planted_at - .field - = f.label :quantity - = f.number_field :quantity - .field - = f.label :description - = f.text_area :description - .actions - = f.submit 'Save' + .control-group + = f.label :garden_id, :class => 'control-label' + .controls= collection_select(:planting, :garden_id, Garden.where(:user_id => current_user), :id, :name) + .control-group + = f.label :crop_id, :class => 'control-label' + .controls= collection_select(:planting, :crop_id, Crop.all(:order => :system_name), :id, :system_name) + .control-group + = f.label :planted_at, :class => 'control-label' + .controls= f.datetime_select :planted_at, options = { :include_blank => true }, html_options = { :class => "span1" } + .control-group + = f.label :quantity, :class => 'control-label' + .controls + = f.number_field :quantity, :class => 'input-small' + %span.help-block + The number of plants. + .control-group + = f.label :description, :class => 'control-label' + .controls= f.text_area :description, :rows => 6 + + .form-actions + = f.submit 'Save' diff --git a/spec/views/plantings/edit.html.haml_spec.rb b/spec/views/plantings/edit.html.haml_spec.rb index 3c7d8ebbe..e09781df4 100644 --- a/spec/views/plantings/edit.html.haml_spec.rb +++ b/spec/views/plantings/edit.html.haml_spec.rb @@ -15,8 +15,8 @@ describe "plantings/edit" do # Run the generator again with the --webrat flag if you want to use webrat matchers assert_select "form", :action => plantings_path(@planting), :method => "post" do - assert_select "input#planting_garden_id", :name => "planting[garden_id]" - assert_select "input#planting_crop_id", :name => "planting[crop_id]" + assert_select "select#planting_garden_id", :name => "planting[garden_id]" + assert_select "select#planting_crop_id", :name => "planting[crop_id]" assert_select "input#planting_quantity", :name => "planting[quantity]" assert_select "textarea#planting_description", :name => "planting[description]" end