X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=inline;f=bluechips%2Ftemplates%2Fbase.mako;h=888255cbb085affec730b973cd462278eb439625;hb=4d724b5efd7fd7c2c38a25e9d9210fe869aa0441;hp=fe328ad50c76c1f368cd9f65bf5f6bef848bf255;hpb=74f3c8399c93de554d6885412008a00bf2752640;p=bluechips.git

diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index fe328ad..888255c 100644
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -29,31 +29,31 @@
             </h1>
           </td>
           <td>
-            <a href="${h.url_for(controller='status', action='index', id=None)}">
+            <a href="${h.url_for(controller='status', action='index')}">
               <img src="${request.script_name}/icons/status.png" alt="">
               <span>Dashboard</span>
             </a>
           </td>
           <td>
-            <a href="${h.url_for(controller='spend', action='index', id=None)}">
+            <a href="${h.url_for(controller='spend', action='index')}">
               <img src="${request.script_name}/icons/spend.png" alt="">
               <span>Expense</span>
             </a>
           </td>
           <td>
-            <a href="${h.url_for(controller='transfer', action='index', id=None)}">
+            <a href="${h.url_for(controller='transfer', action='index')}">
               <img src="${request.script_name}/icons/transfer.png" alt="">
               <span>Transfer</span>
             </a>
           </td>
           <td>
-            <a href="${h.url_for(controller='history', action='index', id=None)}">
+            <a href="${h.url_for(controller='history', action='index')}">
               <img src="${request.script_name}/icons/history.png" alt="">
               <span>History</span>
             </a>
           </td>
           <td>
-            <a href="${h.url_for(controller='user', action='index', id=None)}">
+            <a href="${h.url_for(controller='user', action='index')}">
               <img src="${request.script_name}/icons/user.png" alt="">
               <span>User</span>
             </a>
@@ -62,7 +62,7 @@
       </table>
     </div>
     % for message in h.flash.pop_messages():
-      <div class="flash">${message | n}</div>
+      <div class="flash">${str(message) | n}</div>
     % endfor
     <div id="content">
       ${next.body()}
@@ -93,7 +93,6 @@
       <th class="amount">Amount</th>
       <th class="share">My Share</th>
       <th class="editlink"></th>
-      <th class="deletelink"></th>
     </tr>
     % for e in es:
       <%
@@ -109,7 +108,6 @@
         <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>
-        <td class="deletelink">${h.link_to('Delete', h.url_for(controller='spend', action='delete', id=e.id))}</td>
       </tr>
     % endfor
   </table>
@@ -124,7 +122,6 @@
       <th class="description">Description</th>
       <th class="amount">Amount</th>
       <th class="editlink"></th>
-      <th class="deletelink"></th>
     </tr>
     % for t in ts:
       <%
@@ -140,7 +137,6 @@
         <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>
-        <td class="deletelink">${h.link_to('Delete', h.url_for(controller='transfer', action='delete', id=t.id))}</td>
       </tr>
     % endfor
   </table>