1 files changed, 18 insertions, 42 deletions
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
index b3d12f9f8..a085b1433 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
@@ -14,54 +14,30 @@
 {% endblock %}
 
 {% block content %}
-
-<form name="zonedata" action="?sub=true" method="post">
+<form name="zonedata" action="" method="post">
 <table border="0" width="100%">
    <colgroup>
    <col width="200">
    <col width="*">
-   <tr> <td> <b>zone</b></td>
-   <td> <input name="zone" type="text" size="32"></td></tr>
-   <tr> <td> <b>admin</b></td>
-   <td> <input name="admin" type="text" size="32"></td></tr>
-   <tr> <td> <b>primary_master</b></td>
-   <td> <input name="primary_master" type="text" size="32"></td></tr>
-   <tr> <td> <b>expire</b></td>
-   <td> <input name="expire" type="text" size="32"></td></tr>
-   <tr> <td> <b>retry</b></td>
-   <td> <input name="retry" type="text" size="32" ></td></tr>
-   <tr> <td> <b>refresh</b></td>
-   <td> <input name="refresh" type="text" size="32"></td></tr>
-   <tr> <td> <b>ttl</b></td>
-   <td> <input name="ttl" type="text" size="32"></td></tr>
-
-   <tr><td valign="top"> <b>nameservers</b></td>
-   <td>
-   {% for nameserver in nameservers %}
-       <input name="nameserver{{ forloop.counter0 }}" type="text" size="32"><br>
-   {% endfor %}
-   </td></tr>
-   <tr><td valign="top"> <b>mxs</b></td>
-   <td>
-   {% for mx in mxs %}
-       <input name="priority{{ forloop.counter0 }}" type="text" size="6" >
-       <input name="mx{{ forloop.counter0 }}" type="text" size="32" ><br>
-   {% endfor %}
-   </td></tr>
-   <tr><td valign="top"> <b>A records</b></td>
-   <td>
-   {% for address in addresses %}
-       <input name="address{{ forloop.counter0 }}" type="text" ><br>
-   {% endfor %}
-   </td></tr>
-
-   <tr> <td valign="top"> <b>aux</b> (for information not generated by the database)</td>
-   <td> <textarea rows="20" cols="80" name="aux">{{ zone.aux }}</textarea></td></tr>
-   </td></tr>
-
+<tr><td><label for="id_zone">zone:</label></td> <td>{{ form.zone }}</td></tr>
+<tr><td><label for="id_admin">admin:</label></td> <td>{{ form.admin }}</td></tr>
+<tr><td><label for="id_primary_master">primary_master:</label></td> <td>{{ form.primary_master }}</td></tr>
+<tr><td><label for="id_expire">expire:</label></td> <td>{{ form.expire }}</td></tr>
+<tr><td><label for="id_retry">retry:</label></td> <td>{{ form.retry }}</td></tr>
+<tr><td><label for="id_refresh">refresh:</label></td> <td>{{ form.refresh }}</td></tr>
+<tr><td><label for="id_ttl">ttl:</label></td> <td>{{ form.ttl }}</td></tr>
+<tr><td><label for="id_name">nameserver:</label> <td>{{ nsform.name }}</td></tr>
+<tr><td><label for="id_name">nameserver:</label> <td>{{ nsform.name }}</td></tr>
+<tr><td><label for="id_name">nameserver:</label> <td>{{ nsform.name }}</td></tr>
+<tr><td><label for="id_name">nameserver:</label> <td>{{ nsform.name }}</td></tr>
+<tr><td><label for="id_mx">mx:</label> <td>{{ mxform.priority }} {{ mxform.mx }}</td></tr>
+<tr><td><label for="id_mx">mx:</label> <td>{{ mxform.priority }} {{ mxform.mx }}</td></tr>
+<tr><td><label for="id_mx">ip address:</label> <td>{{ aform.ip_addr }}</td></tr>
+<tr><td><label for="id_mx">ip address:</label> <td>{{ aform.ip_addr }}</td></tr>
+<tr><td><label for="id_aux">aux:<br>
+(information not generated from Hostbase)</label></td> <td>{{ form.aux }}</td></tr>
 </table>
 <p><input type="submit" value="Submit">
 </form>
-
 {% endblock %}