changes to web forms

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

2 files changed, 39 insertions, 76 deletions

diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
index 06abebed1..e0d6f3c40 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
@@ -41,73 +41,40 @@ div#address{
 </style>
 
 <form name="zonedata" action="" method="post">
-<table border="0" width="100%">
-   <colgroup>
-   <col width="200">
-   <col width="*">
-<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>
+   <fieldset class="module aligned ()">
+<label for="id_zone">zone:</label></td> <td>{{ form.zone }}<br>
+<label for="id_admin">admin:</label></td> <td>{{ form.admin }}<br>
+<label for="id_primary_master">primary_master:</label></td> <td>{{ form.primary_master }}<br>
+<label for="id_expire">expire:</label></td> <td>{{ form.expire }}<br>
+<label for="id_retry">retry:</label></td> <td>{{ form.retry }}<br>
+<label for="id_refresh">refresh:</label></td> <td>{{ form.refresh }}<br>
+<label for="id_ttl">ttl:</label></td> <td>{{ form.ttl }}<br>
 {% for ns in nsforms %}
-<tr><td><label for="id_name">nameserver:</label></td> <td>{{ ns.name }}</td></tr>
+<label for="id_name">nameserver:</label></td> <td>{{ ns.name }}<br>
 {% 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>
+   <label for="id_name">nameserver:</label></td> <td>{{ nsadd.name }}<br>
+   <label for="id_name">nameserver:</label></td> <td>{{ nsadd.name }}<br>
 </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="*">
+<a style="font-size:75%" href=# onclick="toggleField('nameserver')">Add NS records</a><br>
 {% for mx in mxforms %}
-<tr><td><label for="id_mx">mx:</label></td> <td>{{ mx.priority }} {{ mx.mx }}</td></tr>
+<label for="id_mx">mx:</label></td> <td>{{ mx.priority }} {{ mx.mx }}<br>
 {% 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>
+   <label for="id_mx">mx:</label></td> <td>{{ mxadd.priority }} {{ mxadd.mx }}<br>
+   <label for="id_mx">mx:</label></td> <td>{{ mxadd.priority }} {{ mxadd.mx }}<br>
 </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="*">
+<a style="font-size:75%" href=# onclick="toggleField('mx')">Add MX records</a><br>
 {% for a in aforms %}
-<tr><td><label for="id_address">ip address:</label></td> <td>{{ a.ip_addr }}</td></tr>
+<label for="id_address">ip address:</label></td> <td>{{ a.ip_addr }}<br>
 {% 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>
+   <label for="id_address">ip address:</label></td> <td>{{ addadd.ip_addr }}<br>
+   <label for="id_address">ip address:</label></td> <td>{{ addadd.ip_addr }}<br>
 </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>
+<a style="font-size:75%" href=# onclick="toggleField('address')">Add A records</a><br>
+<label for="id_aux">aux:</label></td> <td>{{ form.aux }}<br>
 <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 a085b1433..af6ae2422 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
@@ -15,28 +15,24 @@
 
 {% block content %}
 <form name="zonedata" action="" method="post">
-<table border="0" width="100%">
-   <colgroup>
-   <col width="200">
-   <col width="*">
-<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>
+  <fieldset class="module aligned ()">
+  <label for="id_zone">zone:</label>{{ form.zone }}<br>
+  <label for="id_admin">admin:</label>{{ form.admin }}<br>
+  <label for="id_primary_master">primary_master:</label>{{ form.primary_master }}<br>
+  <label for="id_expire">expire:</label>{{ form.expire }}<br>
+  <label for="id_retry">retry:</label>{{ form.retry }}<br>
+  <label for="id_refresh">refresh:</label>{{ form.refresh }}<br>
+  <label for="id_ttl">ttl:</label>{{ form.ttl }}<br>
+  <label for="id_name">nameserver:</label>{{ nsform.name }}<br>
+  <label for="id_name">nameserver:</label>{{ nsform.name }}<br>
+  <label for="id_name">nameserver:</label>{{ nsform.name }}<br>
+  <label for="id_name">nameserver:</label>{{ nsform.name }}<br>
+  <label for="id_mx">mx:</label>{{ mxform.priority }} {{ mxform.mx }}<br>
+  <label for="id_mx">mx:</label>{{ mxform.priority }} {{ mxform.mx }}<br>
+  <label for="id_mx">ip address:</label>{{ aform.ip_addr }}<br>
+  <label for="id_mx">ip address:</label>{{ aform.ip_addr }}<br>
+  <label for="id_aux">aux:
+(information not generated from Hostbase)</label>{{ form.aux }}<br>
 <p><input type="submit" value="Submit">
 </form>
 {% endblock %}