From 9201900ecee50e2f588e3f28b11e46ed15cff1e8 Mon Sep 17 00:00:00 2001
From: jimi <jimi@bullseyecomputing.com>
Date: Mon, 16 Mar 2009 22:22:57 -0500
Subject: [PATCH] More form and css edits

---
 app/views/employees/_form.html.erb | 20 ++++++++++----------
 app/views/loads/_form.html.erb     | 25 ++++++++++---------------
 public/stylesheets/application.css | 20 ++++++++++++++++++--
 3 files changed, 38 insertions(+), 27 deletions(-)

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" %></td>
   </tr>
   <tr>
-  <td colspan="10"><label>Street</label></td>
+  <td colspan="10"><%= f.label :street %></td>
   </tr>
   <tr>
   <td colspan="10" class="border">
   <%= f.text_field :street, :size => "30" %></td>
   </tr>
   <tr>
-  <td colspan="6"><label>City</label></td>
-  <td><label>St</label></td>
-  <td colspan="3"><label>Zip</label></td>
+  <td colspan="6"><%= f.label :city %></td>
+  <td colspan="1"><%= f.label :state, "St" %></td>
+  <td colspan="3"><%= f.label :zip %></td>
   </tr>
   <tr>
   <td colspan="6" class="border"><%= f.text_field :city, :size => "16" %></td>
@@ -32,9 +32,9 @@
   <td colspan="3" class="border"><%= f.text_field :zip, :size => "6" %></td>
   </tr>
   <tr>
-  <td colspan="4"><label>Birth Date</label></td>
-  <td colspan="4"><label>Hire Date</label></td>
-  <td colspan="2"><label>Pay Rate</label></td>
+  <td colspan="4"><%= f.label :dob, "Birth Date" %></td>
+  <td colspan="4"><%= f.label :hired, "Hire Date" %></td>
+  <td colspan="2"><%= f.label :payrate, "Pay Rate" %></td>
   </tr>
   <tr>
   <td colspan="4" class="border"><%= f.calendar_date_select :dob, :size => "8",
@@ -52,9 +52,9 @@
   <td colspan="10" class="border">&nbsp;</td>
   </tr>
   <tr>
-  <td colspan="4"><label>Phone</label></td>
-  <td colspan="4"><label>Social</label></td>
-  <td colspan="2"><label>Tax Info</label></td>
+  <td colspan="4"><%= f.label :phone %></td>
+  <td colspan="4"><%= f.label :ssn, "Social" %></td>
+  <td colspan="2"><%= f.label :tax_status, "Tax Info" %></td>
   </tr>
   <tr>
   <td colspan="4" class="border"><%= f.text_field :phone, :size => "10" %></td>
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 %>
-  <div class="left">
+  <div id="load_detail">
   <fieldset>
-  <legend>Trip Info</legend>
+  <legend>Load Detail</legend>
   <table cellspacing="0">
+  <col /><col /><col /><col /><col />
+  <col /><col /><col /><col /><col />
   <tr>
-  <th></th><th></th><th></th><th></th><th></th>
-  <th></th><th></th><th></th><th></th><th></th>
+  <td colspan="4"><%= f.label :number, "Trip Number" %></td>
+  <td colspan="3"><%= f.label :hub_in %></td>
+  <td colspan="3"><%= f.label :hub_out %></td>
   </tr>
   <tr>
-    <td colspan="4"><label>Trip Number</label></td>
-    <td colspan="3"><label>Hub In</label></td>
-    <td colspan="3"><label>Hub Out</label></td>
-  </tr>
-  <tr>
-    <td colspan="4" class="border">
-    <%= f.text_field :number, :size => "8" %></td>
-    <td colspan="3" class="border">
-    <%= f.text_field :hub_in, :size => "8" %></td>
-    <td colspan="3" class="border">
-    <%= f.text_field :hub_out, :size => "8" %></td>
+  <td colspan="4" class="border"><%= f.text_field :number %></td>
+  <td colspan="3" class="border"><%= f.text_field :hub_in %></td>
+  <td colspan="3" class="border"><%= f.text_field :hub_out %></td>
   </tr>
   </table>
   </fieldset>
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;
+}
+