diff --git a/app/views/employees/_form.html.erb b/app/views/employees/_form.html.erb index c8e3013..452f0db 100644 --- a/app/views/employees/_form.html.erb +++ b/app/views/employees/_form.html.erb @@ -15,16 +15,16 @@ <%= f.text_field :lastname, :size => "12" %> - + <%= f.label :street %> <%= f.text_field :street, :size => "30" %> - - - + <%= f.label :city %> + <%= f.label :state, "St" %> + <%= f.label :zip %> <%= f.text_field :city, :size => "16" %> @@ -32,9 +32,9 @@ <%= f.text_field :zip, :size => "6" %> - - - + <%= f.label :dob, "Birth Date" %> + <%= f.label :hired, "Hire Date" %> + <%= f.label :payrate, "Pay Rate" %> <%= f.calendar_date_select :dob, :size => "8", @@ -52,9 +52,9 @@   - - - + <%= f.label :phone %> + <%= f.label :ssn, "Social" %> + <%= f.label :tax_status, "Tax Info" %> <%= f.text_field :phone, :size => "10" %> diff --git a/app/views/loads/_form.html.erb b/app/views/loads/_form.html.erb index 4d7338e..415bb09 100644 --- a/app/views/loads/_form.html.erb +++ b/app/views/loads/_form.html.erb @@ -1,25 +1,20 @@ <% form_for @load do |f| %> <%= f.error_messages %> -
+
- Trip Info + Load Detail + + - - + + + - - - - - - - - + + +
<%= f.label :number, "Trip Number" %><%= f.label :hub_in %><%= f.label :hub_out %>
- <%= f.text_field :number, :size => "8" %> - <%= f.text_field :hub_in, :size => "8" %> - <%= f.text_field :hub_out, :size => "8" %><%= f.text_field :number %><%= f.text_field :hub_in %><%= f.text_field :hub_out %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c1963c1..eb85ea2 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -265,12 +265,18 @@ table { table-layout: fixed; } -#employee_data { +tr { + height: 1em; +} + +#employee_data, +#load_detail { width: 19em; float: left; } -#employee_data col { +#employee_data col, +#load_detail { width: 10%; } @@ -331,3 +337,13 @@ table { #driver_loads { float: right; } + +#load_number { + width: 8em; +} + +#load_hub_in, +#load_hub_out { + width: 6em; +} +