From 0153af6e2ed6671ea2ee013a7f551ba7c61a5c88 Mon Sep 17 00:00:00 2001
From: Rene Martin <rene@minicroso.(none)>
Date: Sun, 4 Apr 2010 19:02:25 +0100
Subject: Trying to commit all my work

---
 src/lib/Server/Hostbase/hostbase/webtemplates/base.html     | 4 ++--
 src/lib/Server/Hostbase/hostbase/webtemplates/host.html     | 4 ++--
 src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html  | 8 ++++++--
 src/lib/Server/Hostbase/hostbase/webtemplates/zones.html    | 5 ++---
 src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html | 6 +++---
 5 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'src/lib/Server/Hostbase/hostbase/webtemplates')
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/base.html b/src/lib/Server/Hostbase/hostbase/webtemplates/base.html
index 537535663..1d7c5565b 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/base.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/base.html
@@ -3,8 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title>{% block title %}BCFG2 - Hostbase{% endblock %}</title>
-    <link rel="stylesheet" type="text/css" href="/site_media/boxypastel.css" />
-    <link rel="stylesheet" type="text/css" href="/site_media/base.css" />
+    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/boxypastel.css" />
+    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/base.css" />
     <!--<script type="text/javascript" src="http://hostbase.mcs.anl.gov/site_media/main.js"> -->
     {% block extra_header_info %}{% endblock %}
 </head>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
index a8fa6a2cd..73792e0e0 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
@@ -52,7 +52,7 @@
    <td> {{ host.location }}</td></tr>
    <tr> <td> <b>expiration_date</b></td>
    <td> {{ host.expiration_date }}</td></tr>
-   {% for interface in interfaces %}
+   {% for interface in host.inserface_set.all %}
    <tr> <td><br><b>Interface</b></td>
    {% ifnotequal interface.0.hdwr_type 'no' %}
    <td><br>{{ interface.0.hdwr_type }}</td></tr>
@@ -77,4 +77,4 @@
 this host is {{ host.status }}<br>
 last update on {{ host.last }}<br>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
index af6ae2422..8a31e0dde 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
@@ -15,7 +15,9 @@
 
 {% block content %}
 <form name="zonedata" action="" method="post">
-  <fieldset class="module aligned ()">
+    <fieldset class="module aligned ()">
+        {{ form.as_p}}
+<!--
   <label for="id_zone">zone:</label>{{ form.zone }}<br>
   <label for="id_admin">admin:</label>{{ form.admin }}<br>
   <label for="id_primary_master">primary_master:</label>{{ form.primary_master }}<br>
@@ -33,7 +35,9 @@
   <label for="id_mx">ip address:</label>{{ aform.ip_addr }}<br>
   <label for="id_aux">aux:
 (information not generated from Hostbase)</label>{{ form.aux }}<br>
-<p><input type="submit" value="Submit">
+--!>
+        <p><input type="submit" value="Submit">
+    </fieldset>
 </form>
 {% endblock %}
 
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html
index b8bbc9d90..405b748f9 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html
@@ -14,8 +14,7 @@
 {% endblock %}
 
 {% block content %}
-
-{% if zones %}
+{% if zone_list %}
 <table border="0" width="100%">
    <colgroup>
    <col width="200">
@@ -24,7 +23,7 @@
    <col width="*">
    <tr> <td><b>zone</b></td>
    </tr>
-   {% for zone in zones|dictsort:"zone" %}
+   {% for zone in zone_list|dictsort:"zone" %}
    <tr> <td> {{ zone.zone }}</td>
    <td> <a href="{{ zone.id }}">view</a> </td>
    <td> <a href="{{ zone.id }}/edit">edit</a> </td>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
index e4a3a3fde..59443c00d 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
@@ -41,20 +41,20 @@
 
    <tr><td valign="top"> <b>nameservers</b></td>
    <td>
-   {% for nameserver in nameservers %}
+   {% for nameserver in zone.nameservers.all %}
    {{ nameserver.name }}<br>
    {% endfor %}
    </td></tr>
    <tr><td valign="top"> <b>mxs</b></td>
    <td>
-   {% for mx in mxs %}
+   {% for mx in zone.mxs.all %}
    {{ mx.priority }} {{ mx.mx }}<br>
    {% endfor %}
    </td></tr>
    {% if addresses %}
    <tr><td valign="top"> <b>A records</b></td>
    <td>
-   {% for address in addresses %}
+   {% for address in sof.addresses.all %}
    {{ address.ip_addr }}<br>
    {% endfor %}
    </td></tr>
-- 
cgit v1.2.3-1-g7c22


zone
{{ zone.zone }}	view	edit
nameservers	- {% for nameserver in nameservers %} + {% for nameserver in zone.nameservers.all %} {{ nameserver.name }} {% endfor %}
mxs	- {% for mx in mxs %} + {% for mx in zone.mxs.all %} {{ mx.priority }} {{ mx.mx }} {% endfor %}
A records	- {% for address in addresses %} + {% for address in sof.addresses.all %} {{ address.ip_addr }} {% endfor %}