]> asedeno.scripts.mit.edu Git - bluechips.git/blobdiff - bluechips/templates/base.mako
projects / bluechips.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
big interface overhaul, doesn't really add any new features yet
[bluechips.git] / bluechips / templates / base.mako
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index 8403b016f956db65c7c0039e000b4fbdb08fa640..d12f45688243b2b7e4d40ce4dd62f2a9a7df49bf 100644 (file)
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -7,7 +7,6 @@
     ${h.stylesheet_link('/css/main.css')}
   </head>
   <body>
-    <h1>${self.title()}</h1>
     <% messages = h.flash.pop_messages() %>
     % if messages:
     <ul id="flash-messages">
@@ -16,21 +15,44 @@
     % endfor
     </ul>
     % endif
-    <div id="nav">
-      <ul>
-        <li>${h.link_to('Dashboard', h.url_for(controller='status',
-                                               action='index',
-                                               id=None))}</li>
-        <li>${h.link_to('Expense', h.url_for(controller='spend',
-                                             action='index',
-                                             id=None))}</li>
-        <li>${h.link_to('Transfer', h.url_for(controller='transfer',
-                                              action='index',
-                                              id=None))}</li>
-        <li>${h.link_to('History', h.url_for(controller='history',
-                                             action='index',
-                                             id=None))}</li>
-      </ul>
+    <div id="nav" class="block">
+      <table>
+        <tr>
+          <td>
+            <h1 class="title">
+              % if c.title:
+                ${c.title}
+              % else:
+                BlueChips
+              % endif
+            </h1>
+          </td>
+          <td>
+            <a href="${h.url_for(controller='status', action='index', id=None)}">
+              <img src="/icons/dashboard.png" alt="">
+              <span>Dashboard</span>
+            </a>
+          </td>
+          <td>
+            <a href="${h.url_for(controller='spend', action='index', id=None)}">
+              <img src="/icons/spend.png" alt="">
+              <span>Expense</span>
+            </a>
+          </td>
+          <td>
+            <a href="${h.url_for(controller='transfer', action='index', id=None)}">
+              <img src="/icons/transfer.png" alt="">
+              <span>Transfer</span>
+            </a>
+          </td>
+          <td>
+            <a href="${h.url_for(controller='history', action='index', id=None)}">
+              <img src="/icons/history.png" alt="">
+              <span>History</span>
+            </a>
+          </td>
+        </tr>
+      </table>
     </div>
     <div id="content">
       ${next.body()}
@@ -44,50 +66,62 @@
 % endif
 </%def>
 
+<%def name="formatUser(user)">
+  % if user.username == request.environ['REMOTE_USER']:
+    <strong>${user.name}</strong>
+  % else:
+    ${user.name}
+  % endif
+</%def>
+
 <%def name="listExpenditures(es)">
-<table>
+  <table class="list">
     <tr>
-        <th>Date</th>
-        <th>Spender</th>
-        <th>Description</th>
-        <th>Amount</th>
-        <th></th>
+      <th class="date">Date</th>
+      <th class="user">Spender</th>
+      <th class="description">Description</th>
+      <th class="amount">Amount</th>
+      <th class="editlink"></th>
     </tr>
     % for e in es:
-    <tr>
-        <td>${e.date}</td>
-        <td>${e.spender.name}</td>
-        <td>${e.description}</td>
-        <td>${e.amount}</td>
-        <td>${h.link_to('Edit', h.url_for(controller='spend', 
-                                          action='edit',
-                                          id=e.id))}</td>
-    </tr>
+      <tr>
+        <td class="date">${e.date}</td>
+        <td class="user">${formatUser(e.spender)}</td>
+        <td class="description">${e.description}</td>
+        <td class="amount">${e.amount}</td>
+        <td class="editlink">${h.link_to('Edit', h.url_for(controller='spend', action='edit', id=e.id))}</td>
+      </tr>
     % endfor
-</table>
+  </table>
 </%def>
 
 <%def name="listTransfers(ts)">
-<table>
+  <table class="list">
     <tr>
-        <th>Date</th>
-        <th>From</th>
-        <th>To</th>
-        <th>Description</th>
-        <th>Amount</th>
-        <th></th>
+      <th class="date">Date</th>
+      <th class="user">From</th>
+      <th class="user">To</th>
+      <th class="description">Description</th>
+      <th class="amount">Amount</th>
+      <th class="editlink"></th>
     </tr>
     % for t in ts:
-    <tr>
-        <td>${t.date}</td>
-        <td>${t.debtor.name}</td>
-        <td>${t.creditor.name}</td>
-        <td>${t.description}</td>
-        <td>${t.amount}</td>
-        <td>${h.link_to('Edit', h.url_for(controller='transfer', 
-                                          action='edit',
-                                          id=t.id))}</td>
-    </tr>
+      <tr>
+        <td class="date">${t.date}</td>
+        <td class="user">${formatUser(t.debtor)}</td>
+        <td class="user">${formatUser(t.creditor)}</td>
+        <td class="description">${t.description}</td>
+        <td class="amount">${t.amount}</td>
+        <td class="editlink">${h.link_to('Edit', h.url_for(controller='transfer', action='edit', id=t.id))}</td>
+      </tr>
     % endfor
-</table>
+  </table>
+</%def>
+
+<%def name="expenditureIcon()">
+&larr;<span class="dollarsign">&rarr;
+</%def>
+
+<%def name="transferIcon()">
+<span class="dollarsign">$</span>&rarr;<span class="dollarsign">$</span>
 </%def>
http://bluechi.ps/