X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Ftemplates%2Fbase.mako;h=49476f16bbb8d8cda609071b3a298b24874e91fb;hb=ed8863d32a4d626a02bf1c5c930253003068ea3f;hp=97ae8576a4281ee0bae862eb6aff564d19d2cec6;hpb=3b08315d7a6dee99e751f16b9a5a050884bf54f8;p=bluechips.git
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index 97ae857..49476f1 100644
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -7,14 +7,6 @@
${h.stylesheet_link('/css/main.css')}
- <% messages = h.flash.pop_messages() %>
- % if messages:
-
- % for message in messages:
- - ${message}
- % endfor
-
- % endif
+ % for message in h.flash.pop_messages():
+ ${message | n}
+ % endfor
${next.body()}
@@ -67,7 +62,7 @@
%def>
<%def name="formatUser(user)">
- % if user == c.user:
+ % if user == request.environ['user']:
Me
% else:
${user.name}
@@ -81,11 +76,12 @@
Spender |
Description |
Amount |
+ My Share |
|
% for e in es:
<%
- if e.involves(c.user):
+ if e.involves(request.environ['user']):
klass = 'user-involved'
else:
klass = 'user-not-involved'
@@ -95,6 +91,7 @@
${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))} |
% endfor
@@ -113,7 +110,7 @@
% for t in ts:
<%
- if t.involves(c.user):
+ if t.involves(request.environ['user']):
klass = 'user-involved'
else:
klass = 'user-not-involved'