X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/cf10853e30dc8918629f950b523838bf4d08edaf..b7b8862b65e3a2be9daaef4f2850d9ebafebe4c3:/portal.mlt

diff --git a/portal.mlt b/portal.mlt
index 42d2eb7..37f66a4 100644
--- a/portal.mlt
+++ b/portal.mlt
@@ -1,18 +1,40 @@
 <% val you = Init.getUser();
 val bal = Balance.lookupBalance (#bal you);
+val deposit = Balance.depositAmount (#id bal);
+val showBal = Util.sub (#amount bal, deposit);
 @header [] %>
 
+<div style="border: 1px solid goldenrod; background-color: palegoldenrod;">
+
+<h3>Notice: Google Checkout Is Gone</h3>
+
+<p>Google Checkout shut down in November 2013 so we only have Paypal
+available for processing payments currently. We are in the process of
+selecting a second (and possibly third) payment processor; you can
+contribute to the discussion by <a
+href="http://wiki.hcoop.net/PaymentProcessor2014">visiting the wiki
+discussion</a>.
+
+</div>
+
 <% @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: $<% #amount bal %></b>
+<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-->
 
 <% val polls = Poll.listCurrentPolls ();
 switch polls of
@@ -40,6 +62,17 @@ switch issues of
 end %>
 <br>
 <% 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 [] %>
\ No newline at end of file
+@footer [] %>