X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Ftemplates%2Fbase.mako;h=0fa65cf7c75abc4cd275cc6ca74a437bfaef4241;hb=9030048b2ba248a47c90643b520a1e1c601bc296;hp=8403b016f956db65c7c0039e000b4fbdb08fa640;hpb=37cc44480ccdc7fb1d6d24ca4c388b6ac755ed0c;p=bluechips.git
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index 8403b01..0fa65cf 100644
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -4,34 +4,66 @@
-
- - ${h.link_to('Dashboard', h.url_for(controller='status',
- action='index',
- id=None))}
- - ${h.link_to('Expense', h.url_for(controller='spend',
- action='index',
- id=None))}
- - ${h.link_to('Transfer', h.url_for(controller='transfer',
- action='index',
- id=None))}
- - ${h.link_to('History', h.url_for(controller='history',
- action='index',
- id=None))}
-
+
+ % for message in h.flash.pop_messages():
+
${str(message) | n}
+ % endfor
${next.body()}
@@ -44,50 +76,80 @@
% endif
%def>
+<%def name="formatUser(user)">
+ % if user == request.environ['user']:
+
Me
+ % else:
+ ${user.name}
+ % endif
+%def>
+
<%def name="listExpenditures(es)">
-
+
- Date |
- Spender |
- Description |
- Amount |
- |
+ Date |
+ Spender |
+ Description |
+ Amount |
+ My Share |
+ |
+ |
% for e in es:
-
- ${e.date} |
- ${e.spender.name} |
- ${e.description} |
- ${e.amount} |
- ${h.link_to('Edit', h.url_for(controller='spend',
- action='edit',
- id=e.id))} |
-
+ <%
+ if e.involves(request.environ['user']):
+ klass = 'user-involved'
+ else:
+ klass = 'user-not-involved'
+ %>
+
+ ${e.date} |
+ ${formatUser(e.spender)} |
+ ${e.description} |
+ ${e.amount} |
+ ${e.share(request.environ['user'])} |
+ ${h.link_to('Edit', h.url_for(controller='spend', action='edit', id=e.id))} |
+ ${h.link_to('Delete', h.url_for(controller='spend', action='delete', id=e.id))} |
+
% endfor
-
+
%def>
<%def name="listTransfers(ts)">
-
+
- Date |
- From |
- To |
- Description |
- Amount |
- |
+ Date |
+ From |
+ To |
+ Description |
+ Amount |
+ |
+ |
% for t in ts:
-
- ${t.date} |
- ${t.debtor.name} |
- ${t.creditor.name} |
- ${t.description} |
- ${t.amount} |
- ${h.link_to('Edit', h.url_for(controller='transfer',
- action='edit',
- id=t.id))} |
-
+ <%
+ if t.involves(request.environ['user']):
+ klass = 'user-involved'
+ else:
+ klass = 'user-not-involved'
+ %>
+
+ ${t.date} |
+ ${formatUser(t.debtor)} |
+ ${formatUser(t.creditor)} |
+ ${t.description} |
+ ${t.amount} |
+ ${h.link_to('Edit', h.url_for(controller='transfer', action='edit', id=t.id))} |
+ ${h.link_to('Delete', h.url_for(controller='transfer', action='delete', id=t.id))} |
+
% endfor
-
+
+%def>
+
+<%def name="expenditureIcon()">
+←
→
+%def>
+
+<%def name="transferIcon()">
+$→$
%def>