web: small column heading improvements

This commit is contained in:
Simon Michael 2014-05-23 22:37:39 -07:00
parent b22cb66319
commit adde48a805

View File

@ -383,10 +383,10 @@ journalTransactionsReportAsHtml :: WebOpts -> ViewData -> TransactionsReport ->
journalTransactionsReportAsHtml _ vd (_,items) = [hamlet| journalTransactionsReportAsHtml _ vd (_,items) = [hamlet|
<table.transactionsreport> <table.transactionsreport>
<tr.headings> <tr.headings>
<th.date align=left>Date <th.date style="text-align:left;">Date
<th.description align=left>Description <th.description style="text-align:left;">Description
<th.account align=left>Accounts <th.account style="text-align:left;">Accounts
<th.amount align=right>Amount <th.amount style="text-align:right;">Amount
$forall i <- numberTransactionsReportItems items $forall i <- numberTransactionsReportItems items
^{itemAsHtml vd i} ^{itemAsHtml vd i}
|] |]
@ -397,7 +397,7 @@ journalTransactionsReportAsHtml _ vd (_,items) = [hamlet|
<tr.item.#{evenodd}.#{firstposting}> <tr.item.#{evenodd}.#{firstposting}>
<td.date>#{date} <td.date>#{date}
<td.description colspan=2>#{elideRight 60 desc} <td.description colspan=2>#{elideRight 60 desc}
<td.amount align=right> <td.amount style="text-align:right;">
$if showamt $if showamt
\#{mixedAmountAsHtml amt} \#{mixedAmountAsHtml amt}
$forall p' <- tpostings t $forall p' <- tpostings t
@ -405,7 +405,7 @@ $forall p' <- tpostings t
<td.date> <td.date>
<td.description> <td.description>
<td.account>&nbsp;<a href="@?{accountUrl here $ paccount p'}" title="Show transactions in #{paccount p'}">#{elideRight 40 $ paccount p'} <td.account>&nbsp;<a href="@?{accountUrl here $ paccount p'}" title="Show transactions in #{paccount p'}">#{elideRight 40 $ paccount p'}
<td.amount align=right>#{mixedAmountAsHtml $ pamount p'} <td.amount style="text-align:right;">#{mixedAmountAsHtml $ pamount p'}
|] |]
where where
evenodd = if even n then "even" else "odd" :: String evenodd = if even n then "even" else "odd" :: String
@ -428,13 +428,13 @@ registerItemsHtml :: WebOpts -> ViewData -> TransactionsReport -> HtmlUrl AppRou
registerItemsHtml _ vd (balancelabel,items) = [hamlet| registerItemsHtml _ vd (balancelabel,items) = [hamlet|
<table.registerreport> <table.registerreport>
<tr.headings> <tr.headings>
<th.date align=left>Date <th.date style="text-align:left;">Date
<th.description align=left>Description <th.description style="text-align:left;">Description
<th.account align=left>To/From Account <th.account style="text-align:left;">To/From Account(s)
<!-- \ # <!-- \ #
<a#all-postings-toggle-link.togglelink href="#" title="Toggle all split postings">[+] --> <a#all-postings-toggle-link.togglelink href="#" title="Toggle all split postings">[+] -->
<th.amount align=right>Amount <th.amount style="text-align:right;">Amount
<th.balance align=right>#{balancelabel} <th.balance style="text-align:right;">#{balancelabel}
$forall i <- numberTransactionsReportItems items $forall i <- numberTransactionsReportItems items
^{itemAsHtml vd i} ^{itemAsHtml vd i}
@ -453,17 +453,17 @@ registerItemsHtml _ vd (balancelabel,items) = [hamlet|
&nbsp; &nbsp;
<a.postings-toggle-link.togglelink href="#" title="Toggle all postings"> <a.postings-toggle-link.togglelink href="#" title="Toggle all postings">
[+] [+]
<td.amount align=right> <td.amount style="text-align:right; white-space:nowrap;">
$if showamt $if showamt
\#{mixedAmountAsHtml amt} \#{mixedAmountAsHtml amt}
<td.balance align=right>#{mixedAmountAsHtml bal} <td.balance style="text-align:right;">#{mixedAmountAsHtml bal}
$forall p' <- tpostings t $forall p' <- tpostings t
<tr.item.#{evenodd}.posting style=#{postingsdisplaystyle}> <tr.item.#{evenodd}.posting style=#{postingsdisplaystyle}>
<td.date> <td.date>
<td.description> <td.description>
<td.account>&nbsp;<a href="@?{accountUrl here $ paccount p'}" title="Show transactions in #{paccount p'}">#{elideRight 40 $ paccount p'} <td.account>&nbsp;<a href="@?{accountUrl here $ paccount p'}" title="Show transactions in #{paccount p'}">#{elideRight 40 $ paccount p'}
<td.amount align=right>#{mixedAmountAsHtml $ pamount p'} <td.amount style="text-align:right;">#{mixedAmountAsHtml $ pamount p'}
<td.balance align=right> <td.balance style="text-align:right;">
|] |]
where where
evenodd = if even n then "even" else "odd" :: String evenodd = if even n then "even" else "odd" :: String