From 0261de4c10bec5272e6c4a6f7b32707be55f7cf4 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Wed, 21 Dec 2011 19:27:47 +0000
Subject: [PATCH] Make confirm_delete modal generic

---
 public/scripts/main.js           | 16 ++++++++--------
 source/webui/templates/admin.tpl |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/scripts/main.js b/public/scripts/main.js
index 6311953..fd35a10 100644
--- a/public/scripts/main.js
+++ b/public/scripts/main.js
@@ -24,22 +24,22 @@ var sb = {
     admin: {
       
         init: function() {
-            $('#confirm_delete_service').modal({
+            $('#confirm_delete').modal({
                 backdrop: true,
                 keyboard: true
             });
+            $('#confirm_delete_cancel').click(function() {
+                $('#confirm_delete').modal('hide'); 
+             });
         },
         
-        deleteService: function(url) {
-            $('#confirm_delete_service_do').click(function() {
+        deleteItem: function(url) {
+            $('#confirm_delete_do').click(function() {
                 location.href = url;
             });
-            $('#confirm_delete_service_cancel').click(function() {
-               $('#confirm_delete_service').modal('hide'); 
-            });
             
-            $('#confirm_delete_service').modal('show');
-        }
+            $('#confirm_delete').modal('show');
+        },
         
     },
      
diff --git a/source/webui/templates/admin.tpl b/source/webui/templates/admin.tpl
index a97f1e6..5354bf9 100644
--- a/source/webui/templates/admin.tpl
+++ b/source/webui/templates/admin.tpl
@@ -42,7 +42,7 @@
                                 </td>
                                 <td>
                                     <button class='btn info' onclick="document.location.href='{$base_uri}admin/service/id/{$service->id}/';return false;">Edit</button>
-                                    <button class='btn danger' onclick="sb.admin.deleteService('{$base_uri}admin/tab/services/do/delete-service/id/{$service->id}/');">Delete</button>
+                                    <button class='btn danger' onclick="sb.admin.deleteItem('{$base_uri}admin/tab/services/do/delete-service/id/{$service->id}/');">Delete</button>
                                 </td>
                             </tr>
                         {/foreach}
@@ -52,7 +52,7 @@
                 You haven't created any services yet. Create some with the button below.
             {/if}
             </div>
-            <div id="confirm_delete_service" class="modal hide fade">
+            <div id="confirm_delete" class="modal hide fade">
                 <div class="modal-header">
                     Confirm deletion
                 </div>
@@ -61,8 +61,8 @@
                     Are you sure you wish to delete this Service?                
                 </div>
                 <div class="modal-footer">
-                    <button class="btn secondary" id="confirm_delete_service_cancel">Cancel</button>
-                    <button class="btn danger" id="confirm_delete_service_do">Delete</button>              
+                    <button class="btn secondary" id="confirm_delete_cancel">Cancel</button>
+                    <button class="btn danger" id="confirm_delete_do">Delete</button>              
                 </div>
             </div>
     </div><!--/Row for Existing Service-->