cumulative update for Hostbase web app

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

8 files changed, 16 insertions, 11 deletions

diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html
index 5d5a31b95..ab75dd956 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html
@@ -13,6 +13,7 @@
    <li><a href="/hostbase/{{ host.id }}/" class="sidebar">host info</a></li>
    <li><a href="/hostbase/{{ host.id }}/edit/" class="sidebar">edit host info</a></li>
    <li><a href="edit/" class="sidebar">edit dns info</a></li>
+   <li><a href="/hostbase/{{ host.id }}/logs/" class="sidebar">change logs</a></li>
 </ul>
 {% include "logout" %}
 {% endblock %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
index 0385daa86..9a673cbf0 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
@@ -12,7 +12,8 @@
 <ul class="sidebar">
    <li><a href="/hostbase/{{ host.id }}/" class="sidebar">host info</a></li>
    <li><a href="/hostbase/{{ host.id }}/edit/" class="sidebar">edit host info</a></li>
-   <li><a href="edit/" class="sidebar">edit dns info</a></li>
+   <li><a href="/hostbase/{{ host.id }}/dns/" class="sidebar">see dns info</a></li>
+   <li><a href="/hostbase/{{ host.id }}/logs/" class="sidebar">change logs</a></li>
 </ul>
 {% include "logout" %}
 {% endblock %}
@@ -42,7 +43,7 @@
 	       <select name="dns_view{{ name.id }}">
 	       {% for choice in DNS_CHOICES %}
 	       {% ifequal name.dns_view choice.0 %}
-	       <option value="{{ choice.0 }}">{{ choice.1 }}
+	       <option value="{{ choice.0 }}" selected="selected">{{ choice.1 }}
 	       {% else %}
 	       <option value="{{ choice.0 }}">{{ choice.1 }}
 	       {% endifequal %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
index d95c62f68..62109b2db 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
@@ -13,6 +13,7 @@
 <li><a href="/hostbase/{{ host.id }}/" class="sidebar">host info</a></li>
 <li><a href="/hostbase/{{ host.id }}/dns/" class="sidebar">detailed dns info</a></li>
 <li><a href="/hostbase/{{ host.id }}/dns/edit/" class="sidebar">edit dns info</a></li>
+<li><a href="/hostbase/{{ host.id }}/logs/" class="sidebar">change logs</a></li>
 </ul>
 {% include "logout" %}
 {% endblock %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
index 75cac61db..a8fa6a2cd 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
@@ -13,6 +13,7 @@
    <li><a href="dns/" class="sidebar">detailed dns info</a></li>
    <li><a href="edit/" class="sidebar">edit host info</a></li>
    <li><a href="dns/edit/" class="sidebar">edit dns info</a></li>
+   <li><a href="logs/" class="sidebar">change logs</a></li>
 </ul>
 {% include "logout" %}
 {% endblock %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/login.html b/src/lib/Server/Hostbase/hostbase/webtemplates/login.html
index e46ccc086..ec24a0fc0 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/login.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/login.html
@@ -6,6 +6,11 @@
   </div>
   <br/>
 {% endblock %}
+{% block sidebar %}
+<a href="/hostbase/" class="sidebar">search for hosts</a><br>
+<a href="/hostbase/new" class="sidebar">add a new host</a><br>
+<a href="hostbase/zones/" class="sidebar">zone file information</a>
+{% endblock %}
 {% block content %}
   {% if form.has_errors %}
   {{ form.username.errors|join:", " }}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
index 439c606c9..e68afe969 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
@@ -21,20 +21,18 @@
    <col width="75">
    <col width="50">
    <col width="50">
+   <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>
-   {% endif %}
+   <td> {{ host.2 }} </td>
    <td> <a href="{{ host.1 }}">view</a> </td>
    <td> <a href="{{ host.1 }}/edit">edit</a> </td>
    <td> <a href="{{ host.1 }}/copy">copy</a> </td>
+   <td> <a href="{{ host.1 }}/logs">logs</a> </td>
 <!--   <td> <a href="{{ host.1 }}/remove">remove</a> </td> -->
    </tr>
    {% endfor %}
@@ -44,4 +42,4 @@ No hosts matched your query<br>
 Click the back button on your browser to edit your search
 {% endif %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
index 5255247ad..e5bd0a6b3 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
@@ -46,12 +46,10 @@
    {% endfor %}<br>
    <label for="mac_addr">mac_addr:</label><input name="mac_addr" type="text" ><br>
    <label for="ip_addr">ip_addr:</label><input name="ip_addr" type="text" ><br>
-   <label for="name">name:</label><input name="name" type="text" ><br>
    <label for="dns_view">dns_viewer:</label>
    {% for choice in DNS_CHOICES %}
    <input type="radio" name="dns_view" value="{{ choice.0 }}" >{{ choice.1 }}
    {% endfor %}<br>
-   <label for="cname">cname:</label><input name="cname" type="text" ><br>
    <label for="mx">mx:</label><input name="mx" type="text" ><br>
 <p>
 <input type="submit" value="Search">
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html
index b8808f8a8..b8bbc9d90 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html
@@ -24,7 +24,7 @@
    <col width="*">
    <tr> <td><b>zone</b></td>
    </tr>
-   {% for zone in zones %}
+   {% for zone in zones|dictsort:"zone" %}
    <tr> <td> {{ zone.zone }}</td>
    <td> <a href="{{ zone.id }}">view</a> </td>
    <td> <a href="{{ zone.id }}/edit">edit</a> </td>