X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Ftemplates%2Fbase.mako;h=43db6e4246c1871b543fc69aa83ca5a6c66c3618;hb=fed6d11d2cbd6d617d18bc01a78196865da4155b;hp=0fa65cf7c75abc4cd275cc6ca74a437bfaef4241;hpb=9030048b2ba248a47c90643b520a1e1c601bc296;p=bluechips.git

diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index 0fa65cf..43db6e4 100644
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -84,7 +84,7 @@
   % endif
 </%def>
 
-<%def name="listExpenditures(es)">
+<%def name="listExpenditures(es, total=None, share=None)">
   <table class="list">
     <tr>
       <th class="date">Date</th>
@@ -93,7 +93,6 @@
       <th class="amount">Amount</th>
       <th class="share">My Share</th>
       <th class="editlink"></th>
-      <th class="deletelink"></th>
     </tr>
     % for e in es:
       <%
@@ -109,9 +108,17 @@
         <td class="amount">${e.amount}</td>
         <td class="share">${e.share(request.environ['user'])}</td>
         <td class="editlink">${h.link_to('Edit', h.url_for(controller='spend', action='edit', id=e.id))}</td>
-        <td class="deletelink">${h.link_to('Delete', h.url_for(controller='spend', action='delete', id=e.id))}</td>
       </tr>
     % endfor
+    % if total is not None and share is not None:
+      <tr class="user-involved">
+        <td class="total" colspan=3></td>
+	<td class="total">${total}</td>
+	<td class="total">${share}</td>
+	<td class="total"></td>
+      </tr>
+
+    % endif
   </table>
 </%def>
 
@@ -124,7 +131,6 @@
       <th class="description">Description</th>
       <th class="amount">Amount</th>
       <th class="editlink"></th>
-      <th class="deletelink"></th>
     </tr>
     % for t in ts:
       <%
@@ -140,12 +146,19 @@
         <td class="description">${t.description}</td>
         <td class="amount">${t.amount}</td>
         <td class="editlink">${h.link_to('Edit', h.url_for(controller='transfer', action='edit', id=t.id))}</td>
-        <td class="deletelink">${h.link_to('Delete', h.url_for(controller='transfer', action='delete', id=t.id))}</td>
       </tr>
     % endfor
   </table>
 </%def>
 
+<%def name="listTags()">
+<%
+x = ',\n'.join([h.link_to(tag.name, h.url_for(controller='history', action='tag', id=tag.id)) for tag in c.tags])
+%>
+${x|n}
+</%def>
+
+
 <%def name="expenditureIcon()">
 &larr;<span class="dollarsign">&rarr;
 </%def>