minor updates to plugin and templates

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

3 files changed, 91 insertions, 4 deletions

diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
index efc308def..0785b64e8 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
@@ -46,13 +46,12 @@ div#interface{
 
 <form name="hostdata" action="?sub=true" method="post">
 <input type="hidden" name="host" value="{{ host.id }}">
-<input type="hidden" name="hostname" value="{{ host.hostname }}">
 <table border="0" width="100%">
    <colgroup>
    <col width="150">
    <col width="*">
    <tr> <td> <b>hostname</b></td>
-   <td> {{ host.hostname }}</td></tr>
+   <td> <input name="hostname" value="{{ host.hostname }}"></td></tr>
    <tr> <td> <b>whatami</b></td>
    <td> 
    <select name="whatami">
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
index 949afc611..bcec42404 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
@@ -62,9 +62,9 @@
    <td>
    <input type="checkbox" name="outbound_smtp"></td></tr>
    <tr> <td> <b>primary_user</b></td>
-   <td> <input name="primary_user" type="text" size="32" ></td></tr>
+   <td> <input name="primary_user" type="text" size="32" > (email address)</td></tr>
    <tr> <td> <b>administrator</b></td>
-   <td> <input name="administrator" type="text" size="32" ></td></tr>
+   <td> <input name="administrator" type="text" size="32" > (email address)</td></tr>
    <tr> <td> <b>location</b></td>
    <td> <input name="location" type="text" ></td></tr>
    <tr> <td> <b>expiration_date</b></td>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html
new file mode 100644
index 000000000..19c73b4f9
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html
@@ -0,0 +1,88 @@
+{% extends "base.html" %}
+
+{% block pagebanner %}
+  <div class="header">
+      <h2>Are you sure you want to remove {{ host.hostname }}?</h2>
+  </div>
+  <br/>
+{% endblock %}
+
+{% block sidebar %}
+{% include "navbar" %}
+<ul class="sidebar">
+   <li><a href="dns/" class="sidebar">detailed dns info</a></li>
+   <li><a href="edit/" class="sidebar">edit host info</a></li>
+   <li><a href="dns/edit/" class="sidebar">edit dns info</a></li>
+</ul>
+{% endblock %}
+
+{% block content %}
+
+<table border="0" width="100%">
+   <colgroup>
+   <col width="150">
+   <col width="*">
+   <tr> <td> <b>hostname</b></td>
+   <td> {{ host.hostname }}</td></tr>			 
+   <tr> <td> <b>whatami</b></td>
+   <td> {{ host.whatami }}</td></tr>
+   <tr> <td> <b>netgroup</b></td>
+   <td> {{ host.netgroup }}</td></tr>
+   <tr> <td> <b>class</b></td>
+   <td> {{ host.security_class }}</td></tr>
+   <tr> <td> <b>support</b></td>
+   <td> {{ host.support }}</td></tr>
+   <tr> <td> <b>csi</b></td>
+   <td> {{ host.csi }}</td></tr>
+   <tr> <td> <b>printq</b></td>
+   <td> {{ host.printq }}</td></tr>
+   <tr> <td> <b>dhcp</b></td>
+   {% if host.dhcp %}
+   <td> y </td></tr>
+   {% else %}
+   <td> n </td></tr>
+   {% endif %}
+   <tr> <td> <b>outbound_smtp</b></td>
+   {% if host.outbound_smtp %}
+   <td> y </td></tr>
+   {% else %}
+   <td> n </td></tr>
+   {% endif %}
+   <tr> <td> <b>primary_user</b></td>
+   <td> {{ host.primary_user }}</td></tr>
+   <tr> <td> <b>administrator</b></td>
+   <td> {{ host.administrator }}</td></tr>
+   <tr> <td> <b>location</b></td>
+   <td> {{ host.location }}</td></tr>
+   <tr> <td> <b>expiration_date</b></td>
+   <td> {{ host.expiration_date }}</td></tr>
+   {% for interface in interfaces %}
+   <tr> <td><br><b>Interface</b></td>
+   {% ifnotequal interface.0.hdwr_type 'no' %}
+   <td><br>{{ interface.0.hdwr_type }}</td></tr>
+   {% endifnotequal %}
+   <tr> <td> <b>mac_addr</b></td>
+   <td> {{ interface.0.mac_addr }}</b></td></tr>
+   {% for ip in interface.1 %}
+   <tr> <td> <b>ip_addr</b></td>
+   <td> {{ ip.ip_addr }}</td></tr>
+   {% endfor %}
+   {% endfor %}
+   <tr> <td valign="top"> <b>comments</b></td>
+   <td> 
+   {{ host.comments|linebreaksbr }}<br>
+   </td></tr>
+
+</table>
+<a style="font-size:75%" href="/hostbase/{{ host.id }}/dns/">see detailed DNS information for this host</a>
+<br><br>
+this host is {{ host.status }}<br>
+last update on {{ host.last }}<br>
+
+<form name="input" action="remove.html?sub=true" method="post">
+<input type="submit" value="remove">
+<input type="reset" value="cancel" onclick="history.back()">
+</form>
+
+{% endblock %}
+