From 3513bd3cafb055c27402224731ae31021587c0b5 Mon Sep 17 00:00:00 2001 From: Loos Date: Tue, 17 Feb 2015 20:43:57 -0500 Subject: [PATCH] lk | improves field layout on new bike page --- app/views/bikes/_fields.html.haml | 177 ++++++++++++++---------------- app/views/bikes/_form.html.haml | 24 ++-- app/views/bikes/new.html.haml | 7 +- 3 files changed, 100 insertions(+), 108 deletions(-) diff --git a/app/views/bikes/_fields.html.haml b/app/views/bikes/_fields.html.haml index 796f7f7..09d43c3 100644 --- a/app/views/bikes/_fields.html.haml +++ b/app/views/bikes/_fields.html.haml @@ -1,96 +1,87 @@ - disabled ||= false -.form-horizontal - .form-group - = f.label "Log Number", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :log_number, class: "form-control", disabled: disabled - - .form-group - = f.label "Bike Entry Date:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :entry_date, class: "form-control datepicker", disabled: disabled - - .form-group - = f.label "Brand:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :brand, class: "form-control", disabled: disabled - - .form-group - = f.label "Color:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :color, class: "form-control", disabled: disabled - - .form-group - = f.label "Top Tube Size:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :top_tube_size, class: "form-control", disabled: disabled - - .form-group - = f.label "Seat Tube Size:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :seat_tube_size, class: "form-control", disabled: disabled - - .form-group - = f.label "Model:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :model, class: "form-control", disabled: disabled - - .form-group - = f.label "Type:", class: "col-sm-2 control-label" - .col-sm-10 - = f.select :bike_type, [["BMX", "BMX"], ["Cruiser", "Cruiser"], ["Hybrid", "Hybrid"], ["Mountain", "Mountain"], ["Road", "Road"], ["Touring", "Touring"], ["Track", "Track"], ["Utility", "Utility"]], {}, class: "selectpicker", disabled: disabled - - .form-group - = f.label "Purpose:", class: "col-sm-2 control-label" - .col-sm-10 - = f.select :purpose, [["Freecyclery", "Freecyclery"], ["Sale", "Sale"]], {}, class: "selectpicker", disabled: disabled - - .form-group - = f.label "Serial Number", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :serial_number, class: "form-control", disabled: disabled - - .form-group - = f.label "Notes", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_area :notes, class: "form-control", disabled: disabled +.row + .form-horizontal + .col-sm-6 + .form-group + = f.label "Log Number", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :log_number, class: "form-control", disabled: disabled + + .form-group + = f.label "Brand:", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :brand, class: "form-control", disabled: disabled + + .form-group + = f.label "Model:", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :model, class: "form-control", disabled: disabled + + .form-group + = f.label "Type:", class: "col-sm-4 control-label" + .col-sm-6 + = f.select :bike_type, [["BMX", "BMX"], ["Cruiser", "Cruiser"], ["Hybrid", "Hybrid"], ["Mountain", "Mountain"], ["Road", "Road"], ["Touring", "Touring"], ["Track", "Track"], ["Utility", "Utility"]], {}, class: "selectpicker", disabled: disabled - .form-group - = f.label "Work Done:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_area :work_done, class: "form-control", disabled: disabled - - - .form-group - = f.label "New Parts:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_area :new_parts, class: "form-control", disabled: disabled - + .form-group + = f.label "Color:", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :color, class: "form-control", disabled: disabled + + + .col-sm-6 + .form-group + = f.label "Mechanic:", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :mechanic, class: "form-control", disabled: disabled + + .form-group + = f.label "Seat Tube Length:", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :seat_tube_size, class: "form-control", disabled: disabled + + .form-group + = f.label "Top Tube Length:", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :top_tube_size, class: "form-control", disabled: disabled + + .form-group + = f.label "Serial Number", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :serial_number, class: "form-control", disabled: disabled + + .form-group + = f.label "Date Finished:", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :entry_date, class: "form-control datepicker", disabled: disabled + + .col-sm-6 + %br + %br + .form-group + = f.label "Purpose:", class: "col-sm-4 control-label" + .col-sm-6 + = f.select :purpose, [["Freecyclery", "Freecyclery"], ["Sale", "Sale"]], {}, class: "selectpicker", disabled: disabled + + .form-group + = f.label "Tag Info", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_area :tag_info, class: "form-control", placeholder: "+ New Component ", disabled: disabled + + .form-group + = f.label "Notes", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_area :notes, class: "form-control", disabled: disabled + + .form-group + = f.label "Date Sold:", class: "col-sm-4 control-label" + .col-sm-6 + = f.text_field :date_sold, class: "form-control datepicker", disabled: disabled + + .form-group + = f.label "Price", class: "col-sm-4 control-label" + .col-sm-6 + .input-group + %span.input-group-addon $ + = f.text_field :price, class: "form-control", disabled: disabled - .form-group - = f.label "Tag Info", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_area :tag_info, class: "form-control", disabled: disabled - - .form-group - = f.label "Mechanic:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :mechanic, class: "form-control", disabled: disabled - - .form-group - = f.label "Completion Date:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :completion_date, class: "form-control datepicker", disabled: disabled - - .form-group - = f.label "Date Sold:", class: "col-sm-2 control-label" - .col-sm-10 - = f.text_field :date_sold, class: "form-control datepicker", disabled: disabled - - - .form-group - = f.label "Price", class: "col-sm-2 control-label" - .col-sm-10 - .input-group - %span.input-group-addon $ - = f.text_field :price, class: "form-control", disabled: disabled + %a{href: "http://www.bicyclebluebook.com/SearchBikes.aspx"} Look It Up diff --git a/app/views/bikes/_form.html.haml b/app/views/bikes/_form.html.haml index c105f17..c217393 100644 --- a/app/views/bikes/_form.html.haml +++ b/app/views/bikes/_form.html.haml @@ -1,12 +1,12 @@ -.container - = form_for @bike, html: {class: 'form-horizontal'} do |f| - - if @bike.errors.any? - #error_explanation - %h2= pluralize(@bike.errors.count, "error") + " prohibited this bike from being saved:" - %ul - - @bike.errors.full_messages.each do |msg| - %li= msg - = render 'fields', f: f - .row - .actions.col-sm-offset-2 - = f.submit class: "btn btn-default" += form_for @bike, html: {class: 'form-horizontal'} do |f| + - if @bike.errors.any? + #error_explanation + %h2= pluralize(@bike.errors.count, "error") + " prohibited this bike from being saved:" + %ul + - @bike.errors.full_messages.each do |msg| + %li= msg + = render 'fields', f: f + + .row + .actions.col-sm-offset-2 + = f.submit class: "btn btn-default" diff --git a/app/views/bikes/new.html.haml b/app/views/bikes/new.html.haml index a19579d..7290769 100644 --- a/app/views/bikes/new.html.haml +++ b/app/views/bikes/new.html.haml @@ -1,3 +1,4 @@ -%h1 New bike -= render 'form' -= link_to 'Back', bikes_path +.container + %h1 New bike + = render 'form' + = link_to 'Back', bikes_path