X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Ftemplates%2Fbase.mako;h=e44a9ee148441d25e668f784c9d19de33091e955;hb=5a2b93f758a19dc3c354c636903a4944b6aff305;hp=97ae8576a4281ee0bae862eb6aff564d19d2cec6;hpb=3b08315d7a6dee99e751f16b9a5a050884bf54f8;p=bluechips.git diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako index 97ae857..e44a9ee 100644 --- a/bluechips/templates/base.mako +++ b/bluechips/templates/base.mako @@ -5,16 +5,9 @@ ${self.title()} ${h.stylesheet_link('/css/main.css')} + ${h.stylesheet_link('/js/jquery.date_input.css')} - <% messages = h.flash.pop_messages() %> - % if messages: - - % endif + % for message in h.flash.pop_messages(): +
${message | n}
+ % endfor
${next.body()}
+ ${h.javascript_link('/js/jquery-1.3.2.js')} + ${h.javascript_link('/js/jquery.date_input.js')} + ${h.javascript_link('/js/admin.js')} @@ -67,7 +72,7 @@ <%def name="formatUser(user)"> - % if user == c.user: + % if user == request.environ['user']: Me % else: ${user.name} @@ -81,11 +86,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 +101,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 +120,7 @@ % for t in ts: <% - if t.involves(c.user): + if t.involves(request.environ['user']): klass = 'user-involved' else: klass = 'user-not-involved'