A bundle of minor improvements

[hcoop/portal.git] / portal.mlt

diff --git a/portal.mlt b/portal.mlt
index f41f567..3d19c19 100644 (file)
--- a/portal.mlt
+++ b/portal.mlt
@@ -4,18 +4,17 @@ val deposit = Balance.depositAmount (#id bal);
 val showBal = Util.sub (#amount bal, deposit);
 @header [] %>
 
-<div style="border: 2px solid red; background-color: LightSalmon;">
-
-<h3>Notice: Transition to Upgraded Servers in Progress</h3>
-
-<p>We are now providing a more powerful shell server and web server
-running Debian Squeeze. All members <strong>must take action</strong>
-to run their services on the new machines. There are also changes to
-mail routing that require action by most members. Read the <a
-href="http://wiki.hcoop.net/NavajosBogMigrationGuide">migration
-guide</a> for details on what you need to do to keep your account
-working. We have also called a roll call, so check your spam folder
-for recent mail from hcoop if you have not received it.
+<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 [] %>
@@ -23,11 +22,11 @@ for recent mail from hcoop if you have not received it.
 <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 %></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>
@@ -35,6 +34,20 @@ end %>
 <b>Balance: $<% showBal %></b><br>
 <b>Deposit: $<% deposit %></b> (3 months of dues at the minimal <a href="pledge">pledge level</a>)
 
+<h3>Pending Stripe Payments</h3>
+
+<table>
+<tr><td><strong>Date</strong></td><td><strong>Net Amount</strong> (After Fees)</td></tr>
+<% foreach stripePmt in Money.listUserPendingStripePayments
+       (Init.getUserId () ) do %>
+<tr>
+  <td><% #paid_on stripePmt %></td>
+  <td style="text-align: right">$<% #net stripePmt %></td>
+</tr>
+<% end %>
+</table>
+
+
 <!--b>Balance: $<% #amount bal %></b-->
 
 <% val polls = Poll.listCurrentPolls ();
@@ -69,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;