Added UI for working with tags

[bluechips.git] / bluechips / templates / base.mako

diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index 5e5feb038f83f7f3d66de748577b00b0de9a8504..43db6e4246c1871b543fc69aa83ca5a6c66c3618 100644 (file)
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -29,31 +29,31 @@
             </h1>
           </td>
           <td>
-            <a href="${h.url_for(controller='status', action='index', id=None)}">
+            <a href="${h.url_for(controller='status', action='index')}">
               <img src="${request.script_name}/icons/status.png" alt="">
               <span>Dashboard</span>
             </a>
           </td>
           <td>
-            <a href="${h.url_for(controller='spend', action='index', id=None)}">
+            <a href="${h.url_for(controller='spend', action='index')}">
               <img src="${request.script_name}/icons/spend.png" alt="">
               <span>Expense</span>
             </a>
           </td>
           <td>
-            <a href="${h.url_for(controller='transfer', action='index', id=None)}">
+            <a href="${h.url_for(controller='transfer', action='index')}">
               <img src="${request.script_name}/icons/transfer.png" alt="">
               <span>Transfer</span>
             </a>
           </td>
           <td>
-            <a href="${h.url_for(controller='history', action='index', id=None)}">
+            <a href="${h.url_for(controller='history', action='index')}">
               <img src="${request.script_name}/icons/history.png" alt="">
               <span>History</span>
             </a>
           </td>
           <td>
-            <a href="${h.url_for(controller='user', action='index', id=None)}">
+            <a href="${h.url_for(controller='user', action='index')}">
               <img src="${request.script_name}/icons/user.png" alt="">
               <span>User</span>
             </a>
@@ -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>