From 9c5143cbd747dc2dbae5aa47d6faf7ea95881eef Mon Sep 17 00:00:00 2001
From: Jeffrey Forman <jforman@malbec.home.jeffreyforman.net>
Date: Fri, 23 Nov 2012 22:22:59 -0500
Subject: [PATCH] clean up delete template, change rr_array -> rr_list. list
 multiple records for deletion a bit cleaner

---
 .../bcommon/delete_record_initial.htm         | 35 +++++++++++--------
 binder/templates/bcommon/list_zone.htm        |  2 +-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/binder/templates/bcommon/delete_record_initial.htm b/binder/templates/bcommon/delete_record_initial.htm
index fdcfe2d..2bf205e 100644
--- a/binder/templates/bcommon/delete_record_initial.htm
+++ b/binder/templates/bcommon/delete_record_initial.htm
@@ -8,11 +8,9 @@ Delete record(s) in {{ zone_name }}
 
 <table class="table">
 <form action="/delete_record/result/" method="POST">{% csrf_token %}
-<input type="hidden" name="dns_server" value="{{ dns_server }}">
-<input type="hidden" name="zone_name" value="{{ zone_name }}">
-<input type="hidden" name="rr_array" value="{{ rr_array }}">
-<!-- <input type="hidden" name="delete_step" value="finalize"> -->
-
+  <input type="hidden" name="dns_server" value="{{ dns_server }}">
+  <input type="hidden" name="zone_name" value="{{ zone_name }}">
+  <input type="hidden" name="rr_list" value="{{ rr_list }}">
   <tr>
     <th colspan="2">Do you really want to delete the following records?</th>
   </tr>
@@ -22,23 +20,30 @@ Delete record(s) in {{ zone_name }}
   </tr>
   <tr>
     <td>Zone</td>
-    <td> {{ zone_name }} </td>
+    <td>{{ zone_name }}</td>
   </tr>
   <tr>
     <td>Records</td>
-    <td>{% for current_rr in rr_array %} {{ current_rr}} {% endfor %}</td>
+    <td>{% for current_rr in rr_list %}{{ current_rr }}<br> {% endfor %}</td>
   </tr>
   <tr>
     <td>Key</td>
-    <td> <select name="key_name">
-      <option selected="selected" value=""/>
-    {% for current_key in tsig_keys %}
-      <option value="{{current_key}}">{{current_key}}</option>
-    {% endfor %}</td>
-    </tr>
-    </select>
+    <td>
+      <select name="key_name">
+        <option selected="selected" value=""/>
+        {% for current_key in tsig_keys %}
+        <option value="{{current_key.id}}">{{current_key}}</option>
+        {% endfor %}
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <input type="submit" value="Yes, I really want to delete them."/>
+    </td>
+  </tr>
 </table>
 
-<input type="submit" value="Yes, I really want to delete them."/>
 </form>
+
 {% endblock body %}
diff --git a/binder/templates/bcommon/list_zone.htm b/binder/templates/bcommon/list_zone.htm
index e267861..b28c539 100644
--- a/binder/templates/bcommon/list_zone.htm
+++ b/binder/templates/bcommon/list_zone.htm
@@ -23,7 +23,7 @@ Zone listing for {{ zone_name }}
 <input type="hidden" name="zone_name" value="{{ zone_name }}">
 {% for current_record in zone_array %}
 <tr>
-  <td><input type="checkbox" name="rr_array" value="{{ current_record.rr_name }}.{{ zone_name }}"></td>
+  <td><input type="checkbox" name="rr_list" value="{{ current_record.rr_name }}.{{ zone_name }}"></td>
   <td>{{ current_record.rr_name }}</td>
   <td>{{ current_record.rr_ttl }}</td>
   <td>{{ current_record.rr_class }}</td>