X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=bluechips%2Ftemplates%2Fstatus%2Findex.mako;h=377179c621c68c43bc153e0a5d71964dea999b96;hb=4d724b5efd7fd7c2c38a25e9d9210fe869aa0441;hp=5e9539dabf3f79565940f06f92a75e2e6d69cab4;hpb=3b864c81e804769f2be45b38c319895d1735aef9;p=bluechips.git

diff --git a/bluechips/templates/status/index.mako b/bluechips/templates/status/index.mako
index 5e9539d..377179c 100644
--- a/bluechips/templates/status/index.mako
+++ b/bluechips/templates/status/index.mako
@@ -1,69 +1,75 @@
 <%inherit file="/base.mako"/>
 
-<h2>Settling Transfers</h2>
+<div class="block">
+  <h2>Settling Transfers</h2>
 
-% if len(c.settle) == 0:
-<p>No need! The books are balanced!</p>
-% else:
-<p>To balance the books, the following transfers need to be made:</p>
+  % if len(c.settle) == 0:
+    <p>No need! The books are balanced!</p>
+  % else:
+    <p>To balance the books, the following transfers need to be made:</p>
 
-<table>
-    <tr>
+    <table id="balance">
+      <tr>
         <th>From</th>
         <th>To</th>
         <th>Amount</th>
-    </tr>
-    % for transfer in c.settle:
-    <tr>
-        <td>${transfer[0].username}</td>
-        <td>${transfer[1].username}</td>
-        <td>${transfer[2]}</td>
-    </tr>
-    % endfor
-</table>
-% endif
+      </tr>
+      % for transfer in c.settle:
+        <tr>
+          <td>${transfer[0].name}</td>
+          <td>${transfer[1].name}</td>
+          <td class="amount">${transfer[2]}</td>
+        </tr>
+      % endfor
+      % if c.net != 0:
+        <tr>
+          <th colspan="2">
+            % if c.net > 0:
+              The group owes you:
+            % elif c.net < 0:
+              You owe the group:
+            % endif
+          </th>
+          <th class="amount">${abs(c.net)}</th>
+        </tr>
+      % endif
+    </table>
+  % endif
+</div>
 
-<h2>Totals</h2>
+<div class="block">
+  <h2>Totals</h2>
 
-<table>
-    <tr>
-        <td>Total</td>
-        <td>${c.total}</td>
-    </tr>
-    <tr>
-        <td>Past year</td>
-        <td>${c.year_total}</td>
-    </tr>
+  <table id="totals">
     <tr>
-        <td>Year to date</td>
-        <td>${c.this_year_total}</td>
+      <td class="scope"></td>
+      <th class="scope">Everyone</th>
+      <th class="scope">My Share</th>
     </tr>
-    <tr>
-        <td>Month to date</td>
-        <td>${c.this_month_total}</td>
-    </tr>
-    <tr>
-        <td>Last month</td>
-        <td>${c.last_month_total}</td>
-    </tr>
-</table>
-
-<h2>Add a new transaction</h2>
-
-<ul>
-    <li>${h.link_to('Expenditure for the group', h.url_for(controller='spend', action='index'))}</li>
-    <li>${h.link_to('Transfer between two people', h.url_for(controller='transfer', action='index'))}</li>
-</ul>
-
-<h2>Your History</h2>
+    % for period in ('Total', 'Past year', 'Year to date', 'Month to date', 'Last month'):
+      <tr>
+        <th>${period}</th>
+        % for scope in ('all', 'mine'):
+          <td>${c.totals[period][scope]}</td>
+        % endfor
+      </tr>
+    % endfor
+  </table>
+</div>
 
-${h.link_to('See all history', h.url_for(controller='history',
-                                         action='index'))}
+<div class="block">
+  <h2>
+    Your History
+    <span class="see-all">
+      ${h.link_to('See all history', h.url_for(controller='history', action='index'))}
+    </span>
+  </h2>
 
-<h3>Expenditures</h3>
+  <h3>Expenditures</h3>
 
-${self.listExpenditures(c.expenditures)}
+  ${self.listExpenditures(c.expenditures)}
 
-<h3>Transfers</h3>
+  <h3>Transfers</h3>
 
-${self.listTransfers(c.transfers)}
+  ${self.listTransfers(c.transfers)}
+</div>