added to zone file editing system

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

6 files changed, 39 insertions, 9 deletions

diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html b/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html
index c7761c3ea..f1f90939e 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html
@@ -93,6 +93,22 @@ Are you sure you want to remove these items?
 </ul>
 {% endif %}
 
+{% if zone_id %}
+<ul>
+{% ifequal type 'zonemx' %}
+<li> mx: {{ zonemx.priority }} {{ zonemx.mx }} </li>
+{% endifequal %}
+
+{% ifequal type 'nameserver' %}
+<li> nameserver: {{ nameserver.name }} </li>
+{% endifequal %}
+
+{% ifequal type 'address' %}
+<li> address: {{ address.ip_addr }} </li>
+{% endifequal %}
+</ul>
+{% endif %}
+
 <input type="submit" value="confirm">
 <input type="reset" value="cancel" onclick="history.back()">
 </form>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar b/src/lib/Server/Hostbase/hostbase/webtemplates/navbar
index 767601aca..32ef99177 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/navbar
@@ -1,2 +1,4 @@
 <a href="/hostbase/" class="sidebar">new search</a><br>
-<a href="/hostbase/new" class="sidebar">add a new host</a>
+<a href="/hostbase/new" class="sidebar">add a new host</a><br>
+<a href="/hostbase/zones" class="sidebar">zone file information</a>
+
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
index 6fb45692e..584453f98 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
@@ -33,7 +33,7 @@
    {% endif %}
    <td> <a href="{{ host.1 }}">view</a> </td>
    <td> <a href="{{ host.1 }}/edit">edit</a> </td>
-   <td> <a href="{{ host.1 }}/remove">remove</a> </td>
+<!--   <td> <a href="{{ host.1 }}/remove">remove</a> </td> -->
    </tr>
    {% endfor %}
 </table>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
index 4ac950ae0..31f9d5184 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
@@ -9,7 +9,8 @@
 {% endblock %}
 
 {% block sidebar %}
-<a href="/hostbase/new" class="sidebar">add a new host</a>
+<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 %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
index 918f80398..c86268614 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
@@ -10,6 +10,10 @@
 
 {% block sidebar %}
 {% include "navbar" %}
+<ul>
+<li><a href="/hostbase/zones/{{ zone.id }}/" class="sidebar">view zone</a><br>
+</li>
+</ul>
 {% endblock %}
 
 {% block content %}
@@ -61,7 +65,8 @@ div#address{
    </td>
    <td>
    {% for nameserver in nameservers %}
-       <input name="nameserver{{ forloop.counter0 }}" type="text" size="32" value="{{ nameserver.name }}"><br>
+       <input name="nameserver{{ forloop.counter0 }}" type="text" size="32" value="{{ nameserver.name }}">
+       <a style="font-size:75%" href="/hostbase/zones/{{ zone.id }}/nameserver/{{ nameserver.id }}/confirm">remove<br>
    {% endfor %}
    </td></tr>
    </table>
@@ -84,7 +89,8 @@ div#address{
    <td>
    {% for mx in mxs %}
        <input name="priority{{ forloop.counter0 }}" type="text" size="6" value="{{ mx.priority }}">
-       <input name="mx{{ forloop.counter0 }}" type="text" size="32" value="{{ mx.mx }}"><br>
+       <input name="mx{{ forloop.counter0 }}" type="text" size="32" value="{{ mx.mx }}">
+       <a style="font-size:75%" href="/hostbase/zones/{{ zone.id }}/zonemx/{{ mx.id }}/confirm">remove<br>
    {% endfor %}
    </td></tr>
    </table>
@@ -103,15 +109,16 @@ div#address{
       <colgroup>
       <col width="200">
       <col width="*">
-   <tr><td valign="top"> <b>A records</b><br>
+   <tr><td valign="top"> <b>A records</b>
    {% if addresses %}
-   <a style="font-size:75%" href=# onclick="toggleField('address')">add a new MX record</a>
+   <br><a style="font-size:75%" href=# onclick="toggleField('address')">add a new MX record</a>
    {% endif %}
    </td>
    <td>
    {% if addresses %}
    {% for address in addresses %}
-       <input name="address{{ forloop.counter0 }}" type="text" value="{{ address.ip_addr }}"><br>
+       <input name="address{{ forloop.counter0 }}" type="text" value="{{ address.ip_addr }}">
+       <a style="font-size:75%" href="/hostbase/zones/{{ zone.id }}/address/{{ address.id }}/confirm">remove<br>
    {% endfor %}
    </td></tr>
    </table>
@@ -130,7 +137,7 @@ div#address{
       <col width="200">
       <col width="*">
    {% else %}
-       <input name="new_address" type="text" value="none" >
+      <input name="new_address" type="text" value="none" >
    {% endif %}
    </td></tr>
 
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
index c7ac36402..712ec98bc 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
@@ -10,6 +10,10 @@
 
 {% block sidebar %}
 {% include "navbar" %}
+<ul class="sidebar">
+<li><a href="/hostbase/zones/{{ zone.id }}/edit/" class="sidebar">edit zone</a><br>
+</li>
+</ul>
 {% endblock %}
 
 {% block content %}