X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Ftemplates%2Fbase.mako;h=888255cbb085affec730b973cd462278eb439625;hb=53c0833dd52f70a3f57f00b2dc2ca436dd76e94f;hp=d12f45688243b2b7e4d40ce4dd62f2a9a7df49bf;hpb=eadf3c3a4e49086b24dd61ead8ea95cdada8b88a;p=bluechips.git
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index d12f456..888255c 100644
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -4,16 +4,17 @@
${self.title()}
- ${h.stylesheet_link('/css/main.css')}
+ ${h.stylesheet_link('%s/css/main.css' % request.script_name)}
+ ${h.stylesheet_link('//ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/flick/jquery-ui.css')}
+ ${h.javascript_link('//ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js')}
+ ${h.javascript_link('//ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js')}
+ ${h.javascript_link('%s/js/admin.js' % request.script_name)}
- <% messages = h.flash.pop_messages() %>
- % if messages:
-
- % for message in messages:
- - ${message}
- % endfor
-
+ % if c.mobile_client:
+
% endif
+ % for message in h.flash.pop_messages():
+ ${str(message) | n}
+ % endfor
${next.body()}
@@ -67,8 +77,8 @@
%def>
<%def name="formatUser(user)">
- % if user.username == request.environ['REMOTE_USER']:
- ${user.name}
+ % if user == request.environ['user']:
+ Me
% else:
${user.name}
% endif
@@ -81,14 +91,22 @@
Spender |
Description |
Amount |
+ My Share |
|
% for e in es:
-
+ <%
+ 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))} |
% endfor
@@ -106,7 +124,13 @@
|
% for t in ts:
-
+ <%
+ if t.involves(request.environ['user']):
+ klass = 'user-involved'
+ else:
+ klass = 'user-not-involved'
+ %>
+
${t.date} |
${formatUser(t.debtor)} |
${formatUser(t.creditor)} |