Added all the django application code

includes database models, file templates, and web apps git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2135 ce84e21b-d406-0410-9b95-82705330c041
author: Ken Raffenetti <raffenet@mcs.anl.gov> 2006-08-29 16:33:36 +0000
committer: Ken Raffenetti <raffenet@mcs.anl.gov> 2006-08-29 16:33:36 +0000
commit: 510c55e843ea0a1c049b39a9f57ff044190fcbd9 (patch)
tree: 5e82a8238779a088147ff61efc0db305be76a1f7 /src/lib/Server/Hostbase/hostbase/webtemplates
parent: dbc96682be8968aac8ca8f8727728d60609f732c (diff)
download: bcfg2-510c55e843ea0a1c049b39a9f57ff044190fcbd9.tar.gz
bcfg2-510c55e843ea0a1c049b39a9f57ff044190fcbd9.tar.bz2
bcfg2-510c55e843ea0a1c049b39a9f57ff044190fcbd9.zip
9 files changed, 1642 insertions, 0 deletions
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html b/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html
new file mode 100644
index 000000000..96ed4ed4f
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html
@@ -0,0 +1,189 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><!-- InstanceBegin template="/Templates/publicFull.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<link href="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/stylesheets/argonne.css" rel="stylesheet" type="text/css">
+<link href="http://www.anl.gov/favicon.ico" rel="SHORTCUT ICON">
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/anlmain.js" type="text/JavaScript"></script>
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/stm31.js" type="text/JavaScript"></script>
+<!-- InstanceBeginEditable name="head" -->
+<!-- Insert page specific head elements in this region, including custom javascript -->
+<!-- TemplateBeginEditable name="head" -->
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/main.js" type="text/JavaScript"></script>
+<!-- TemplateEndEditable --><!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="title" -->
+<title></title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="metadata" -->
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="classification" content="">
+<meta name="author" content="Argonne National Laboratory">
+<meta name="expires" content="">
+<!-- InstanceEndEditable -->
+<!-- InstanceParam name="Contact URL" type="URL" value="../about/contacts.html" --><!-- InstanceParam name="Sitemap URL" type="URL" value="../Division/sitemap.html" --><!-- InstanceParam name="Search URL" type="URL" value="../About/search.html" --><!-- InstanceParam name="enableOptionalSponsorLogos" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarTabs" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarSearch" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSitemapFooter" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSearchFooter" type="boolean" value="false" -->
+</head>
+<body> 
+<table width="100%" border="0" cellpadding="0" cellspacing="3"> 
+  <tr> 
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr class="headerBkgd" valign="middle">
+        <td width="10"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" height="10" width="10" border="0" alt=""></td>
+        <td width="300" align="left"><a href="http://www.anl.gov"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/argonne_header_logo.jpg" alt="Argonne National Laboratory" width="227" height="100" border="0"></a></td>
+        <td><span class="sectionTitle"><!-- InstanceBeginEditable name="divisionProgramIdentity" --><img src="http://www-unix.mcs.anl.gov/hostbaseweb/images/mcs_logo_white_minus_logo_small.png" width="92" height="31"><br>
+                <a href="http://www.mcs.anl.gov">Mathematics
+                and Computer Science </a><!-- InstanceEndEditable --></span></td>
+      </tr>
+    </table></td> 
+  </tr> 
+  <tr> 
+    <td> <table width="100%"  border="0" cellspacing="0" cellpadding="0"> 
+         
+        <tr> <!-- InstanceBeginRepeat name="localNavigation" --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="http://www.mcs.anl.gov">About
+                  Us</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/research/">Research</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="../research/index.html"></a><a href="http://www-fp.mcs.anl.gov/division/resources/">Facilities</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/people/">Staff</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/software/">Software</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/collaboration">Collaborations </a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/information/">Information</a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceEndRepeat -->  
+         
+        <td class="navGlobalBkgd" width="50%"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="1" height="30" border="0" alt=""></td> 
+           </tr> </table> 
+      <!-- #EndLibraryItem --></td> 
+  </tr> 
+  <tr> 
+    <td class="greyBkgdLight"><span class="breadcrumbs"><a href="http://www.mcs.anl.gov/">MCS
+          Home</a> &gt; <!-- InstanceBeginEditable name="topLevelBreadcrumbs" --> 
+          <script language="JavaScript">breadCrumbs("www-unix.mcs.anl.gov/new",">","","breadcrumbs","None","None","0");</script>
+          <!-- InstanceEndEditable --></span></td>
+  </tr> 
+  <tr valign="top"> 
+    <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0"> 
+        <tr> 
+          <td><!-- InstanceBeginEditable name="mainFeature" --> 
+<form name="input" action="confirm.html?sub=true" method="post">
+<h3>Are you sure?</h3>
+Are you sure you want to remove these items?
+
+#if $interface
+<ul>
+<li> interface: $interface.__str__ </li>
+#end if
+
+
+#if $ips
+<ul>
+#for $ip in $ips
+<li> ip: $ip.__str__ </li>
+<ul>
+#for $name in $names[$ip.id]
+<li> name: $name.__str__ </li>
+<ul>
+#for $cname in $cnames[$name.id]
+<li> cname: $cname.__str__ </li>
+#end for
+</ul>
+<ul>
+#for $mx in $mxs[$name.id]
+<li> mx: $mx.priority $mx.__str__ </li>
+#end for
+</ul>
+#end for
+</ul>
+#end for
+</ul>
+#end if
+
+#if $names and not $ips
+<ul>
+#for $name in $names
+<li> name: $name.__str__ </li>
+<ul>
+#for $cname in $cnames[$name.id]
+<li> cname: $cname.__str__ </li>
+#end for
+</ul>
+<ul>
+#for $mx in $mxs[$name.id]
+<li> mx: $mx.priority $mx.__str__ </li>
+#end for
+</ul>
+#end for
+</ul>
+#end if
+
+#if $cnames and not $names
+<ul>
+#for $cname in $cnames
+<li> cname: $cname.__str__ </li>
+#end for
+</ul>
+#end if
+
+#if $mxs and not $names
+<ul>
+#for $mx in $mxs
+<li> mx: $mx.priority $mx.__str__ </li>
+#end for
+</ul>
+#end if
+
+#if $interface
+</ul>
+#end if
+
+<input type="submit" value="confirm">
+<input type="reset" value="cancel" onclick="history.back()">
+</form>
+            <!-- InstanceEndEditable --></td> 
+        </tr> 
+    </table></td>
+  </tr> 
+  <tr valign="top"> 
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
+        <tr> 
+          <td colspan="2" align="left"><hr size="1"></td> 
+        </tr> 
+        <tr valign="top"> 
+          <td colspan="2" align="center"><table border="0" cellspacing="0" cellpadding="5">
+            <tr>
+              <td><a href="http://www.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe.gif" alt="U.S. Department of Energy" width="153" height="35" border="0"></a></td>
+              <td><a href="http://www.uchicago.edu/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_uofc.gif" alt="The University of Chicago" width="125" height="34" border="0"></a></td>
+              
+              <td><!-- InstanceBeginEditable name="sponsorLogos" --><!-- #BeginLibraryItem "/Library/logoOfficeOfScience.lbi" --><a href="http://www.sc.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe_science.gif" alt="Office of Science - Department of Energy" width="143" height="31" border="0"></a><!-- #EndLibraryItem --><!-- InstanceEndEditable --></td>
+             </tr>
+          </table></td> 
+        </tr> 
+        <tr> 
+          <td colspan="2" align="center"> <table cellspacing="0" cellpadding="2" border="0"> 
+              <tr> 
+                <td class="footerText"><a href="http://www.anl.gov/notice.html">Privacy &amp; Security Notice</a>&nbsp;|&nbsp;<a href="http://www.anl.gov/Adminstration/contactus.html">Contact Us</a></td> 
+              </tr> 
+            </table></td> 
+        </tr> 
+      </table></td> 
+  </tr> 
+</table> 
+</body>
+<!-- InstanceEnd --></html>
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html
new file mode 100644
index 000000000..a937fb833
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html
@@ -0,0 +1,133 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><!-- InstanceBegin template="/Templates/publicFull.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<link href="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/stylesheets/argonne.css" rel="stylesheet" type="text/css">
+<link href="http://www.anl.gov/favicon.ico" rel="SHORTCUT ICON">
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/anlmain.js" type="text/JavaScript"></script>
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/stm31.js" type="text/JavaScript"></script>
+<!-- InstanceBeginEditable name="head" -->
+<!-- Insert page specific head elements in this region, including custom javascript -->
+<!-- TemplateBeginEditable name="head" -->
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/main.js" type="text/JavaScript"></script>
+<!-- TemplateEndEditable --><!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="title" -->
+<title></title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="metadata" -->
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="classification" content="">
+<meta name="author" content="Argonne National Laboratory">
+<meta name="expires" content="">
+<!-- InstanceEndEditable -->
+<!-- InstanceParam name="Contact URL" type="URL" value="../about/contacts.html" --><!-- InstanceParam name="Sitemap URL" type="URL" value="../Division/sitemap.html" --><!-- InstanceParam name="Search URL" type="URL" value="../About/search.html" --><!-- InstanceParam name="enableOptionalSponsorLogos" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarTabs" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarSearch" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSitemapFooter" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSearchFooter" type="boolean" value="false" -->
+</head>
+<body> 
+<table width="100%" border="0" cellpadding="0" cellspacing="3"> 
+  <tr> 
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr class="headerBkgd" valign="middle">
+        <td width="10"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" height="10" width="10" border="0" alt=""></td>
+        <td width="300" align="left"><a href="http://www.anl.gov"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/argonne_header_logo.jpg" alt="Argonne National Laboratory" width="227" height="100" border="0"></a></td>
+        <td><span class="sectionTitle"><!-- InstanceBeginEditable name="divisionProgramIdentity" --><img src="http://www-unix.mcs.anl.gov/hostbaseweb/images/mcs_logo_white_minus_logo_small.png" width="92" height="31"><br>
+                <a href="http://www.mcs.anl.gov">Mathematics
+                and Computer Science </a><!-- InstanceEndEditable --></span></td>
+      </tr>
+    </table></td> 
+  </tr> 
+  <tr> 
+    <td> <table width="100%"  border="0" cellspacing="0" cellpadding="0"> 
+         
+        <tr> <!-- InstanceBeginRepeat name="localNavigation" --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="http://www.mcs.anl.gov">About
+                  Us</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/research/">Research</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="../research/index.html"></a><a href="http://www-fp.mcs.anl.gov/division/resources/">Facilities</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/people/">Staff</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/software/">Software</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/collaboration">Collaborations </a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/information/">Information</a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceEndRepeat -->  
+         
+        <td class="navGlobalBkgd" width="50%"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="1" height="30" border="0" alt=""></td> 
+           </tr> </table> 
+      <!-- #EndLibraryItem --></td> 
+  </tr> 
+  <tr> 
+    <td class="greyBkgdLight"><span class="breadcrumbs"><a href="http://www.mcs.anl.gov/">MCS
+          Home</a> &gt; <!-- InstanceBeginEditable name="topLevelBreadcrumbs" --> 
+          <script language="JavaScript">breadCrumbs("www-unix.mcs.anl.gov/new",">","","breadcrumbs","None","None","0");</script>
+          <!-- InstanceEndEditable --></span></td>
+  </tr> 
+  <tr valign="top"> 
+    <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0"> 
+        <tr> 
+          <td><!-- InstanceBeginEditable name="mainFeature" --> 
+<b>DNS Information for host "$host.hostname"</b>
+
+   #for $interface in $interfaces
+   #for $ip in $ips[$interface.id]
+   <ul><li> <b>ip_addr:</b> $ip.ip_addr</li>
+   #for $name in $names[$ip.id]
+   <ul> <li><b>name:</b> $name.name</li> <ul>
+   #for $cname in $cnames[$name.id]
+   <li> <b>cname:</b> $cname.cname</li>
+   #end for
+   #for $mx in $mxs[$name.id]
+   <li> <b>mx:</b> $mx.priority $mx.mx</li>
+   #end for
+   </ul></ul>
+   #end for
+   </ul>
+   #end for
+   #end for
+            <!-- InstanceEndEditable --></td> 
+        </tr> 
+    </table></td>
+  </tr> 
+  <tr valign="top"> 
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
+        <tr> 
+          <td colspan="2" align="left"><hr size="1"></td> 
+        </tr> 
+        <tr valign="top"> 
+          <td colspan="2" align="center"><table border="0" cellspacing="0" cellpadding="5">
+            <tr>
+              <td><a href="http://www.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe.gif" alt="U.S. Department of Energy" width="153" height="35" border="0"></a></td>
+              <td><a href="http://www.uchicago.edu/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_uofc.gif" alt="The University of Chicago" width="125" height="34" border="0"></a></td>
+              
+              <td><!-- InstanceBeginEditable name="sponsorLogos" --><!-- #BeginLibraryItem "/Library/logoOfficeOfScience.lbi" --><a href="http://www.sc.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe_science.gif" alt="Office of Science - Department of Energy" width="143" height="31" border="0"></a><!-- #EndLibraryItem --><!-- InstanceEndEditable --></td>
+             </tr>
+          </table></td> 
+        </tr> 
+        <tr> 
+          <td colspan="2" align="center"> <table cellspacing="0" cellpadding="2" border="0"> 
+              <tr> 
+                <td class="footerText"><a href="http://www.anl.gov/notice.html">Privacy &amp; Security Notice</a>&nbsp;|&nbsp;<a href="http://www.anl.gov/Administration/contactus.html">Contact Us</a></td> 
+              </tr> 
+            </table></td> 
+        </tr> 
+      </table></td> 
+  </tr> 
+</table> 
+</body>
+<!-- InstanceEnd --></html>
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
new file mode 100644
index 000000000..9065153da
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
@@ -0,0 +1,192 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><!-- InstanceBegin template="/Templates/publicFull.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<link href="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/stylesheets/argonne.css" rel="stylesheet" type="text/css">
+<link href="http://www.anl.gov/favicon.ico" rel="SHORTCUT ICON">
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/anlmain.js" type="text/JavaScript"></script>
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/stm31.js" type="text/JavaScript"></script>
+<!-- InstanceBeginEditable name="head" -->
+<!-- Insert page specific head elements in this region, including custom javascript -->
+<!-- TemplateBeginEditable name="head" -->
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/main.js" type="text/JavaScript"></script>
+<!-- TemplateEndEditable --><!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="title" -->
+<title></title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="metadata" -->
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="classification" content="">
+<meta name="author" content="Argonne National Laboratory">
+<meta name="expires" content="">
+<!-- InstanceEndEditable -->
+<!-- InstanceParam name="Contact URL" type="URL" value="../about/contacts.html" --><!-- InstanceParam name="Sitemap URL" type="URL" value="../Division/sitemap.html" --><!-- InstanceParam name="Search URL" type="URL" value="../About/search.html" --><!-- InstanceParam name="enableOptionalSponsorLogos" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarTabs" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarSearch" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSitemapFooter" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSearchFooter" type="boolean" value="false" -->
+</head>
+<body> 
+<table width="100%" border="0" cellpadding="0" cellspacing="3"> 
+  <tr> 
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr class="headerBkgd" valign="middle">
+        <td width="10"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" height="10" width="10" border="0" alt=""></td>
+        <td width="300" align="left"><a href="http://www.anl.gov"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/argonne_header_logo.jpg" alt="Argonne National Laboratory" width="227" height="100" border="0"></a></td>
+        <td><span class="sectionTitle"><!-- InstanceBeginEditable name="divisionProgramIdentity" --><img src="http://www-unix.mcs.anl.gov/hostbaseweb/images/mcs_logo_white_minus_logo_small.png" width="92" height="31"><br>
+                <a href="http://www.mcs.anl.gov">Mathematics
+                and Computer Science </a><!-- InstanceEndEditable --></span></td>
+      </tr>
+    </table></td> 
+  </tr> 
+  <tr> 
+    <td> <table width="100%"  border="0" cellspacing="0" cellpadding="0"> 
+         
+        <tr> <!-- InstanceBeginRepeat name="localNavigation" --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="http://www.mcs.anl.gov">About
+                  Us</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/research/">Research</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="../research/index.html"></a><a href="http://www-fp.mcs.anl.gov/division/resources/">Facilities</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/people/">Staff</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/software/">Software</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/collaboration">Collaborations </a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/information/">Information</a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceEndRepeat -->  
+         
+        <td class="navGlobalBkgd" width="50%"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="1" height="30" border="0" alt=""></td> 
+           </tr> </table> 
+      <!-- #EndLibraryItem --></td> 
+  </tr> 
+  <tr> 
+    <td class="greyBkgdLight"><span class="breadcrumbs"><a href="http://www.mcs.anl.gov/">MCS
+          Home</a> &gt; <!-- InstanceBeginEditable name="topLevelBreadcrumbs" --> 
+          <script language="JavaScript">breadCrumbs("www-unix.mcs.anl.gov/new",">","","breadcrumbs","None","None","0");</script>
+          <!-- InstanceEndEditable --></span></td>
+  </tr> 
+  <tr valign="top"> 
+    <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0"> 
+        <tr> 
+          <td><!-- InstanceBeginEditable name="mainFeature" --> 
+
+#set $cont = 1
+
+#if $request.GET.has_key('sub')
+ok, submitted
+#end if
+
+
+#if $cont
+<form name="dns" action="?sub=true" method="post">
+<input type="hidden" name="host" value="$host.id">
+<b>Edit DNS information below for individual IP addresses.</b>
+<table border="0" width="100%">
+   <colgroup>
+   <col width="150">
+   <col width="*">
+   #for $interface in $interfaces
+       <tr><td><br></td></tr>
+       <tr> <td> <b>interface type</b> </td>
+       <td> $interface.hdwr_type </td></tr>
+       <tr> <td> <b>mac_addr</b> </td>
+       <td> $interface.mac_addr </td></tr>
+       <tr><td><hr></td><td><hr></td></tr>
+       #for $ip in $ips[$interface.id]
+           <tr> <td> <b>ip_addr</b></td>
+	   <td>$ip.ip_addr</td></tr>
+           #for $name in $names[$ip.id]
+	       <tr> <td><b>name(dns)</b></td>
+	       <td> <input name="name$name.id" type="text" value="$name.name">
+	       <select name="dns_view$name.id">
+	       #for $choice in $name.DNS_CHOICES
+	       #if $name.dns_view == $choice[0]
+	       <option value="$choice[0]">$choice[1]
+	       #else
+	       <option value="$choice[0]">$choice[1]
+	       #end if
+	       #end for
+	       </select>
+	       <a style="font-size:75%" href="/hostbase/$host.id/name/${name.id}/confirm">remove</a></td></tr>
+	       #for $cname in $cnames[$name.id]
+	       <tr> <td> <b>cname</b></td>
+	       <td> <input name="cname$cname.id" type="text" value="$cname.cname">
+	       <a style="font-size:75%" href="/hostbase/$host.id/cname/${cname.id}/confirm">remove</a></td></tr>
+	       #end for
+	       <tr> <td> <b>cname</b></td>
+	       <td> <input name="${name.id}cname" type="text"></td></tr>
+	       #for $mx in $mxs[$name.id]
+	       <tr> <td> <b>mx</b></td>
+	       <td> <input name="priority$mx.id" type="text" size="6" value="$mx.priority">
+	       <input name="mx$mx.id" type="text" value="$mx.mx">
+	       <a style="font-size:75%" href="/hostbase/$host.id/mx/${mx.id}/${name.id}/confirm">remove</a></td></tr>
+	       #end for
+	       <tr> <td> <b>mx</b></td>
+	       <td> <input name="${name.id}priority" type="text" size="6">
+	       <input name="${name.id}mx" type="text"></td></tr>
+	   #end for
+   	   <tr> <td> <b>name</b></td>
+	   <td> <input name="${ip.__str__}name" type="text">
+	   <select name="${ip.__str__}dns_view">	   
+	   #for $choice in $name.DNS_CHOICES
+	   <option value="$choice[0]">$choice[1]
+	   #end for
+	   </select></td></tr>
+	   <tr> <td> <b>cname</b></td>
+	   <td> <input name="${ip.__str__}cname" type="text"></td></tr>
+	   <tr> <td> <b>mx</b></td>
+	   <td> <input name="${ip.__str__}priority" type="text" size="6">
+	   <input name="${ip.__str__}mx" type="text"></td></tr>
+	   <tr><td></td></tr>
+  	   <tr><td><hr></td><td><hr></td></tr>
+       #end for
+   #end for
+   </table>
+
+<p><input type="submit" value="Submit">
+</form>
+#end if
+            <!-- InstanceEndEditable --></td> 
+        </tr> 
+    </table></td>
+  </tr> 
+  <tr valign="top"> 
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
+        <tr> 
+          <td colspan="2" align="left"><hr size="1"></td> 
+        </tr> 
+        <tr valign="top"> 
+          <td colspan="2" align="center"><table border="0" cellspacing="0" cellpadding="5">
+            <tr>
+              <td><a href="http://www.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe.gif" alt="U.S. Department of Energy" width="153" height="35" border="0"></a></td>
+              <td><a href="http://www.uchicago.edu/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_uofc.gif" alt="The University of Chicago" width="125" height="34" border="0"></a></td>
+              
+              <td><!-- InstanceBeginEditable name="sponsorLogos" --><!-- #BeginLibraryItem "/Library/logoOfficeOfScience.lbi" --><a href="http://www.sc.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe_science.gif" alt="Office of Science - Department of Energy" width="143" height="31" border="0"></a><!-- #EndLibraryItem --><!-- InstanceEndEditable --></td>
+             </tr>
+          </table></td> 
+        </tr> 
+        <tr> 
+          <td colspan="2" align="center"> <table cellspacing="0" cellpadding="2" border="0"> 
+              <tr> 
+                <td class="footerText"><a href="http://www.anl.gov/notice.html">Privacy &amp; Security Notice</a>&nbsp;|&nbsp;<a href="http://www.anl.gov/Administration/contactus.html">Contact Us</a></td> 
+              </tr> 
+            </table></td> 
+        </tr> 
+      </table></td> 
+  </tr> 
+</table> 
+</body>
+<!-- InstanceEnd --></html>
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
new file mode 100644
index 000000000..71ca621a1
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
@@ -0,0 +1,314 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><!-- InstanceBegin template="/Templates/publicFull.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<link href="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/stylesheets/argonne.css" rel="stylesheet" type="text/css">
+<link href="http://www.anl.gov/favicon.ico" rel="SHORTCUT ICON">
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/anlmain.js" type="text/JavaScript"></script>
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/stm31.js" type="text/JavaScript"></script>
+<!-- InstanceBeginEditable name="head" -->
+<!-- Insert page specific head elements in this region, including custom javascript -->
+<!-- TemplateBeginEditable name="head" -->
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/main.js" type="text/JavaScript"></script>
+<!-- TemplateEndEditable --><!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="title" -->
+<title></title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="metadata" -->
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="classification" content="">
+<meta name="author" content="Argonne National Laboratory">
+<meta name="expires" content="">
+<!-- InstanceEndEditable -->
+<!-- InstanceParam name="Contact URL" type="URL" value="../about/contacts.html" --><!-- InstanceParam name="Sitemap URL" type="URL" value="../Division/sitemap.html" --><!-- InstanceParam name="Search URL" type="URL" value="../About/search.html" --><!-- InstanceParam name="enableOptionalSponsorLogos" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarTabs" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarSearch" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSitemapFooter" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSearchFooter" type="boolean" value="false" -->
+</head>
+<body> 
+<table width="100%" border="0" cellpadding="0" cellspacing="3"> 
+  <tr> 
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr class="headerBkgd" valign="middle">
+        <td width="10"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" height="10" width="10" border="0" alt=""></td>
+        <td width="300" align="left"><a href="http://www.anl.gov"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/argonne_header_logo.jpg" alt="Argonne National Laboratory" width="227" height="100" border="0"></a></td>
+        <td><span class="sectionTitle"><!-- InstanceBeginEditable name="divisionProgramIdentity" --><img src="http://www-unix.mcs.anl.gov/hostbaseweb/images/mcs_logo_white_minus_logo_small.png" width="92" height="31"><br>
+                <a href="http://www.mcs.anl.gov">Mathematics
+                and Computer Science </a><!-- InstanceEndEditable --></span></td>
+      </tr>
+    </table></td> 
+  </tr> 
+  <tr> 
+    <td> <table width="100%"  border="0" cellspacing="0" cellpadding="0"> 
+         
+        <tr> <!-- InstanceBeginRepeat name="localNavigation" --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="http://www.mcs.anl.gov">About
+                  Us</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/research/">Research</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="../research/index.html"></a><a href="http://www-fp.mcs.anl.gov/division/resources/">Facilities</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/people/">Staff</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/software/">Software</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/collaboration">Collaborations </a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/information/">Information</a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceEndRepeat -->  
+         
+        <td class="navGlobalBkgd" width="50%"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="1" height="30" border="0" alt=""></td> 
+           </tr> </table> 
+      <!-- #EndLibraryItem --></td> 
+  </tr> 
+  <tr> 
+    <td class="greyBkgdLight"><span class="breadcrumbs"><a href="http://www.mcs.anl.gov/">MCS
+          Home</a> &gt; <!-- InstanceBeginEditable name="topLevelBreadcrumbs" --> 
+          <script language="JavaScript">breadCrumbs("www-unix.mcs.anl.gov/new",">","","breadcrumbs","None","None","0");</script>
+          <!-- InstanceEndEditable --></span></td>
+  </tr> 
+  <tr valign="top"> 
+    <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0"> 
+        <tr> 
+          <td><!-- InstanceBeginEditable name="mainFeature" --> 
+<script language=JavaScript type=text/Javascript>
+function toggleAddr(interface_id){
+   if(document.getElementById){
+      var style = document.getElementById('ipaddr'+interface_id).style;
+      style.display = style.display? "":"block";
+   }
+}
+function toggleInter(){
+   if(document.getElementById){
+      var style = document.getElementById('interface').style;
+      style.display = style.display? "":"block";
+   }
+}
+</script>
+
+<style type=text/css>
+#for $interface in $interfaces
+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;
+}
+</style>
+
+#set $cont = 1
+
+#if $request.GET.has_key('sub')
+ok, submitted
+#end if
+
+#if $cont
+<form name="hostdata" action="?sub=true" method="post">
+<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" type="text" value="$host.hostname"></td></tr>
+   <tr> <td> <b>whatami</b></td>
+   <td> <input name="whatami" type="text" value="$host.whatami"></td></tr>
+   <tr> <td> <b>netgroup</b></td>
+   <td>
+   <select name="netgroup">
+   #for $choice in $host.NETGROUP_CHOICES
+       #if $host.netgroup == $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>class</b></td>
+   <td>
+   <select name="security_class">
+   #for $choice in $host.CLASS_CHOICES
+       #if $host.security_class == $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>support</b></td>
+   <td>
+   <select name="support">
+   #for $choice in $host.SUPPORT_CHOICES
+       #if $host.support == $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>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>dhcp</b></td>
+   <td>
+   #if $host.dhcp
+       <input type="checkbox" checked="checked" name="dhcp"></td></tr>
+   #else
+       <input type="checkbox" name="dhcp"></td></tr>
+   #end if   
+   <tr> <td> <b>outbound_smtp</b></td>
+   <td>
+   #if $host.outbound_smtp
+       <input type="checkbox" checked="checked" name="outbound_smtp"></td></tr>
+   #else
+       <input type="checkbox" name="outbound_smtp"></td></tr>
+   #end if   
+   <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>
+   #for $interface in $interfaces
+       <tr> <td><br><b>Interface</b>
+       </td><td><br>
+       #for $choice in $interface.TYPE_CHOICES
+           #if $interface.hdwr_type == $choice[0]
+               <input type="radio" name="hdwr_type$interface.id" value="$choice[0]" checked="checked">$choice[1]
+           #else
+               <input type="radio" name="hdwr_type$interface.id" value="$choice[0]">$choice[1]
+           #end if
+       #end for
+       </td></tr>
+       <tr> <td> <b>mac_addr</b></td>
+       <td> <input name="mac_addr$interface.id" type="text" value="$interface.mac_addr">
+       <a style="font-size:75%" href="/hostbase/$host.id/interface/${interface.id}/confirm">remove</a>
+       </td></tr>
+       #for $ip in $ips[$interface.id]
+           <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>
+       #end for
+
+<!-- Section for adding a new IP address to an existing interface -->
+<!-- By default, section is hidden -->
+       </table>
+       <div id=ipaddr${interface.id}>
+       <table border="0" width="100%">
+           <colgroup>
+           <col width="150">
+           <col width="*">
+           <tr> <td> <b>ip_addr</b></td>
+           <td> <input name="${interface.id}ip_addr" type="text"></td></tr>
+       </table>
+       </div>
+       <a style="font-size:75%" href=# onclick="toggleAddr($interface.id)">Add a New IP Address</a>
+       <table border="0" width="100%">
+           <colgroup>
+               <col width="150">
+	       <col width="*">
+   #end for
+<!--  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>
+   #for $choice in $type_choices
+   <input type="radio" name="hdwr_type_new" value="$choice[0]">$choice[1]
+   #end for
+   </td></tr>
+   <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>
+</div>
+<a style="font-size:75%" href=# onclick="toggleInter()">Add a New Interface</a>
+<!-- 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>
+<a style="font-size:75%" href="/hostbase/$host.id/dns/edit">edit detailed DNS information for this host</a>
+<br>
+this host is 
+<select name="status">
+#for $choice in $host.STATUS_CHOICES
+#if $host.status == $choice[0]
+<option value="$choice[0]" selected="selected">$choice[1]
+#else
+<option value="$choice[0]">$choice[1]
+#end if
+#end for
+</select><br>
+last update on $host.last<br>
+<p><input type="submit" value="Submit">
+</form>
+#end if
+            <!-- InstanceEndEditable --></td> 
+        </tr> 
+    </table></td>
+  </tr> 
+  <tr valign="top"> 
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
+        <tr> 
+          <td colspan="2" align="left"><hr size="1"></td> 
+        </tr> 
+        <tr valign="top"> 
+          <td colspan="2" align="center"><table border="0" cellspacing="0" cellpadding="5">
+            <tr>
+              <td><a href="http://www.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe.gif" alt="U.S. Department of Energy" width="153" height="35" border="0"></a></td>
+              <td><a href="http://www.uchicago.edu/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_uofc.gif" alt="The University of Chicago" width="125" height="34" border="0"></a></td>
+              
+              <td><!-- InstanceBeginEditable name="sponsorLogos" --><!-- #BeginLibraryItem "/Library/logoOfficeOfScience.lbi" --><a href="http://www.sc.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe_science.gif" alt="Office of Science - Department of Energy" width="143" height="31" border="0"></a><!-- #EndLibraryItem --><!-- InstanceEndEditable --></td>
+             </tr>
+          </table></td> 
+        </tr> 
+        <tr> 
+          <td colspan="2" align="center"> <table cellspacing="0" cellpadding="2" border="0"> 
+              <tr> 
+                <td class="footerText"><a href="http://www.anl.gov/notice.html">Privacy &amp; Security Notice</a>&nbsp;|&nbsp;<a href="http://www.anl.gov/Administration/contactus.html">Contact Us</a></td> 
+              </tr> 
+            </table></td> 
+        </tr> 
+      </table></td> 
+  </tr> 
+</table> 
+</body>
+<!-- InstanceEnd --></html>
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html b/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html
new file mode 100644
index 000000000..83f5cd014
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><!-- InstanceBegin template="/Templates/publicFull.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<link href="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/stylesheets/argonne.css" rel="stylesheet" type="text/css">
+<link href="http://www.anl.gov/favicon.ico" rel="SHORTCUT ICON">
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/anlmain.js" type="text/JavaScript"></script>
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/stm31.js" type="text/JavaScript"></script>
+<!-- InstanceBeginEditable name="head" -->
+<!-- Insert page specific head elements in this region, including custom javascript -->
+<!-- TemplateBeginEditable name="head" -->
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/main.js" type="text/JavaScript"></script>
+<!-- TemplateEndEditable --><!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="title" -->
+<title></title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="metadata" -->
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="classification" content="">
+<meta name="author" content="Argonne National Laboratory">
+<meta name="expires" content="">
+<!-- InstanceEndEditable -->
+<!-- InstanceParam name="Contact URL" type="URL" value="../about/contacts.html" --><!-- InstanceParam name="Sitemap URL" type="URL" value="../Division/sitemap.html" --><!-- InstanceParam name="Search URL" type="URL" value="../About/search.html" --><!-- InstanceParam name="enableOptionalSponsorLogos" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarTabs" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarSearch" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSitemapFooter" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSearchFooter" type="boolean" value="false" -->
+</head>
+<body> 
+<table width="100%" border="0" cellpadding="0" cellspacing="3"> 
+  <tr> 
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr class="headerBkgd" valign="middle">
+        <td width="10"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" height="10" width="10" border="0" alt=""></td>
+        <td width="300" align="left"><a href="http://www.anl.gov"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/argonne_header_logo.jpg" alt="Argonne National Laboratory" width="227" height="100" border="0"></a></td>
+        <td><span class="sectionTitle"><!-- InstanceBeginEditable name="divisionProgramIdentity" --><img src="http://www-unix.mcs.anl.gov/hostbaseweb/images/mcs_logo_white_minus_logo_small.png" width="92" height="31"><br>
+                <a href="http://www.mcs.anl.gov">Mathematics
+                and Computer Science </a><!-- InstanceEndEditable --></span></td>
+      </tr>
+    </table></td> 
+  </tr> 
+  <tr> 
+    <td> <table width="100%"  border="0" cellspacing="0" cellpadding="0"> 
+         
+        <tr> <!-- InstanceBeginRepeat name="localNavigation" --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="http://www.mcs.anl.gov">About
+                  Us</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/research/">Research</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="../research/index.html"></a><a href="http://www-fp.mcs.anl.gov/division/resources/">Facilities</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/people/">Staff</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/software/">Software</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/collaboration">Collaborations </a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/information/">Information</a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceEndRepeat -->  
+         
+        <td class="navGlobalBkgd" width="50%"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="1" height="30" border="0" alt=""></td> 
+           </tr> </table> 
+      <!-- #EndLibraryItem --></td> 
+  </tr> 
+  <tr> 
+    <td class="greyBkgdLight"><span class="breadcrumbs"><a href="http://www.mcs.anl.gov/">MCS
+          Home</a> &gt; <!-- InstanceBeginEditable name="topLevelBreadcrumbs" --> 
+          <script language="JavaScript">breadCrumbs("www-unix.mcs.anl.gov/new",">","index.html","breadcrumbs","None","None","0");</script>
+          <!-- InstanceEndEditable --></span></td>
+  </tr> 
+  <tr valign="top"> 
+    <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0"> 
+        <tr> 
+          <td><!-- InstanceBeginEditable name="mainFeature" --> 
+#if $failures
+There were errors in the following fields<br><br>
+#for $failure in $failures
+
+<font color="#FF0000">$failure</font><br>
+
+#end for
+#end if
+<br>
+Press the back button on your browser and edit those field(s)
+            <!-- InstanceEndEditable --></td> 
+        </tr> 
+    </table></td>
+  </tr> 
+  <tr valign="top"> 
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
+        <tr> 
+          <td colspan="2" align="left"><hr size="1"></td> 
+        </tr> 
+        <tr valign="top"> 
+          <td colspan="2" align="center"><table border="0" cellspacing="0" cellpadding="5">
+            <tr>
+              <td><a href="http://www.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe.gif" alt="U.S. Department of Energy" width="153" height="35" border="0"></a></td>
+              <td><a href="http://www.uchicago.edu/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_uofc.gif" alt="The University of Chicago" width="125" height="34" border="0"></a></td>
+              
+              <td><!-- InstanceBeginEditable name="sponsorLogos" --><!-- #BeginLibraryItem "/Library/logoOfficeOfScience.lbi" --><a href="http://www.sc.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe_science.gif" alt="Office of Science - Department of Energy" width="143" height="31" border="0"></a><!-- #EndLibraryItem --><!-- InstanceEndEditable --></td>
+             </tr>
+          </table></td> 
+        </tr> 
+        <tr> 
+          <td colspan="2" align="center"> <table cellspacing="0" cellpadding="2" border="0"> 
+              <tr> 
+                <td class="footerText"><a href="http://www.anl.gov/notice.html">Privacy &amp; Security Notice</a>&nbsp;|&nbsp;<a href="http://www.anl.gov/Administration/contactus.html">Contact Us</a></td> 
+              </tr> 
+            </table></td> 
+        </tr> 
+      </table></td> 
+  </tr> 
+</table> 
+</body>
+<!-- InstanceEnd --></html>
+
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
new file mode 100644
index 000000000..a9ec9014b
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
@@ -0,0 +1,173 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><!-- InstanceBegin template="/Templates/publicFull.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<link href="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/stylesheets/argonne.css" rel="stylesheet" type="text/css">
+<link href="http://www.anl.gov/favicon.ico" rel="SHORTCUT ICON">
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/anlmain.js" type="text/JavaScript"></script>
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/stm31.js" type="text/JavaScript"></script>
+<!-- InstanceBeginEditable name="head" -->
+<!-- Insert page specific head elements in this region, including custom javascript -->
+<!-- TemplateBeginEditable name="head" -->
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/main.js" type="text/JavaScript"></script>
+<!-- TemplateEndEditable --><!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="title" -->
+<title></title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="metadata" -->
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="classification" content="">
+<meta name="author" content="Argonne National Laboratory">
+<meta name="expires" content="">
+<!-- InstanceEndEditable -->
+<!-- InstanceParam name="Contact URL" type="URL" value="../about/contacts.html" --><!-- InstanceParam name="Sitemap URL" type="URL" value="../Division/sitemap.html" --><!-- InstanceParam name="Search URL" type="URL" value="../About/search.html" --><!-- InstanceParam name="enableOptionalSponsorLogos" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarTabs" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarSearch" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSitemapFooter" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSearchFooter" type="boolean" value="false" -->
+</head>
+<body> 
+<table width="100%" border="0" cellpadding="0" cellspacing="3"> 
+  <tr> 
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr class="headerBkgd" valign="middle">
+        <td width="10"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" height="10" width="10" border="0" alt=""></td>
+        <td width="300" align="left"><a href="http://www.anl.gov"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/argonne_header_logo.jpg" alt="Argonne National Laboratory" width="227" height="100" border="0"></a></td>
+        <td><span class="sectionTitle"><!-- InstanceBeginEditable name="divisionProgramIdentity" --><img src="http://www-unix.mcs.anl.gov/hostbaseweb/images/mcs_logo_white_minus_logo_small.png" width="92" height="31"><br>
+                <a href="http://www.mcs.anl.gov">Mathematics
+                and Computer Science </a><!-- InstanceEndEditable --></span></td>
+      </tr>
+    </table></td> 
+  </tr> 
+  <tr> 
+    <td> <table width="100%"  border="0" cellspacing="0" cellpadding="0"> 
+         
+        <tr> <!-- InstanceBeginRepeat name="localNavigation" --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="http://www.mcs.anl.gov">About
+                  Us</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/research/">Research</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="../research/index.html"></a><a href="http://www-fp.mcs.anl.gov/division/resources/">Facilities</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/people/">Staff</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/software/">Software</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/collaboration">Collaborations </a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/information/">Information</a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceEndRepeat -->  
+         
+        <td class="navGlobalBkgd" width="50%"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="1" height="30" border="0" alt=""></td> 
+           </tr> </table> 
+      <!-- #EndLibraryItem --></td> 
+  </tr> 
+  <tr> 
+    <td class="greyBkgdLight"><span class="breadcrumbs"><a href="http://www.mcs.anl.gov/">MCS
+          Home</a> &gt; <!-- InstanceBeginEditable name="topLevelBreadcrumbs" --> 
+          <script language="JavaScript">breadCrumbs("www-unix.mcs.anl.gov/new",">","","breadcrumbs","None","None","0");</script>
+          <!-- InstanceEndEditable --></span></td>
+  </tr> 
+  <tr valign="top"> 
+    <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0"> 
+        <tr> 
+          <td><!-- InstanceBeginEditable name="mainFeature" --> 
+<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>
+   #end if
+   <tr> <td> <b>outbound_smtp</b></td>
+   #if $host.outbound_smtp
+   <td> y </td></tr>
+   #else
+   <td> n </td></tr>
+   #end if
+   <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>
+   #if $interface.hdwr_type != 'no'
+   <td><br>$interface.hdwr_type </td></tr>
+   #end if
+   <tr> <td> <b>mac_addr</b></td>
+   <td> $interface.mac_addr </b></td></tr>
+   #for $ip in $ips[$interface.id]
+   <tr> <td> <b>ip_addr</b></td>
+   <td> $ip.ip_addr</td></tr>
+   #end for
+   #end for
+   <tr> <td> <b>comments</b></td>
+   <td> $host.comments</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>
+            <!-- InstanceEndEditable --></td> 
+        </tr> 
+    </table></td>
+  </tr> 
+  <tr valign="top"> 
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
+        <tr> 
+          <td colspan="2" align="left"><hr size="1"></td> 
+        </tr> 
+        <tr valign="top"> 
+          <td colspan="2" align="center"><table border="0" cellspacing="0" cellpadding="5">
+            <tr>
+              <td><a href="http://www.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe.gif" alt="U.S. Department of Energy" width="153" height="35" border="0"></a></td>
+              <td><a href="http://www.uchicago.edu/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_uofc.gif" alt="The University of Chicago" width="125" height="34" border="0"></a></td>
+              
+              <td><!-- InstanceBeginEditable name="sponsorLogos" --><!-- #BeginLibraryItem "/Library/logoOfficeOfScience.lbi" --><a href="http://www.sc.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe_science.gif" alt="Office of Science - Department of Energy" width="143" height="31" border="0"></a><!-- #EndLibraryItem --><!-- InstanceEndEditable --></td>
+             </tr>
+          </table></td> 
+        </tr> 
+        <tr> 
+          <td colspan="2" align="center"> <table cellspacing="0" cellpadding="2" border="0"> 
+              <tr> 
+                <td class="footerText"><a href="http://www.anl.gov/notice.html">Privacy &amp; Security Notice</a>&nbsp;|&nbsp;<a href="http://www.anl.gov/Administration/contactus.html">Contact Us</a></td> 
+              </tr> 
+            </table></td> 
+        </tr> 
+      </table></td> 
+  </tr> 
+</table> 
+</body>
+<!-- InstanceEnd --></html>
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
new file mode 100644
index 000000000..bb00e57b0
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
@@ -0,0 +1,191 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><!-- InstanceBegin template="/Templates/publicFull.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<link href="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/stylesheets/argonne.css" rel="stylesheet" type="text/css">
+<link href="http://www.anl.gov/favicon.ico" rel="SHORTCUT ICON">
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/anlmain.js" type="text/JavaScript"></script>
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/stm31.js" type="text/JavaScript"></script>
+<!-- InstanceBeginEditable name="head" -->
+<!-- Insert page specific head elements in this region, including custom javascript -->
+<!-- TemplateBeginEditable name="head" -->
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/main.js" type="text/JavaScript"></script>
+<!-- TemplateEndEditable --><!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="title" -->
+<title></title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="metadata" -->
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="classification" content="">
+<meta name="author" content="Argonne National Laboratory">
+<meta name="expires" content="">
+<!-- InstanceEndEditable -->
+<!-- InstanceParam name="Contact URL" type="URL" value="../about/contacts.html" --><!-- InstanceParam name="Sitemap URL" type="URL" value="../Division/sitemap.html" --><!-- InstanceParam name="Search URL" type="URL" value="../About/search.html" --><!-- InstanceParam name="enableOptionalSponsorLogos" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarTabs" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarSearch" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSitemapFooter" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSearchFooter" type="boolean" value="false" -->
+</head>
+<body> 
+<table width="100%" border="0" cellpadding="0" cellspacing="3"> 
+  <tr> 
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr class="headerBkgd" valign="middle">
+        <td width="10"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" height="10" width="10" border="0" alt=""></td>
+        <td width="300" align="left"><a href="http://www.anl.gov"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/argonne_header_logo.jpg" alt="Argonne National Laboratory" width="227" height="100" border="0"></a></td>
+        <td><span class="sectionTitle"><!-- InstanceBeginEditable name="divisionProgramIdentity" --><img src="http://www-unix.mcs.anl.gov/hostbaseweb/images/mcs_logo_white_minus_logo_small.png" width="92" height="31"><br>
+                <a href="http://www.mcs.anl.gov">Mathematics
+                and Computer Science </a><!-- InstanceEndEditable --></span></td>
+      </tr>
+    </table></td> 
+  </tr> 
+  <tr> 
+    <td> <table width="100%"  border="0" cellspacing="0" cellpadding="0"> 
+         
+        <tr> <!-- InstanceBeginRepeat name="localNavigation" --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="http://www.mcs.anl.gov">About
+                  Us</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/research/">Research</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="../research/index.html"></a><a href="http://www-fp.mcs.anl.gov/division/resources/">Facilities</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/people/">Staff</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/software/">Software</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/collaboration">Collaborations </a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/information/">Information</a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceEndRepeat -->  
+         
+        <td class="navGlobalBkgd" width="50%"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="1" height="30" border="0" alt=""></td> 
+           </tr> </table> 
+      <!-- #EndLibraryItem --></td> 
+  </tr> 
+  <tr> 
+    <td class="greyBkgdLight"><span class="breadcrumbs"><a href="http://www.mcs.anl.gov/">MCS
+          Home</a> &gt; <!-- InstanceBeginEditable name="topLevelBreadcrumbs" --> 
+          <script language="JavaScript">breadCrumbs("www-unix.mcs.anl.gov/new",">","","breadcrumbs","None","None","0");</script>
+          <!-- InstanceEndEditable --></span></td>
+  </tr> 
+  <tr valign="top"> 
+    <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0"> 
+        <tr> 
+          <td><!-- InstanceBeginEditable name="mainFeature" --> 
+<b> Enter new host information </b>
+
+<form name="hostdata" action="?sub=true" method="post">
+<input type="hidden" name="host">
+<table border="0" width="100%">
+   <colgroup>
+   <col width="150">
+   <col width="*">
+   <tr> <td> <b>hostname</b></td>
+   <td> <input name="hostname" type="text" ></td></tr>
+   <tr> <td> <b>whatami</b></td>
+   <td> </td></tr>
+   <tr> <td> <b>netgroup</b></td>
+   <td>
+   <select name="netgroup">
+   #for $choice in $NETGROUP_CHOICES
+   <option value="$choice[0]">$choice[1]
+   #end for
+   </select>
+   </td></tr>
+   <tr> <td> <b>class</b></td>
+   <td>
+   <select name="security_class">   
+   #for $choice in $CLASS_CHOICES
+   <option value="$choice[0]">$choice[1]
+   #end for
+   </select></td></tr>
+   <tr> <td> <b>support</b></td>
+   <td>
+   <select name="support">
+   #for $choice in $SUPPORT_CHOICES
+   <option value="$choice[0]">$choice[1]
+   #end for
+   </select></td></tr>
+   <tr> <td> <b>csi</b></td>
+   <td> <input name="csi" type="text" ></td></tr>
+   <tr> <td> <b>printq</b></td>
+   <td> <input name="printq" type="text" ></td></tr>
+   <tr> <td> <b>dhcp</b></td>
+   <td>
+   <input type="checkbox" name="dhcp"></td></tr>
+   <tr> <td> <b>outbound_smtp</b></td>
+   <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>
+   <tr> <td> <b>administrator</b></td>
+   <td> <input name="administrator" type="text" size="32" ></td></tr>
+   <tr> <td> <b>location</b></td>
+   <td> <input name="location" type="text" ></td></tr>
+   <tr> <td> <b>expiration_date</b></td>
+   <td> <input name="expiration_date" type="text" size="10" >YYYY-MM-DD</td></tr>
+   <tr> <td><br><b>Interface</b></td><td><br>
+   #for $choice in $TYPE_CHOICES
+   <input type="radio" name="hdwr_type_new" value="$choice[0]" >$choice[1]
+   #end for
+   </td></tr>
+   <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>
+   <tr> <td><br><b>Interface</b></td><td><br>
+   #for $choice in $TYPE_CHOICES
+   <input type="radio" name="hdwr_type_new2" value="choice[0]" >$choice[1]
+   #end for
+   </td></tr>
+   <tr> <td> <b>mac_addr</b></td>
+   <td> <input name="mac_addr_new2" type="text"></td></tr>
+   <tr> <td> <b>ip_addr</b></td>
+   <td> <input name="ip_addr_new2" type="text"></td></tr>
+   <tr> <td> <b>comments</b></td>
+   <td> <textarea rows="10" cols="50" name="comments"></textarea></td></tr>
+</table>
+<br>
+<p><input type="submit" value="Submit">
+</form>
+            <!-- InstanceEndEditable --></td> 
+        </tr> 
+    </table></td>
+  </tr> 
+  <tr valign="top"> 
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
+        <tr> 
+          <td colspan="2" align="left"><hr size="1"></td> 
+        </tr> 
+        <tr valign="top"> 
+          <td colspan="2" align="center"><table border="0" cellspacing="0" cellpadding="5">
+            <tr>
+              <td><a href="http://www.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe.gif" alt="U.S. Department of Energy" width="153" height="35" border="0"></a></td>
+              <td><a href="http://www.uchicago.edu/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_uofc.gif" alt="The University of Chicago" width="125" height="34" border="0"></a></td>
+              
+              <td><!-- InstanceBeginEditable name="sponsorLogos" --><!-- #BeginLibraryItem "/Library/logoOfficeOfScience.lbi" --><a href="http://www.sc.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe_science.gif" alt="Office of Science - Department of Energy" width="143" height="31" border="0"></a><!-- #EndLibraryItem --><!-- InstanceEndEditable --></td>
+             </tr>
+          </table></td> 
+        </tr> 
+        <tr> 
+          <td colspan="2" align="center"> <table cellspacing="0" cellpadding="2" border="0"> 
+              <tr> 
+                <td class="footerText"><a href="http://www.anl.gov/notice.html">Privacy &amp; Security Notice</a>&nbsp;|&nbsp;<a href="http://www.anl.gov/Administration/contactus.html">Contact Us</a></td> 
+              </tr> 
+            </table></td> 
+        </tr> 
+      </table></td> 
+  </tr> 
+</table> 
+</body>
+<!-- InstanceEnd --></html>
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
new file mode 100644
index 000000000..efae1143f
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><!-- InstanceBegin template="/Templates/publicFull.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<link href="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/stylesheets/argonne.css" rel="stylesheet" type="text/css">
+<link href="http://www.anl.gov/favicon.ico" rel="SHORTCUT ICON">
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/anlmain.js" type="text/JavaScript"></script>
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/stm31.js" type="text/JavaScript"></script>
+<!-- InstanceBeginEditable name="head" -->
+<!-- Insert page specific head elements in this region, including custom javascript -->
+<!-- TemplateBeginEditable name="head" -->
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/main.js" type="text/JavaScript"></script>
+<!-- TemplateEndEditable --><!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="title" -->
+<title></title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="metadata" -->
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="classification" content="">
+<meta name="author" content="Argonne National Laboratory">
+<meta name="expires" content="">
+<!-- InstanceEndEditable -->
+<!-- InstanceParam name="Contact URL" type="URL" value="../about/contacts.html" --><!-- InstanceParam name="Sitemap URL" type="URL" value="../Division/sitemap.html" --><!-- InstanceParam name="Search URL" type="URL" value="../About/search.html" --><!-- InstanceParam name="enableOptionalSponsorLogos" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarTabs" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarSearch" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSitemapFooter" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSearchFooter" type="boolean" value="false" -->
+</head>
+<body> 
+<table width="100%" border="0" cellpadding="0" cellspacing="3"> 
+  <tr> 
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr class="headerBkgd" valign="middle">
+        <td width="10"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" height="10" width="10" border="0" alt=""></td>
+        <td width="300" align="left"><a href="http://www.anl.gov"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/argonne_header_logo.jpg" alt="Argonne National Laboratory" width="227" height="100" border="0"></a></td>
+        <td><span class="sectionTitle"><!-- InstanceBeginEditable name="divisionProgramIdentity" --><img src="http://www-unix.mcs.anl.gov/hostbaseweb/images/mcs_logo_white_minus_logo_small.png" width="92" height="31"><br>
+                <a href="http://www.mcs.anl.gov">Mathematics
+                and Computer Science </a><!-- InstanceEndEditable --></span></td>
+      </tr>
+    </table></td> 
+  </tr> 
+  <tr> 
+    <td> <table width="100%"  border="0" cellspacing="0" cellpadding="0"> 
+         
+        <tr> <!-- InstanceBeginRepeat name="localNavigation" --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="http://www.mcs.anl.gov">About
+                  Us</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/research/">Research</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="../research/index.html"></a><a href="http://www-fp.mcs.anl.gov/division/resources/">Facilities</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/people/">Staff</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/software/">Software</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/collaboration">Collaborations </a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/information/">Information</a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceEndRepeat -->  
+         
+        <td class="navGlobalBkgd" width="50%"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="1" height="30" border="0" alt=""></td> 
+           </tr> </table> 
+      <!-- #EndLibraryItem --></td> 
+  </tr> 
+  <tr> 
+    <td class="greyBkgdLight"><span class="breadcrumbs"><a href="http://www.mcs.anl.gov/">MCS
+          Home</a> &gt; <!-- InstanceBeginEditable name="topLevelBreadcrumbs" --> 
+          <script language="JavaScript">breadCrumbs("www-unix.mcs.anl.gov/new",">","","breadcrumbs","None","None","0");</script>
+          <!-- InstanceEndEditable --></span></td>
+  </tr> 
+  <tr valign="top"> 
+    <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0"> 
+        <tr> 
+          <td><!-- InstanceBeginEditable name="mainFeature" --> 
+#if $hosts
+<table border="0" width="100%">
+   <colgroup>
+   <col width="200">
+   <col width="75">
+   <col width="50">
+   <col width="*">
+   <tr> <td><b>hostname</b></td>
+   <td> <b>status</b> </td>
+   </tr>
+   #for $host in $hosts
+   <tr> <td> $host[0]</td>
+   #if $host[2]
+   <td> active </td>
+   #else
+   <td> inactive </td>
+   #end if
+   <td> <a href="$host[1]">view</a> </td>
+   <td> <a href="$host[1]/edit.html">edit</a> </td>
+   </tr>
+   #end for
+</table>
+#else
+No hosts matched your query<br>
+Click the back button on your browser to edit your search
+#end if
+            <!-- InstanceEndEditable --></td> 
+        </tr> 
+    </table></td>
+  </tr> 
+  <tr valign="top"> 
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
+        <tr> 
+          <td colspan="2" align="left"><hr size="1"></td> 
+        </tr> 
+        <tr valign="top"> 
+          <td colspan="2" align="center"><table border="0" cellspacing="0" cellpadding="5">
+            <tr>
+              <td><a href="http://www.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe.gif" alt="U.S. Department of Energy" width="153" height="35" border="0"></a></td>
+              <td><a href="http://www.uchicago.edu/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_uofc.gif" alt="The University of Chicago" width="125" height="34" border="0"></a></td>
+              
+              <td><!-- InstanceBeginEditable name="sponsorLogos" --><!-- #BeginLibraryItem "/Library/logoOfficeOfScience.lbi" --><a href="http://www.sc.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe_science.gif" alt="Office of Science - Department of Energy" width="143" height="31" border="0"></a><!-- #EndLibraryItem --><!-- InstanceEndEditable --></td>
+             </tr>
+          </table></td> 
+        </tr> 
+        <tr> 
+          <td colspan="2" align="center"> <table cellspacing="0" cellpadding="2" border="0"> 
+              <tr> 
+                <td class="footerText"><a href="http://www.anl.gov/notice.html">Privacy &amp; Security Notice</a>&nbsp;|&nbsp;<a href="http://www.anl.gov/Administration/contactus.html">Contact Us</a></td> 
+              </tr> 
+            </table></td> 
+        </tr> 
+      </table></td> 
+  </tr> 
+</table> 
+</body>
+<!-- InstanceEnd --></html>
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
new file mode 100644
index 000000000..29a684b1a
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
@@ -0,0 +1,183 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><!-- InstanceBegin template="/Templates/publicFull.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<link href="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/stylesheets/argonne.css" rel="stylesheet" type="text/css">
+<link href="http://www.anl.gov/favicon.ico" rel="SHORTCUT ICON">
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/anlmain.js" type="text/JavaScript"></script>
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/stm31.js" type="text/JavaScript"></script>
+<!-- InstanceBeginEditable name="head" -->
+<!-- Insert page specific head elements in this region, including custom javascript -->
+<!-- TemplateBeginEditable name="head" -->
+<script language="JavaScript" src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/javascript/main.js" type="text/JavaScript"></script>
+<!-- TemplateEndEditable --><!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="title" -->
+<title></title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="metadata" -->
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="classification" content="">
+<meta name="author" content="Argonne National Laboratory">
+<meta name="expires" content="">
+<!-- InstanceEndEditable -->
+<!-- InstanceParam name="Contact URL" type="URL" value="../about/contacts.html" --><!-- InstanceParam name="Sitemap URL" type="URL" value="../Division/sitemap.html" --><!-- InstanceParam name="Search URL" type="URL" value="../About/search.html" --><!-- InstanceParam name="enableOptionalSponsorLogos" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarTabs" type="boolean" value="true" --><!-- InstanceParam name="enableNavBarSearch" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSitemapFooter" type="boolean" value="false" --><!-- InstanceParam name="enableOptionalSearchFooter" type="boolean" value="false" -->
+</head>
+<body> 
+<table width="100%" border="0" cellpadding="0" cellspacing="3"> 
+  <tr> 
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr class="headerBkgd" valign="middle">
+        <td width="10"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" height="10" width="10" border="0" alt=""></td>
+        <td width="300" align="left"><a href="http://www.anl.gov"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/argonne_header_logo.jpg" alt="Argonne National Laboratory" width="227" height="100" border="0"></a></td>
+        <td><span class="sectionTitle"><!-- InstanceBeginEditable name="divisionProgramIdentity" -->
+	        <a href="http://www.mcs.anl.gov">Mathematics
+                and Computer Science </a><!-- InstanceEndEditable --></span></td>
+      </tr>
+    </table></td> 
+  </tr> 
+  <tr> 
+    <td> <table width="100%"  border="0" cellspacing="0" cellpadding="0"> 
+         
+        <tr> <!-- InstanceBeginRepeat name="localNavigation" --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="http://www.mcs.anl.gov">About
+                  Us</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/research/">Research</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --> <a href="../research/index.html"></a><a href="http://www-fp.mcs.anl.gov/division/resources/">Facilities</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" --><a href="http://www-fp.mcs.anl.gov/division/people/">Staff</a><!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/software/">Software</a> <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/collaboration">Collaborations </a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceBeginRepeatEntry --> 
+          <td nowrap class="navGlobalBkgd"><span class="navGlobal"><!-- InstanceBeginEditable name="localNavigationItem" -->
+		  	<a href="http://www-fp.mcs.anl.gov/division/information/">Information</a>
+          <!-- InstanceEndEditable --></span></td>
+          <td width="3" nowrap><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="3" height="1" border="0" alt=""></td> 
+          <!-- InstanceEndRepeatEntry --><!-- InstanceEndRepeat -->  
+         
+        <td class="navGlobalBkgd" width="50%"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/spacer.gif" width="1" height="30" border="0" alt=""></td> 
+           </tr> </table> 
+      <!-- #EndLibraryItem --></td> 
+  </tr> 
+  <tr> 
+    <td class="greyBkgdLight"><span class="breadcrumbs"><a href="http://www.mcs.anl.gov/">MCS
+          Home</a> &gt; <!-- InstanceBeginEditable name="topLevelBreadcrumbs" --> 
+          <script language="JavaScript">breadCrumbs("www-unix.mcs.anl.gov/new",">","","breadcrumbs","None","None","0");</script>
+          <!-- InstanceEndEditable --></span></td>
+</td>
+  </tr> 
+  <tr valign="top"> 
+    <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0"> 
+        <tr> 
+          <td><!-- InstanceBeginEditable name="mainFeature" --> 
+<h2>Welcome to the hostbase database!</h2>
+Find hosts using one or more of the searchable fields below.<br>
+#*...or go to <a href="hostinfo">this</a>
+ page to enter hostinfo-like queries<br><br>*#
+<form name="input" action="?sub=true" method="post">
+<table border="0" width="100%">
+   <colgroup>
+   <col width="150">
+   <col width="*">
+   <tr> <td> <b>hostname</b></td>
+   <td> <input name="hostname" type="text" ></td></tr>
+   <tr> <td> <b>whatami</b></td>
+   <td> <input name="whatami" type="text" ></td></tr>
+   <td> </td></tr>
+   <tr> <td> <b>netgroup</b></td>
+   <td> <input name="netgroup" type="text" ></td></tr>
+   <tr> <td> <b>class</b></td>
+   <td> <input name="security_class" type="text" ></td></tr>
+   <tr> <td> <b>support</b></td>
+   <td> <input name="support" type="text" ></td></tr>
+   <tr> <td> <b>csi</b></td>
+   <td> <input name="csi" type="text" ></td></tr>
+   <tr> <td> <b>printq</b></td>
+   <td> <input name="printq" type="text" ></td></tr>
+   <tr> <td> <b>dhcp</b></td>
+   <td>
+   #for $choice in $yesno
+   <input type="radio" name="dhcp" value="$choice[0]" >$choice[1]
+   #end for
+   </td></tr>
+   <tr> <td> <b>outbound_smtp</b></td>
+   <td>
+   #for $choice in $yesno
+   <input type="radio" name="outbound_smtp" value="$choice[0]" >$choice[1]
+   #end for
+   </td></tr>
+   <tr> <td> <b>primary_user</b></td>
+   <td> <input name="primary_user" type="text" size="32" ></td></tr>
+   <tr> <td> <b>administrator</b></td>
+   <td> <input name="administrator" type="text" size="32" ></td></tr>
+   <tr> <td> <b>location</b></td>
+   <td> <input name="location" type="text" ></td></tr>
+   <tr> <td> <b>expiration_date</b></td>
+   <td> <input name="expiration_date" type="text" size="10" >YYYY-MM-DD</td></tr>
+   <tr> <td><br><b>Interface</b></td><td><br>
+   #for $choice in $TYPE_CHOICES
+   <input type="radio" name="hdwr_type" value="$choice[0]" >$choice[1]
+   #end for
+   </td></tr>
+   <tr> <td> <b>mac_addr</b></td>
+   <td> <input name="mac_addr" type="text"></td></tr>
+   <tr> <td> <b>ip_addr</b></td>
+   <td> <input name="ip_addr" type="text"></td></tr>
+   <tr> <td> <b>name</b></td>
+   <td> <input name="name" type="text"></td></tr>
+   <tr> <td><b>dns_view</b></td><td>
+   #for $choice in $DNS_CHOICES
+   <input type="radio" name="dns_view" value="$choice[0]" >$choice[1]
+   #end for
+   </td></tr>
+   <tr> <td> <b>cname</b></td>
+   <td> <input name="cname" type="text"></td></tr>
+   <tr> <td> <b>mx</b></td>
+   <td> <input name="mx" type="text"></td></tr>
+</table>
+<p>
+<input type="submit" value="Search">
+</form>
+            <!-- InstanceEndEditable --></td> 
+        </tr> 
+    </table></td>
+  </tr> 
+  <tr valign="top"> 
+    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
+        <tr> 
+          <td colspan="2" align="left"><hr size="1"></td> 
+        </tr> 
+        <tr valign="top"> 
+          <td colspan="2" align="center"><table border="0" cellspacing="0" cellpadding="5">
+            <tr>
+              <td><a href="http://www.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe.gif" alt="U.S. Department of Energy" width="153" height="35" border="0"></a></td>
+              <td><a href="http://www.uchicago.edu/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_uofc.gif" alt="The University of Chicago" width="125" height="34" border="0"></a></td>
+              
+              <td><!-- InstanceBeginEditable name="sponsorLogos" --><!-- #BeginLibraryItem "/Library/logoOfficeOfScience.lbi" --><a href="http://www.sc.doe.gov/"><img src="http://www-unix.mcs.anl.gov/hostbaseweb/anl_templates/images/logos/footer_doe_science.gif" alt="Office of Science - Department of Energy" width="143" height="31" border="0"></a><!-- #EndLibraryItem --><!-- InstanceEndEditable --></td>
+             </tr>
+          </table></td> 
+        </tr> 
+        <tr> 
+          <td colspan="2" align="center"> <table cellspacing="0" cellpadding="2" border="0"> 
+              <tr> 
+                <td class="footerText"><a href="http://www.anl.gov/notice.html">Privacy &amp; Security Notice</a>&nbsp;|&nbsp;<a href="http://www.anl.gov/Administration/contactus.html">Contact Us</a></td> 
+              </tr> 
+            </table></td> 
+        </tr> 
+      </table></td> 
+  </tr> 
+</table> 
+</body>
+<!-- InstanceEnd --></html>
author	Ken Raffenetti <raffenet@mcs.anl.gov>	2006-08-29 16:33:36 +0000
committer	Ken Raffenetti <raffenet@mcs.anl.gov>	2006-08-29 16:33:36 +0000
commit	510c55e843ea0a1c049b39a9f57ff044190fcbd9 (patch)
tree	5e82a8238779a088147ff61efc0db305be76a1f7 /src/lib/Server/Hostbase/hostbase/webtemplates
parent	dbc96682be8968aac8ca8f8727728d60609f732c (diff)
download	bcfg2-510c55e843ea0a1c049b39a9f57ff044190fcbd9.tar.gz bcfg2-510c55e843ea0a1c049b39a9f57ff044190fcbd9.tar.bz2 bcfg2-510c55e843ea0a1c049b39a9f57ff044190fcbd9.zip