Improve long table display

* Alternate row colors with css
* Right align money and kilobytes columns

diff --git a/money.mlt b/money.mlt
index e846c3f..9129de9 100644 (file)
--- a/money.mlt
+++ b/money.mlt
@@ -7,7 +7,7 @@ ref showNormal = true;
 if $"hist" <> "" then
        showNormal := false;
        val id = Web.stoi ($"hist") %>
-<table>
+<table class="data">
 <tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> </tr>
 <% foreach (amount, trn) in Money.listUserTransactions id do %>
 <tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td><% amount %>/<% #amount trn %></td> </tr>
@@ -20,7 +20,7 @@ if $"hist" <> "" then
 
 <h3>Transactions</h3>
 
-<table>
+<table class="data">
 <tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> <td><b>Last modified</b></td> <td><b>Participants</b></td> </tr>
 <% foreach trn in Money.listTransactions () do %>
 <tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td><% #amount trn %></td> <td><% #stamp trn %></td>
@@ -42,10 +42,10 @@ end %>
 
 <h3>Primary Transactions</h3>
 
-<table>
+<table class="data">
 <tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> <td><b>Last modified</b></td> <td><b>Participants</b></td> </tr>
 <% foreach (amt, trn) in Money.listUserTransactions (valOf (Init.userNameToId "hcoop")) do %>
-<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td><% #amount trn %></td> <td><% #stamp trn %></td>
+<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td style="text-align: right"><% #amount trn %></td> <td><% #stamp trn %></td>
 <% switch Money.listChargesWithNames (#id trn) of
          [(name, cha)] => %><td><a href="user?id=<% #usr cha %>"><% name %></a></td><%
        | _ => %><td><i>multi</i></td><%
@@ -579,7 +579,7 @@ elseif $"cmd" = "checkout" then
 elseif $"cmd" = "delinq" then
        showNormal := false;
        val dqs = Money.delinquentPledgers () %>
-<table>
+<table class="data">
 <tr> <th>Member</th> <th>Pledge</th> <th>Balance</th> </tr>
 <% foreach dq in dqs do %>
 <tr> <td><a href="user?id=<% #id dq %>"><% #name dq %></a></td> <td><% #shares dq %></td> <td>$<% #balance dq %></td> </tr>
@@ -670,7 +670,7 @@ Co-op balance: $<% #amount (Balance.lookupBalance (valOf (Balance.balanceNameToI
 
 <h3>Apply Stripe Payments</h3>
 
-<table>
+<table class="data">
 <tr><td><strong>Date</strong></td><td><strong>Member</strong></td>
     <td><strong>Name on Card</strong></td>
     <td><strong>Amount</strong> (After Fees)</td><td><td></td>
@@ -681,7 +681,7 @@ Co-op balance: $<% #amount (Balance.lookupBalance (valOf (Balance.balanceNameToI
   <td><% #name (Init.lookupUser (#webuser_id stripePmt)) %></td>
   <td><% #paid_on stripePmt %></td>
   <td><% #card_name stripePmt %>
-  <td>$<% #net stripePmt %></td>
+  <td style="text-align: right">$<% #net stripePmt %></td>
   <td><form method="post">
         <input type="hidden" name="cmd" value="stripeApply" />
         <input type="hidden" name="stripeId" value="<% #charge_id stripePmt %>" />
@@ -696,10 +696,10 @@ Co-op balance: $<% #amount (Balance.lookupBalance (valOf (Balance.balanceNameToI
 
 
 
-<table>
+<table class="data">
 <tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> <td><b>Participants</b></td> <td><b>Replace</b></td> <td><b>Delete</b></td> </tr>
 <% foreach trn in Money.listTransactionsLimit 20 do %>
-<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td><% #amount trn %></td>
+<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td style="text-align: right"><% #amount trn %></td>
 <% switch Money.listChargesWithNames (#id trn) of
          [(name, cha)] => %><td><a href="user?id=<% #usr cha %>"><% name %></a></td><%
        | _ => %><td><i>multi</i></td><%
@@ -726,13 +726,13 @@ val trans = iff lookback = 0 then
         Money.listUserTransactions (Init.getUserId ())
     else
        Money.listUserTransactionsLimit (Init.getUserId (), lookback) %>
-<table>
+<table class="data">
 <tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Debit</b></td> <td><b>Credit</b></td> <td><b>Balance</b></td></tr>
 <% foreach (amount, trn) in trans do %>
 <tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td>
-<td align="right"><% if Util.lt (amount, 0.0) then %><% amount %><% end %></td>
-<td align="right"><% if Util.ge (amount, 0.0) then %><% amount %><% end %></td>
-<td><% running %></tr>
+<td style="text-align: right"><% if Util.lt (amount, 0.0) then %><% amount %><% end %></td>
+<td style="text-align: right"><% if Util.ge (amount, 0.0) then %><% amount %><% end %></td>
+<td style="text-align: right"><% running %></tr>
 <% running := Util.sub (running, amount)
 end %>
 </table>

diff --git a/portal.mlt b/portal.mlt
index cdba951..3d19c19 100644 (file)
--- a/portal.mlt
+++ b/portal.mlt
@@ -22,11 +22,11 @@ discussion</a>.
 <h3><a href="money">Your recent account activity</a></h3>
 
 <% ref running = showBal %>
-<table>
+<table class="data">
 <tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> <td><b>Balance</b></td></tr>
 <% foreach (amount, trn) in Money.listUserTransactionsLimit (Init.getUserId (), 5) do %>
-<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td><% amount %>/<% #amount trn %></td>
-<td><% running %></td></tr>
+<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td style="text-align: right"><% amount %>/<% #amount trn %></td>
+<td style="text-align: right"><% running %></td></tr>
 <% running := Util.sub (running, amount)
 end %>
 </table>
@@ -42,7 +42,7 @@ end %>
        (Init.getUserId () ) do %>
 <tr>
   <td><% #paid_on stripePmt %></td>
-  <td>$<% #net stripePmt %></td>
+  <td style="text-align: right">$<% #net stripePmt %></td>
 </tr>
 <% end %>
 </table>
@@ -82,9 +82,9 @@ val {total, vhosts} = Stats.getWebbwUser {user = Init.getUserName (), last = 0};
 switch vhosts of
        _ :: _ =>
        %><h3>Your web traffic this month</h3>
-       <table><tr><th>Site</th> <th>Data transferred (kB)</th></tr><%
+       <table class="data"><tr><th>Site</th> <th>Data transferred (kB)</th></tr><%
        foreach e in vhosts do %>
-                      <tr><td align="right"><a href="<% if #ssl (#host e) then %>https<% else %>http<% end %>://<% #hostname (#host e) %>/"><% #hostname (#host e) %><% if #ssl (#host e) then %> (SSL)<% end %></a> <a href="/webalizer/<% #id (#host e) %>/">[detail]</a></td><td><% #size e %></td></tr>
+                      <tr><td style="text-align: right"><a href="<% if #ssl (#host e) then %>https<% else %>http<% end %>://<% #hostname (#host e) %>/"><% #hostname (#host e) %><% if #ssl (#host e) then %> (SSL)<% end %></a> <a href="/webalizer/<% #id (#host e) %>/">[detail]</a></td><td style="text-align: right"><% #size e %></td></tr>
        <% end %>
        </table>
 <% end;

diff --git a/webbw.mlt b/webbw.mlt
index 272a281..04fc57a 100644 (file)
--- a/webbw.mlt
+++ b/webbw.mlt
@@ -15,13 +15,13 @@
                else    
                        Stats.getWebbw (Web.stoi ($"last")) %>
 
-<table>
+<table class="data">
 <tr><td></td><td><b>Bandwidth (kB)</b></td></tr>
-<tr><td align="right"><b>Total Apache bandwidth</b></td> <td><% #total stats %></td></tr>
+<tr><td style="text-align: right"><b>Total Apache bandwidth</b></td> <td style="text-align: right"><% #total stats %></td></tr>
 <tr><td>&nbsp;</td></tr>
 
 <% foreach dom in #vhosts stats do %>
-       <tr><td align="right"><a href="<% if #ssl (#host dom) then %>https<% else %>http<% end %>://<% #hostname (#host dom) %>/"><% #hostname (#host dom) %><% if #ssl (#host dom) then %> (SSL)<% end %></a> <a href="/webalizer/<% #id (#host dom) %>/">[detail]</a></td><td><% #size dom %></td></tr>
+       <tr><td style="text-align: right"><a href="<% if #ssl (#host dom) then %>https<% else %>http<% end %>://<% #hostname (#host dom) %>/"><% #hostname (#host dom) %><% if #ssl (#host dom) then %> (SSL)<% end %></a> <a href="/webalizer/<% #id (#host dom) %>/">[detail]</a></td><td style="text-align: right"><% #size dom %></td></tr>
 <% end %>
 
 </table>
@@ -44,4 +44,4 @@
 
 </table>
 
-</body></html>
\ No newline at end of file
+</body></html>