more web changes

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2242 ce84e21b-d406-0410-9b95-82705330c041
author: Ken Raffenetti <raffenet@mcs.anl.gov> 2006-09-11 22:26:31 +0000
committer: Ken Raffenetti <raffenet@mcs.anl.gov> 2006-09-11 22:26:31 +0000
commit: 87d3eb7c7c29fdaa12f1620aecb504db2d8b846a (patch)
tree: 8804cecaca8a452f6ef7d09a62e2e1f7554307dd
parent: e6cd763441c17db67152ebc1a3505b06fa14cb29 (diff)
download: bcfg2-87d3eb7c7c29fdaa12f1620aecb504db2d8b846a.tar.gz
bcfg2-87d3eb7c7c29fdaa12f1620aecb504db2d8b846a.tar.bz2
bcfg2-87d3eb7c7c29fdaa12f1620aecb504db2d8b846a.zip
8 files changed, 56 insertions, 371 deletions
diff --git a/src/lib/Server/Hostbase/hostbase/__init__.pyc b/src/lib/Server/Hostbase/hostbase/__init__.pyc
deleted file mode 100644
index 928d88eff..000000000
--- a/src/lib/Server/Hostbase/hostbase/__init__.pyc
+++ /dev/null
diff --git a/src/lib/Server/Hostbase/hostbase/models.pyc b/src/lib/Server/Hostbase/hostbase/models.pyc
deleted file mode 100644
index f76cc7d76..000000000
--- a/src/lib/Server/Hostbase/hostbase/models.pyc
+++ /dev/null
diff --git a/src/lib/Server/Hostbase/hostbase/views.py b/src/lib/Server/Hostbase/hostbase/views.py
index 76eed63c0..d2321e364 100644
--- a/src/lib/Server/Hostbase/hostbase/views.py
+++ b/src/lib/Server/Hostbase/hostbase/views.py
@@ -100,11 +100,16 @@ def search(request):
 
 def look(request, host_id):
     """Displays general host information"""
-    temp = Template(open('%s/host.html' % templatedir).read())
-    hostdata = gethostdata(host_id)
-    temp = fill(temp, hostdata)
-    return HttpResponse(str(temp))
-    
+    host = Host.objects.get(id=host_id)
+    interfaces = []
+    for interface in host.interface_set.all():
+        interfaces.append((interface, interface.ip_set.all()))
+    comments = [line for line in host.comments.split("\n")]
+    return render_to_response('%s/host.html' % templatedir,
+                              {'host': host,
+                               'interfaces': interfaces,
+                               'comments': comments})
+                                   
 def dns(request, host_id):
     temp = Template(open('%s/dns.html' % templatedir).read())
     hostdata = gethostdata(host_id, True)
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
index 571fa3f5d..87cfbd1a3 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
@@ -1,86 +1,3 @@
-<!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){
@@ -107,13 +24,6 @@ div#interface{
 }
 </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%">
@@ -281,36 +191,3 @@ this host is
 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/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
index 937d0115d..1a89ea6c1 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
@@ -1,104 +1,40 @@
-<!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" --> 
+{% extends "base.html" %}
+
+{% block pagebanner %}
+  <div class="header">
+      <h2>{{ host.hostname }}</h2>
+  </div>
+  <br/>
+{% endblock %}
+
+{% block sidebar %}
+<ul class="sidebar">
+   <li><a href="dns/" class="sidebar">Detailed DNS Info</a></li>
+   <li><a href="edit/" class="sidebar">Edit Host Entry</a></li>
+   <li><a href="dns/edit/" class="sidebar">Edit Detailed DNS Info</a></li>
+</ul>
+{% endblock %}
+
+{% block content %}
+
 <table border="0" width="100%">
    <colgroup>
    <col width="150">
    <col width="*">
    <tr> <td> <b>hostname</b></td>
-   <td> $host.hostname</td></tr>			 
+   <td> {{ host.hostname }}</td></tr>			 
    <tr> <td> <b>whatami</b></td>
-   <td> $host.whatami</td></tr>
+   <td> {{ host.whatami }}</td></tr>
    <tr> <td> <b>netgroup</b></td>
-   <td> $host.netgroup</td></tr>
+   <td> {{ host.netgroup }}</td></tr>
    <tr> <td> <b>class</b></td>
-   <td> $host.security_class</td></tr>
+   <td> {{ host.security_class }}</td></tr>
    <tr> <td> <b>support</b></td>
-   <td> $host.support</td></tr>
+   <td> {{ host.support }}</td></tr>
    <tr> <td> <b>csi</b></td>
-   <td> $host.csi</td></tr>
+   <td> {{ host.csi }}</td></tr>
    <tr> <td> <b>printq</b></td>
-   <td> $host.printq</td></tr>
+   <td> {{ host.printq }}</td></tr>
    <tr> <td> <b>dhcp</b></td>
    {% if host.dhcp %}
    <td> y </td></tr>
@@ -121,19 +57,19 @@
    <td> {{ host.expiration_date }}</td></tr>
    {% for interface in interfaces %}
    <tr> <td><br><b>Interface</b></td>
-   {% ifnotequal interface.hdwr_type 'no' %}
-   <td><br>{{ interface.hdwr_type }}</td></tr>
-   {% endif %}
+   {% ifnotequal interface.0.hdwr_type 'no' %}
+   <td><br>{{ interface.0.hdwr_type }}</td></tr>
+   {% endifnotequal %}
    <tr> <td> <b>mac_addr</b></td>
-   <td> {{ interface.mac_addr }}</b></td></tr>
-   {% for ip in ips.{{ interface.id }} %}
+   <td> {{ interface.0.mac_addr }}</b></td></tr>
+   {% for ip in interface.1 %}
    <tr> <td> <b>ip_addr</b></td>
    <td> {{ ip.ip_addr }}</td></tr>
    {% endfor %}
    {% endfor %}
    <tr> <td valign="top"> <b>comments</b></td>
    <td> 
-   {% for line in host.comments.split("\n") %}
+   {% for line in comments %}
    {{ line }}<br>
    {% endfor %}
    </td></tr>
@@ -143,35 +79,5 @@
 <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>
 
+{% endblock %}
+\ No newline at end of file
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
index 1825f6d95..4413e0527 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
@@ -1,86 +1,13 @@
-<!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" --> 
+{% extends "base.html" %}
+
+{% block pagebanner %}
+  <div class="header">
+      <h2>Search Results</h2>
+  </div>
+  <br/>
+{% endblock %}
+{% block content %}
+
 {% if hosts %}
 <table border="0" width="100%">
    <colgroup>
@@ -107,35 +34,5 @@
 No hosts matched your query<br>
 Click the back button on your browser to edit your search
 {% endif %}
-            <!-- 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>
 
+{% endblock %}
+\ No newline at end of file
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
index f8053e229..7fefdf6f9 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
@@ -2,7 +2,7 @@
 
 {% block pagebanner %}
   <div class="header">
-      <h1>Welcome to Hostbase!</h1>
+      <h2>Welcome to Hostbase!</h2>
   </div>
   <br/>
 {% endblock %}
diff --git a/src/lib/Server/Hostbase/settings.py b/src/lib/Server/Hostbase/settings.py
index 604195622..1b8d99c35 100644
--- a/src/lib/Server/Hostbase/settings.py
+++ b/src/lib/Server/Hostbase/settings.py
@@ -62,7 +62,7 @@ ROOT_URLCONF = 'Hostbase.urls'
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates".
     # Always use forward slashes, even on Windows.
-    '/disks/bcfg2/Hostbase/hostbase/webtemplates'
+    '/usr/lib/python2.3/site-packages/Hostbase/hostbase/webtemplates'
 )
 
 INSTALLED_APPS = (
author	Ken Raffenetti <raffenet@mcs.anl.gov>	2006-09-11 22:26:31 +0000
committer	Ken Raffenetti <raffenet@mcs.anl.gov>	2006-09-11 22:26:31 +0000
commit	87d3eb7c7c29fdaa12f1620aecb504db2d8b846a (patch)
tree	8804cecaca8a452f6ef7d09a62e2e1f7554307dd
parent	e6cd763441c17db67152ebc1a3505b06fa14cb29 (diff)
download	bcfg2-87d3eb7c7c29fdaa12f1620aecb504db2d8b846a.tar.gz bcfg2-87d3eb7c7c29fdaa12f1620aecb504db2d8b846a.tar.bz2 bcfg2-87d3eb7c7c29fdaa12f1620aecb504db2d8b846a.zip