added a 'My Share' column to lists of expenditures

[bluechips.git] / bluechips / templates / base.mako
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako

index 97ae8576a4281ee0bae862eb6aff564d19d2cec6..49476f16bbb8d8cda609071b3a298b24874e91fb 100644 (file)
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -7,14 +7,6 @@
      ${h.stylesheet_link('/css/main.css')}
    </head>
    <body>
-    <% messages = h.flash.pop_messages() %>
-    % if messages:
-    <ul id="flash-messages">
-    % for message in messages:
-        <li>${message}</li>
-    % endfor
-    </ul>
-    % endif
      <div id="nav" class="block">
        <table>
          <tr>
@@ -54,6 +46,9 @@
          </tr>
        </table>
      </div>
+    % for message in h.flash.pop_messages():
+      <div class="flash">${message | n}</div>
+    % endfor
      <div id="content">
        ${next.body()}
      </div>
@@ -67,7 +62,7 @@
  </%def>
  
  <%def name="formatUser(user)">
-  % if user == c.user:
+  % if user == request.environ['user']:
      <strong>Me</strong>
    % else:
      ${user.name}
@@ -81,11 +76,12 @@
        <th class="user">Spender</th>
        <th class="description">Description</th>
        <th class="amount">Amount</th>
+      <th class="share">My Share</th>
        <th class="editlink"></th>
      </tr>
      % 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 @@
          <td class="user">${formatUser(e.spender)}</td>
          <td class="description">${e.description}</td>
          <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>
        </tr>
      % endfor
@@ -113,7 +110,7 @@
      </tr>
      % for t in ts:
        <%
-        if t.involves(c.user):
+        if t.involves(request.environ['user']):
            klass = 'user-involved'
          else:
            klass = 'user-not-involved'