3 files changed, 17 insertions, 11 deletions
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
index 71ca621a1..571fa3f5d 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
@@ -101,13 +101,6 @@ function toggleInter(){
 div#ipaddr${interface.id}{
    display: none;
 }
-<!-- 
-#for $ip in $ips[$interface.id]
-div#dns${ip.id}{
-   display: none;
-}
-#end for
--->
 #end for
 div#interface{
    display: none;
@@ -130,7 +123,16 @@ ok, submitted
    <tr> <td> <b>hostname</b></td>
    <td> <input name="hostname" type="text" value="$host.hostname"></td></tr>
    <tr> <td> <b>whatami</b></td>
-   <td> <input name="whatami" type="text" value="$host.whatami"></td></tr>
+   <td> 
+   <select name="whatami">
+   #for $choice in $host.WHATAMI_CHOICES
+       #if $host.whatami == $choice[0]
+           <option value="$choice[0]" selected="selected">$choice[1]
+       #else
+           <option value="$choice[0]">$choice[1]
+       #end if
+   #end for
+   </select></td></tr>
    <tr> <td> <b>netgroup</b></td>
    <td>
    <select name="netgroup">
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
index a9ec9014b..43baa14c6 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
@@ -131,8 +131,12 @@
    <td> $ip.ip_addr</td></tr>
    #end for
    #end for
-   <tr> <td> <b>comments</b></td>
-   <td> $host.comments</td></tr>
+   <tr> <td valign="top"> <b>comments</b></td>
+   <td> 
+   #for $line in $host.comments.split("\n")
+   $line<br>
+   #end for
+   </td></tr>
 
 </table>
 <a style="font-size:75%" href="/hostbase/$host.id/dns/">see detailed DNS information for this host</a>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
index efae1143f..470883e61 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
@@ -99,7 +99,7 @@
    <td> inactive </td>
    #end if
    <td> <a href="$host[1]">view</a> </td>
-   <td> <a href="$host[1]/edit.html">edit</a> </td>
+   <td> <a href="$host[1]/edit">edit</a> </td>
    </tr>
    #end for
 </table>