From 53c0833dd52f70a3f57f00b2dc2ca436dd76e94f Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 18 Mar 2010 23:36:25 -0400
Subject: [PATCH] Removed 'Delete' links from lists of expenditures / transfers

Instead, there is now a 'Delete' button on the 'edit' page for
individual expenditures and transfers.
---
 bluechips/public/css/main.css           | 3 +++
 bluechips/templates/base.mako           | 4 ----
 bluechips/templates/spend/index.mako    | 4 ++++
 bluechips/templates/transfer/index.mako | 4 ++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bluechips/public/css/main.css b/bluechips/public/css/main.css
index 63b82aa..acaa339 100644
--- a/bluechips/public/css/main.css
+++ b/bluechips/public/css/main.css
@@ -82,6 +82,9 @@ table.list td.share {
     width: 90px;
     text-align: right;
 }
+table.list td.editlink {
+    width: 30px;
+}
 #totals {
     margin-bottom: 10px;
 }
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index 0fa65cf..888255c 100644
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -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>
diff --git a/bluechips/templates/spend/index.mako b/bluechips/templates/spend/index.mako
index 5d2ee10..9db5cb8 100644
--- a/bluechips/templates/spend/index.mako
+++ b/bluechips/templates/spend/index.mako
@@ -45,8 +45,12 @@
       </tr>
     % endfor
     <tr>
+      <td></td>
       <td colspan="2">
         ${h.submit(None, 'Submit', class_="submitbutton")}
+        %if c.expenditure.id:
+	<input type="button" value="Delete" onClick="window.location.href='${h.url_for(controller='spend', action='delete', id=c.expenditure.id)}'">
+	%endif
       </td>
     </tr>
   </table>
diff --git a/bluechips/templates/transfer/index.mako b/bluechips/templates/transfer/index.mako
index 7c3daa9..0ef4c8d 100644
--- a/bluechips/templates/transfer/index.mako
+++ b/bluechips/templates/transfer/index.mako
@@ -30,8 +30,12 @@
       <td>${h.text('description', c.transfer.description, size=64)}</td>
     </tr>
     <tr>
+      <td></td>
       <td colspan="2">
         <input type="submit" value="Submit" />
+        %if c.transfer.id:
+	<input type="button" value="Delete" onClick="window.location.href='${h.url_for(controller='transfer', action='delete', id=c.transfer.id)}'">
+	%endif
       </td>
     </tr>
   </table>
-- 
2.45.2