Tweaked the layout of the invoice selection form.

This commit is contained in:
Paul van Tilburg 2011-11-16 11:00:17 +01:00
parent dcd6f553b7
commit cfcd7ef31d
2 changed files with 8 additions and 8 deletions

View File

@ -1460,7 +1460,7 @@ module StopTime::Views
form :action => R(CustomersNInvoices, @customer.id), :method => :post do
unless @hourly_rate_tasks.empty?
h2 "Registered Time"
table.time_entries do
table.invoice_select do
col.flag {}
col.date {}
col.start_time {}
@ -1469,7 +1469,7 @@ module StopTime::Views
col.hours {}
col.amount {}
tr do
th ""
th "Bill?"
th "Date"
th "Start time"
th "End time"
@ -1480,15 +1480,15 @@ module StopTime::Views
@hourly_rate_tasks.keys.each do |task|
tr.task do
td { _form_input_checkbox("tasks[]", task.id) }
td task.name, :colspan => 5
td task.name, :colspan => 6
end
@hourly_rate_tasks[task].each do |entry|
tr do
td { _form_input_checkbox("time_entries[]", entry.id) }
td { label entry.date.to_date,
:for => "time_entries[]_#{entry.id}" }
td { entry.start }
td { entry.end }
td { entry.start.to_formatted_s(:time_only) }
td { entry.end.to_formatted_s(:time_only) }
td { entry.comment }
td.right { "%.2fh" % entry.hours_total }
td.right { "€ %.2f" % (entry.hours_total * entry.task.hourly_rate) }

View File

@ -65,7 +65,7 @@ table
col.amount, col.hours, col.hourly_rate
width: 10%
col.flag
width: 4%
width: 3%
col.date
width: 9%
col.start_time, col.end_time
@ -94,7 +94,7 @@ table
&.tasks
width: 60%
&.customers
&.customers, &.invoice_select
width: 75%
&.invoices
@ -120,7 +120,7 @@ table
input
width: 100%
input[type="submit"], input[type="reset"]
input[type="submit"], input[type="reset"], input[type="checkbox"]
width: auto
/* Form layout */