tweaks for a more standard installation

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

3 files changed, 70 insertions, 107 deletions

diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
index d3bb848ca..297a3860b 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
@@ -45,16 +45,12 @@ div#interface{
 }
 </style>
 
-<form name="hostdata" action="?sub=true" method="post">
+<form name="hostdata" action="" method="post">
+<fieldset class="module aligned ()">
 <input type="hidden" name="host" value="{{ host.id }}">
-<table border="0" width="100%">
-   <colgroup>
-   <col width="150">
-   <col width="*">
-   <tr> <td> <b>hostname</b></td>
-   <td> <input name="hostname" value="{{ host.hostname }}"></td></tr>
-   <tr> <td> <b>whatami</b></td>
-   <td> 
+   <label for="id_hostname">hostname:</label>
+   <input name="hostname" value="{{ host.hostname }}"><br>
+   <label for="id_whatami">whatami:</label>
    <select name="whatami">
    {% for choice in host.WHATAMI_CHOICES %}
        {% ifequal host.whatami choice.0 %}
@@ -63,9 +59,8 @@ div#interface{
            <option value="{{ choice.0 }}">{{ choice.1 }}
        {% endifequal %}
    {% endfor %}
-   </select></td></tr>
-   <tr> <td> <b>netgroup</b></td>
-   <td>
+   </select><br>
+   <label for="id_netgroup">netgroup:</label>
    <select name="netgroup">
    {% for choice in host.NETGROUP_CHOICES %}
        {% ifequal host.netgroup choice.0 %}
@@ -74,10 +69,8 @@ div#interface{
            <option value="{{ choice.0 }}">{{ choice.1 }}
        {% endifequal %}
    {% endfor %}
-   </select>
-   </td></tr>
-   <tr> <td> <b>class</b></td>
-   <td>
+   </select><br>
+   <label for="id_security_class">class:</label>
    <select name="security_class">
    {% for choice in host.CLASS_CHOICES %}
        {% ifequal host.security_class choice.0 %}
@@ -86,9 +79,8 @@ div#interface{
            <option value="{{ choice.0 }}">{{ choice.1 }}
        {% endifequal %}
    {% endfor %}
-   </select></td></tr>
-   <tr> <td> <b>support</b></td>
-   <td>
+   </select><br>
+   <label for="id_support">support:</label>
    <select name="support">
    {% for choice in host.SUPPORT_CHOICES %}
        {% ifequal host.support choice.0 %}
@@ -97,113 +89,87 @@ div#interface{
            <option value="{{ choice.0 }}">{{ choice.1 }}
        {% endifequal %}
    {% endfor %}
-   </select></td></tr>
-   <tr> <td> <b>csi</b></td>
-   <td> <input name="csi" type="text" value="{{ host.csi }}"></td></tr>
-   <tr> <td> <b>printq</b></td>
-   <td> <input name="printq" type="text" value="{{ host.printq }}"></td></tr>
-   <tr> <td> <b>outbound_smtp</b></td>
-   <td>
+   </select><br>
+   <label for="id_csi">csi:</label>
+   <input name="csi" type="text" value="{{ host.csi }}"><br>
+   <label for="id_printq">printq:</label>
+   <input name="printq" type="text" value="{{ host.printq }}"><br>
+   <label for="id_outbound_smtp">outbound_smtp:</label>
    {% if host.outbound_smtp %}
-       <input type="checkbox" checked="checked" name="outbound_smtp"></td></tr>
+       <input type="checkbox" checked="checked" name="outbound_smtp">
    {% else %}
-       <input type="checkbox" name="outbound_smtp"></td></tr>
-   {% endif %}   
-   <tr> <td> <b>primary_user</b></td>
-   <td> <input name="primary_user" type="text" size="32" value="{{ host.primary_user }}"></td></tr>
-   <tr> <td> <b>administrator</b></td>
-   <td> <input name="administrator" type="text" size="32" value="{{ host.administrator }}"></td></tr>
-   <tr> <td> <b>location</b></td>
-   <td> <input name="location" type="text" value="{{ host.location }}"></td></tr>
-   <tr> <td> <b>expiration_date</b></td>
-   <td> <input name="expiration_date" type="text" value="{{ host.expiration_date }}"> YYYY-MM-DD</td></tr>
+       <input type="checkbox" name="outbound_smtp">
+   {% endif %}<br>
+   <label for="id_primary_user">primary_user:</label>
+   <input name="primary_user" type="text" size="32" value="{{ host.primary_user }}"><br>
+   <label for="id_administrator">administrator:</label>
+   <input name="administrator" type="text" size="32" value="{{ host.administrator }}"><br>
+   <label for="id_location">location:</label>
+   <input name="location" type="text" value="{{ host.location }}"><br>
+   <label for="id_expiration_date">expiration_date:</label>
+   <input name="expiration_date" type="text" value="{{ host.expiration_date }}"> YYYY-MM-DD<br>
    {% for interface in interfaces %}
-       <tr> <td><br><b>Interface</b>
-       </td><td><br>
-       {% for choice in interface.0.TYPE_CHOICES %}
-           {% ifequal interface.0.hdwr_type choice.0 %}
-               <input type="radio" name="hdwr_type{{ interface.0.id }}" value="{{ choice.0 }}" checked="checked">{{ choice.1 }}
-           {% else %}
-               <input type="radio" name="hdwr_type{{ interface.0.id }}" value="{{ choice.0 }}">{{ choice.1 }}
-           {% endifequal %}
-       {% endfor %}
-       </td></tr>
-       <tr> <td> <b>dhcp</b></td>
-       <td>
+      <label for="id_interface">Interface:</label>
+      <select name="hdwr_type{{ interface.0.id }}">
+      {% for choice in interface.0.TYPE_CHOICES %}
+          {% ifequal interface.0.hdwr_type choice.0 %}
+	      <option value="{{ choice.0 }}" selected="selected">{{ choice.1 }}
+	  {% else %}
+	      <option value="{{ choice.0 }}">{{ choice.1 }}
+	  {% endifequal %}
+      {% endfor %}
+      </select><br>
+      <label for="id_dhcp">dhcp:</label>
        {% if interface.0.dhcp %}
-           <input type="checkbox" checked="checked" name="dhcp{{ interface.0.id }}"></td></tr>
+           <input type="checkbox" checked="checked" name="dhcp{{ interface.0.id }}">
        {% else %}
-           <input type="checkbox" name="dhcp{{ interface.0.id }}"></td></tr>
-       {% endif %}   
-       <tr> <td> <b>mac_addr</b></td>
-       <td> <input name="mac_addr{{ interface.0.id }}" type="text" value="{{ interface.0.mac_addr }}">
-       <a style="font-size:75%" href="/hostbase/{{ host.id }}/interface/{{ interface.0.id }}/confirm">remove</a>
-       </td></tr>
+           <input type="checkbox" name="dhcp{{ interface.0.id }}">
+       {% endif %}<br>
+      <label for="id_mac_addr">mac_addr:</label>
+      <input name="mac_addr{{ interface.0.id }}" type="text" value="{{ interface.0.mac_addr }}">
+       <a style="font-size:75%" href="/hostbase/{{ host.id }}/interface/{{ interface.0.id }}/confirm">remove</a><br>
        {% for ip in interface.1 %}
-           <tr> <td> <b>ip_addr</b>
-	   </td>
-           <td> <input name="ip_addr{{ ip.id }}" type="text" value="{{ ip.ip_addr }}">
-	   <a style="font-size:75%" href="/hostbase/{{ host.id }}/ip/{{ ip.id }}/confirm">remove
-	   </a></td></tr>
+           <label for="id_ip_addr">ip_addr:</label>
+           <input name="ip_addr{{ ip.id }}" type="text" value="{{ ip.ip_addr }}">
+	   <a style="font-size:75%" href="/hostbase/{{ host.id }}/ip/{{ ip.id }}/confirm">remove</a><br>
        {% endfor %}
 
 <!-- Section for adding a new IP address to an existing interface -->
 <!-- By default, section is hidden -->
-       </table>
        <div id=ipaddr{{ interface.0.id }}>
-       <table border="0" width="100%">
-           <colgroup>
-           <col width="150">
-           <col width="*">
-           <tr> <td> <b>ip_addr</b></td>
-           <td> <input name="{{ interface.0.id }}ip_addr" type="text"></td></tr>
-       </table>
+           <label for="id_ip_addr">ip_addr:</label>
+           <input name="{{ interface.0.id }}ip_addr" type="text"><br>
        </div>
-       <a style="font-size:75%" href=# onclick="toggleAddr({{ interface.0.id }})">Add a New IP Address</a>
-       <table border="0" width="100%">
-           <colgroup>
-               <col width="150">
-	       <col width="*">
+       <a style="font-size:75%" href=# onclick="toggleAddr({{ interface.0.id }})">Add a New IP Address</a><br>
    {% endfor %}
 <!--  End section for new IP address -->
 
 <!-- Section for add an entirely new interface to a host -->
 <!-- By default, section is hidden -->
-   </table>
    <div id=interface>
-   <table border="0" width="100%">
-       <colgroup>
-       <col width="150">
-       <col width="*">
-   <tr> <td><br><b>Interface</b></td><td><br>
+   <label for="id_interface">Interface:</label>
+   <select name="hdwr_type{{ interface.0.id }}">
    {% for choice in TYPE_CHOICES %}
-   <input type="radio" name="hdwr_type_new" value="{{ choice.0 }}">{{ choice.1 }}
+       <option value="{{ choice.0 }}">{{ choice.1 }}
    {% endfor %}
-   </td></tr>
-   <tr> <td> <b>dhcp</b></td>
-   <td>
+   </select><br>
+   <label for="id_dhcp">dhcp:</label>
    {% if host.dhcp %}
-       <input type="checkbox" checked="checked" name="dhcp_new"></td></tr>
+       <input type="checkbox" checked="checked" name="dhcp_new">
    {% else %}
-       <input type="checkbox" name="dhcp_new"></td></tr>
-   {% endif %}   
-   <tr> <td> <b>mac_addr</b></td>
-   <td> <input name="mac_addr_new" type="text"></td></tr>
-   <tr> <td> <b>ip_addr</b></td>
-   <td> <input name="ip_addr_new" type="text"></td></tr>
-</table>
+       <input type="checkbox" name="dhcp_new">
+   {% endif %}<br>
+   <label for="id_mac_addr">mac_addr:</label>
+   <td> <input name="mac_addr_new" type="text"><br>
+   <label for="id_ip_addr">ip_addr:</label>
+   <td> <input name="ip_addr_new" type="text"><br>
 </div>
-<a style="font-size:75%" href=# onclick="toggleInter()">Add a New Interface</a>
+<a style="font-size:75%" href=# onclick="toggleInter()">Add a New Interface</a><br>
 <!-- End new interface section -->
 
 
-<table border="0" width="100%">
-   <colgroup>
-   <col width="150">
-   <col width="*">
-<tr> <td> <b>comments</b></td>
-<td> <textarea rows="10" cols="50" name="comments">{{ host.comments }}</textarea></td></tr>
-</table>
+<label for="id_comments">comments:</label>
+<textarea rows="10" cols="50" name="comments">{{ host.comments }}</textarea><br>
 <a style="font-size:75%" href="/hostbase/{{ host.id }}/dns/edit">edit detailed DNS information for this host</a>
 <br>
 this host is 
@@ -217,7 +183,8 @@ this host is
 {% endfor %}
 </select><br>
 last update on {{ host.last }}<br>
-<p><input type="submit" value="Submit">
+<input type="submit" value="submit">
+<input type="reset" value="cancel" onclick="history.back()">
 </form>
 
 {% endblock %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html b/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html
index 724bf9c34..46050d941 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html
@@ -16,9 +16,9 @@
 
 {% if failures %}
 There were errors in the following fields<br><br>
-{% for failure in failures %}
+{% for failure in failures.items %}
 
-<font color="#FF0000">{{ failure }}</font><br>
+<font color="#FF0000">{{ failure.0 }}: {{ failure.1|join:", " }}</font><br>
 
 {% endfor %}
 {% endif %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
index 39cdc7ae4..75cac61db 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
@@ -56,13 +56,9 @@
    {% ifnotequal interface.0.hdwr_type 'no' %}
    <td><br>{{ interface.0.hdwr_type }}</td></tr>
    {% endifnotequal %}
-   <tr> <td> <b>dhcp</b></td>
    {% if interface.0.dhcp %}
-   <td> y </td></tr>
    <tr> <td> <b>mac_addr</b></td>
    <td> {{ interface.0.mac_addr }}</b></td></tr>
-   {% else %}
-   <td> n </td></tr>
    {% endif %}
    {% for ip in interface.1 %}
    <tr> <td> <b>ip_addr</b></td>