jimi
/
rails_galm
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

More form and css edits

master
jimi 16 years ago
committed by jimi
parent
ad2414f8d1
commit
9201900ece
3 changed files with 38 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      app/views/employees/_form.html.erb
  2. 25
      app/views/loads/_form.html.erb
  3. 20
      public/stylesheets/application.css

20
app/views/employees/_form.html.erb
View File

@ -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>

25
app/views/loads/_form.html.erb
View File

@ -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>

20
public/stylesheets/application.css
View File

@ -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;
}