updated backend code for zone views in Hostbase

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2501 ce84e21b-d406-0410-9b95-82705330c041

3 files changed, 85 insertions, 148 deletions

diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar b/src/lib/Server/Hostbase/hostbase/webtemplates/navbar
index dd565a93e..877d427d0 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/navbar
@@ -1,5 +1,5 @@
-<a href="/hostbase/" class="sidebar">new search</a><br>
+<a href="/hostbase/" class="sidebar">host search</a><br>
 <a href="/hostbase/new" class="sidebar">add a new host</a><br>
 <a href="/hostbase/zones" class="sidebar">zone file information</a><br>
-<a href="/hostbase/zones/new" class="sidebar">add a new zone</a><br>
+<a href="/hostbase/zones/new" class="sidebar">add a zone</a><br>
 
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
index 7eb7f2184..06abebed1 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
@@ -3,7 +3,7 @@
 {% block pagebanner %}
   <div class="header">
       <h2>Zones</h2>
-      <p>Edit information for {{ zone.zone }}
+      <p>Edit information for {{ zone }}
   </div>
   <br/>
 {% endblock %}
@@ -11,7 +11,7 @@
 {% block sidebar %}
 {% include "navbar" %}
 <ul>
-<li><a href="/hostbase/zones/{{ zone.id }}/" class="sidebar">view zone</a><br>
+<li><a href="/hostbase/zones/{{ zone_id }}/" class="sidebar">view zone</a><br>
 </li>
 </ul>
 {% include "logout" %}
@@ -40,112 +40,73 @@ div#address{
 }
 </style>
 
-<form name="zonedata" action="?sub=true" method="post">
-<input type="hidden" name="zone" value="{{ zone.id }}">
+<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" value="{{ zone.zone }}"></td></tr>
-   <tr> <td> <b>admin</b></td>
-   <td> <input name="admin" type="text" size="32" value="{{ zone.admin }}"></td></tr>
-   <tr> <td> <b>primary_master</b></td>
-   <td> <input name="primary_master" type="text" size="32" value="{{ zone.primary_master }}"></td></tr>
-   <tr> <td> <b>expire</b></td>
-   <td> <input name="expire" type="text" size="32" value="{{ zone.expire }}"></td></tr>
-   <tr> <td> <b>retry</b></td>
-   <td> <input name="retry" type="text" size="32" value="{{ zone.retry }}"></td></tr>
-   <tr> <td> <b>refresh</b></td>
-   <td> <input name="refresh" type="text" size="32" value="{{ zone.refresh }}"></td></tr>
-   <tr> <td> <b>ttl</b></td>
-   <td> <input name="ttl" type="text" size="32" value="{{ zone.ttl }}"></td></tr>
-
-   <tr><td valign="top"> <b>nameservers</b><br>
-   <a style="font-size:75%" href=# onclick="toggleField('nameserver')">add a new NS record</a>
-   </td>
-   <td>
-   {% for nameserver in nameservers %}
-       <input name="nameserver{{ forloop.counter0 }}" type="text" size="32" value="{{ nameserver.name }}">
-       <a style="font-size:75%" href="/hostbase/zones/{{ zone.id }}/nameserver/{{ nameserver.id }}/confirm">remove<br>
-   {% endfor %}
-   </td></tr>
-   </table>
-   <div id=nameserver>
-   <table border="0" width="100%">
-      <colgroup>
-      <col width="200">
-      <col width="*">
-         <tr> <td></td>
-         <td> <input name="new_nameserver" size="32" type="text"></td></tr>
-   </table>
-   </div>
-   <table border="0" width="100%">
-      <colgroup>
-      <col width="200">
-      <col width="*">
-   <tr><td valign="top"> <b>mxs</b><br>
-   <a style="font-size:75%" href=# onclick="toggleField('mx')">add a new MX record</a>
-   </td>
-   <td>
-   {% for mx in mxs %}
-       <input name="priority{{ forloop.counter0 }}" type="text" size="6" value="{{ mx.priority }}">
-       <input name="mx{{ forloop.counter0 }}" type="text" size="32" value="{{ mx.mx }}">
-       <a style="font-size:75%" href="/hostbase/zones/{{ zone.id }}/zonemx/{{ mx.id }}/confirm">remove<br>
-   {% endfor %}
-   </td></tr>
-   </table>
-   <div id=mx>
-   <table border="0" width="100%">
-      <colgroup>
-      <col width="200">
-      <col width="*">
-         <tr> <td></td>
-         <td> <input name="new_priority" type="text" size="6" >
-         <input name="new_mx" type="text" size="32" >
-         </td></tr>
-   </table>
-   </div>
-   <table border="0" width="100%">
-      <colgroup>
-      <col width="200">
-      <col width="*">
-   <tr><td valign="top"> <b>A records</b>
-   {% if addresses %}
-   <br><a style="font-size:75%" href=# onclick="toggleField('address')">add a new A record</a>
-   {% endif %}
-   </td>
-   <td>
-   {% if addresses %}
-   {% for address in addresses %}
-       <input name="address{{ forloop.counter0 }}" type="text" value="{{ address.ip_addr }}">
-       <a style="font-size:75%" href="/hostbase/zones/{{ zone.id }}/address/{{ address.id }}/confirm">remove<br>
-   {% endfor %}
-   </td></tr>
-   </table>
-   <div id=address>
-   <table border="0" width="100%">
-      <colgroup>
-      <col width="200">
-      <col width="*">
-         <tr> <td></td>
-         <td> <input name="new_address" type="text" >
-         </td></tr>
-   </table>
-   </div>
-   <table border="0" width="100%">
-      <colgroup>
-      <col width="200">
-      <col width="*">
-   {% else %}
-      <input name="new_address" type="text" value="none" >
-   {% endif %}
-   </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>
+{% for ns in nsforms %}
+<tr><td><label for="id_name">nameserver:</label></td> <td>{{ ns.name }}</td></tr>
+{% endfor %}
+</table>
+<div id=nameserver>
+<table border="0" width="100%">
+   <colgroup>
+   <col width="200">
+   <col width="*">
+   <tr><td><label for="id_name">nameserver:</label></td> <td>{{ nsadd.name }}</td></tr>
+   <tr><td><label for="id_name">nameserver:</label></td> <td>{{ nsadd.name }}</td></tr>
+</table>
+</div>
+<a style="font-size:75%" href=# onclick="toggleField('nameserver')">Add NS records</a>
+<table border="0" width="100%">
+   <colgroup>
+   <col width="200">
+   <col width="*">
+{% for mx in mxforms %}
+<tr><td><label for="id_mx">mx:</label></td> <td>{{ mx.priority }} {{ mx.mx }}</td></tr>
+{% endfor %}
+</table>
+<div id=mx>
+<table border="0" width="100%">
+   <colgroup>
+   <col width="200">
+   <col width="*">
+   <tr><td><label for="id_mx">mx:</label></td> <td>{{ mxadd.priority }} {{ mxadd.mx }}</td></tr>
+   <tr><td><label for="id_mx">mx:</label></td> <td>{{ mxadd.priority }} {{ mxadd.mx }}</td></tr>
+</table>
+</div>
+<a style="font-size:75%" href=# onclick="toggleField('mx')">Add MX records</a>
+<table border="0" width="100%">
+   <colgroup>
+   <col width="200">
+   <col width="*">
+{% for a in aforms %}
+<tr><td><label for="id_address">ip address:</label></td> <td>{{ a.ip_addr }}</td></tr>
+{% endfor %}
+</table>
+<div id=address>
+<table border="0" width="100%">
+   <colgroup>
+   <col width="200">
+   <col width="*">
+   <tr><td><label for="id_address">ip address:</label></td> <td>{{ addadd.ip_addr }}</td></tr>
+   <tr><td><label for="id_address">ip address:</label></td> <td>{{ addadd.ip_addr }}</td></tr>
+</table>
+</div>
+<a style="font-size:75%" href=# onclick="toggleField('address')">Add A records</a>
+<table border="0" width="100%">
+   <colgroup>
+   <col width="200">
+   <col width="*">
+<tr><td><label for="id_aux">aux:</label></td> <td>{{ form.aux }}</td></tr>
 </table>
 <p><input type="submit" value="Submit">
 </form>
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 %}