mozcode
/
stoptime
1
0
Fork 0
Code Issues 25 Pull Requests Releases Wiki Activity

Tweaked table layout (mainly customers and timeline view)

This commit is contained in:
Paul van Tilburg 2012-01-09 17:14:30 +01:00
parent ea9cb0e39c
commit 7cd58f019e
2 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
stoptime.rb
View File

@ -1521,12 +1521,32 @@ module StopTime::Views
@customers.each do |customer|
tr do
td { a customer.name, :href => R(CustomersN, customer.id) }
td { customer.short_name }
td { [customer.address_street,
customer.address_postal_code,
customer.address_city].join(", ") unless customer.address_street.blank? }
td { a customer.email, :href => "mailto:#{customer.email}" }
td { customer.phone }
td { customer.short_name || "–"}
td do
if customer.address_street.present?
text customer.address_street
br
text customer.address_postal_code + " " +
customer.address_city
else
"–"
end
end
td do
if customer.email.present?
a customer.email, :href => "mailto:#{customer.email}"
else
"–"
end
end
td do
if customer.phone.present?
# FIXME: hardcoded prefix!
"0#{customer.phone}"
else
"–"
end
end
td do
form :action => R(CustomersN, customer.id), :method => :post do
input :type => :submit, :name => "delete", :value => "Delete"

70
templates/sass/style.sass
View File

@ -74,52 +74,28 @@ ol#menu
/* Table layout */
table
table-layout: fixed
padding: 3px 0px
border-spacing: 0px 4px
col.amount, col.hours, col.hourly_rate
width: 10%
width: 100px
col.flag
width: 3%
width: 30px
col.date
width: 9%
width: 95px
col.start_time, col.end_time
width: 5%
col.comment
width: 20%
col.customer
width: 10%
col.task
width: 20%
col.name, col.period
width: 25%
col.short_name
width: 20%
col.address
width: 20%
col.email, col.phone
width: 15%
col.number
width: 7%
&.overview
width: 50%
&.timeline
width: 100%
&.tasks
width: 60%
&.customers, &.invoice_select
width: 75%
&.invoices
width: 50%
td
padding: 0px 5px
vertical-align: top
width: 55px
col.customer, col.name
width: 150px
col.task, col.comment
width: 200px
col.short_name, col.phone
width: 120px
col.address, col.period
width: 250px
col.email, col.number
width: 170px
th
padding: 0px 5px
@ -131,15 +107,19 @@ table
background-color: $medium-grey
&.total
border-top: solid black
border-top: thin solid black
td.key
font-weight: bold
width: 80px
padding-bottom: 5px
td
padding: 0px 5px
vertical-align: top
border: inherit
&.key
font-weight: bold
width: 80px
input
width: 100%
width: 90%
input[type="submit"], input[type="reset"], input[type="checkbox"]
width: auto