Index: /trunk/Makefile
===================================================================
--- /trunk/Makefile	(revision 426)
+++ /trunk/Makefile	(revision 427)
@@ -55,5 +55,6 @@
 	templates/adddomain.tmpl templates/addgroup.tmpl templates/addrec.tmpl templates/adduser.tmpl \
 	templates/axfr.tmpl templates/bulkchange.tmpl templates/bulkdomain.tmpl templates/dberr.tmpl \
-	templates/deldom.tmpl templates/delgrp.tmpl templates/delrec.tmpl templates/deluser.tmpl \
+	templates/deldom.tmpl templates/delgrp.tmpl templates/delloc.tmpl templates/delrec.tmpl \
+	templates/delrevzone.tmpl templates/deluser.tmpl \
 	templates/dns.css templates/dnsq.tmpl templates/domlist.tmpl templates/edgroup.tmpl \
 	templates/editsoa.tmpl templates/footer.tmpl templates/fpnla.tmpl templates/grouptree.css \
@@ -82,5 +83,6 @@
 	templates/adddomain.tmpl templates/addgroup.tmpl templates/addrec.tmpl templates/adduser.tmpl \
 	templates/axfr.tmpl templates/bulkchange.tmpl templates/bulkdomain.tmpl templates/dberr.tmpl \
-	templates/deldom.tmpl templates/delgrp.tmpl templates/delrec.tmpl templates/deluser.tmpl \
+	templates/deldom.tmpl templates/delgrp.tmpl templates/delloc.tmpl templates/delrec.tmpl \
+	templates/delrevzone.tmpl templates/deluser.tmpl \
 	templates/dns.css templates/dnsq.tmpl templates/domlist.tmpl templates/edgroup.tmpl \
 	templates/editsoa.tmpl templates/footer.tmpl templates/fpnla.tmpl templates/grouptree.css \
Index: /trunk/templates/deldom.tmpl
===================================================================
--- /trunk/templates/deldom.tmpl	(revision 426)
+++ /trunk/templates/deldom.tmpl	(revision 427)
@@ -5,5 +5,6 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete domain <TMPL_VAR NAME=domain>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 
Index: /trunk/templates/delgrp.tmpl
===================================================================
--- /trunk/templates/delgrp.tmpl	(revision 426)
+++ /trunk/templates/delgrp.tmpl	(revision 427)
@@ -4,14 +4,7 @@
 
 <td align="center" valign="top">
-
 <h3>Are you really sure you want to delete group <TMPL_VAR NAME=delgroupname>?</h3>
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delgrp&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delgrp&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
-
-<!--
- fixme:  do a check for "group has stuff in it", and splatter a big warning
- up along with an unchecked-by-default check box to YES DAMMIT DELETE THE WHOLE THING
- -->
-
 </td></tr></table>
 
Index: /trunk/templates/delloc.tmpl
===================================================================
--- /trunk/templates/delloc.tmpl	(revision 427)
+++ /trunk/templates/delloc.tmpl	(revision 427)
@@ -0,0 +1,13 @@
+<TMPL_IF del_getconf>
+<table class="wholepage"><tr>
+<TMPL_INCLUDE NAME="menu.tmpl">
+
+<td align="center" valign="top">
+<h3>Are you really sure you want to delete location <TMPL_VAR NAME=location>?</h3>
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delloc&amp;del=cancel&amp;locid=<TMPL_VAR NAME=locid>">cancel</a> &nbsp; | &nbsp; 
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delloc&amp;del=ok&amp;locid=<TMPL_VAR NAME=locid>">confirm</a>
+</td></tr></table>
+
+<TMPL_ELSE>
+<TMPL_INCLUDE NAME="loclist.tmpl">
+</TMPL_IF>
Index: /trunk/templates/delrevzone.tmpl
===================================================================
--- /trunk/templates/delrevzone.tmpl	(revision 426)
+++ /trunk/templates/delrevzone.tmpl	(revision 427)
@@ -5,5 +5,6 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete reverse zone <TMPL_VAR NAME=revzone>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delrevzone&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 
Index: /trunk/templates/deluser.tmpl
===================================================================
--- /trunk/templates/deluser.tmpl	(revision 426)
+++ /trunk/templates/deluser.tmpl	(revision 427)
@@ -5,5 +5,6 @@
 <td align="center" valign="top">
 <h3>Are you really sure you want to delete user <TMPL_VAR NAME=user>?</h3>
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=cancel&amp;id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deluser&amp;del=ok&amp;id=<TMPL_VAR NAME=id>">confirm</a>
 </td></tr></table>
 
Index: /trunk/templates/loclist.tmpl
===================================================================
--- /trunk/templates/loclist.tmpl	(revision 426)
+++ /trunk/templates/loclist.tmpl	(revision 427)
@@ -36,6 +36,6 @@
 	<td><TMPL_VAR name=group_name></td>
 <TMPL_IF delloc>
-	<td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delloc&amp;id=<TMPL_VAR 
-NAME=loc>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
+	<td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=delloc&amp;locid=<TMPL_VAR 
+NAME=location>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td>
 </TMPL_IF>
 </tr>
