Removed 'Delete' links from lists of expenditures / transfers

Instead, there is now a 'Delete' button on the 'edit' page for
individual expenditures and transfers.

diff --git a/bluechips/public/css/main.css b/bluechips/public/css/main.css
index 63b82aaf324333c558dd14aa96978e0fd5e07c2d..acaa339ddf47f5349a9056e9545cb6a9ede40256 100644 (file)
--- 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 0fa65cf7c75abc4cd275cc6ca74a437bfaef4241..888255cbb085affec730b973cd462278eb439625 100644 (file)
--- 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 5d2ee103e8922dc2d68c42fe0924d2d9c3c9bd11..9db5cb8804bd12041f658486f2b8488554507dc2 100644 (file)
--- 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 7c3daa925f2d2a0fd1b28354ccd58344b43e48e3..0ef4c8dcdce4632e9e18e72ae7cb77e833ca1524 100644 (file)
--- 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>