X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/c8abf2d9dff72d41e340aa0f6948c0c7583d736e..13f4f111d192012443342f75f2608a59dad413a2:/portal.mlt

diff --git a/portal.mlt b/portal.mlt
index 8f0f553..e9d82fe 100644
--- a/portal.mlt
+++ b/portal.mlt
@@ -1,19 +1,24 @@
 <% val you = Init.getUser();
 val bal = Balance.lookupBalance (#bal you);
 val deposit = Balance.depositAmount (#id bal);
+val showBal = Util.sub (#amount bal, deposit);
 @header [] %>
 
 <% @payment [] %>
 
 <h3><a href="money">Your recent account activity</a></h3>
 
+<% ref running = showBal %>
 <table>
-<tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> </tr>
+<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> </tr>
-<% end %>
+<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 %></tr>
+<% running := Util.sub (running, amount)
+end %>
 </table>
-<b>Balance: $<% Util.sub (#amount bal, deposit) %></b><br>
+<a href="money?lookback=inf">Show all transactions</a><br>
+<b>Balance: $<% showBal %></b><br>
 <b>Deposit: $<% deposit %></b> (3 months of dues at the minimal <a href="pledge">pledge level</a>)
 
 <!--b>Balance: $<% #amount bal %></b-->
@@ -46,4 +51,15 @@ end %>
 <% end
 end;
 
+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><%
+       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>
+       <% end %>
+       </table>
+<% end;
+
 @footer [] %>