dhcp option is now per interface

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

6 files changed, 37 insertions, 28 deletions

diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/base.html b/src/lib/Server/Hostbase/hostbase/webtemplates/base.html
index 0c556bd77..537535663 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/base.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/base.html
@@ -5,9 +5,7 @@
     <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" />
-    <!--<script type="text/javascript" src="http://hostbase.mcs.anl.gov/site_media/main.js">
--->
-    </script>
+    <!--<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/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
index 49e054e8a..d3bb848ca 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
@@ -102,13 +102,6 @@ div#interface{
    <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>
-   {% endif %}   
    <tr> <td> <b>outbound_smtp</b></td>
    <td>
    {% if host.outbound_smtp %}
@@ -135,6 +128,13 @@ div#interface{
            {% endifequal %}
        {% endfor %}
        </td></tr>
+       <tr> <td> <b>dhcp</b></td>
+       <td>
+       {% if interface.0.dhcp %}
+           <input type="checkbox" checked="checked" name="dhcp{{ interface.0.id }}"></td></tr>
+       {% else %}
+           <input type="checkbox" name="dhcp{{ interface.0.id }}"></td></tr>
+       {% endif %}   
        <tr> <td> <b>mac_addr</b></td>
        <td> <input name="mac_addr{{ interface.0.id }}" type="text" value="{{ interface.0.mac_addr }}">
        <a style="font-size:75%" href="/hostbase/{{ host.id }}/interface/{{ interface.0.id }}/confirm">remove</a>
@@ -180,6 +180,13 @@ div#interface{
    <input type="radio" name="hdwr_type_new" value="{{ choice.0 }}">{{ choice.1 }}
    {% endfor %}
    </td></tr>
+   <tr> <td> <b>dhcp</b></td>
+   <td>
+   {% if host.dhcp %}
+       <input type="checkbox" checked="checked" name="dhcp_new"></td></tr>
+   {% else %}
+       <input type="checkbox" name="dhcp_new"></td></tr>
+   {% endif %}   
    <tr> <td> <b>mac_addr</b></td>
    <td> <input name="mac_addr_new" type="text"></td></tr>
    <tr> <td> <b>ip_addr</b></td>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
index 2f557cf73..39cdc7ae4 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
@@ -37,12 +37,6 @@
    <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>
-   {% endif %}
    <tr> <td> <b>outbound_smtp</b></td>
    {% if host.outbound_smtp %}
    <td> y </td></tr>
@@ -62,8 +56,14 @@
    {% ifnotequal interface.0.hdwr_type 'no' %}
    <td><br>{{ interface.0.hdwr_type }}</td></tr>
    {% endifnotequal %}
+   <tr> <td> <b>dhcp</b></td>
+   {% if interface.0.dhcp %}
+   <td> y </td></tr>
    <tr> <td> <b>mac_addr</b></td>
    <td> {{ interface.0.mac_addr }}</b></td></tr>
+   {% else %}
+   <td> n </td></tr>
+   {% endif %}
    {% for ip in interface.1 %}
    <tr> <td> <b>ip_addr</b></td>
    <td> {{ ip.ip_addr }}</td></tr>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/logout b/src/lib/Server/Hostbase/hostbase/webtemplates/logout
index 9fa46236f..e71e90e76 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/logout
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/logout
@@ -1,5 +1,6 @@
+<p>
 {% if logged_in %}
-<p> <a href="/logout/" class="sidebar">logout</a>
+<a href="/logout/" class="sidebar">logout</a>
 {% else %}
-<p> <a href="/login/" class="sidebar">login</a>
-{% endif %}
\ No newline at end of file
+<a href="/login/" class="sidebar">login</a>
+{% endif %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
index c965d5af4..5c74197b4 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
@@ -56,9 +56,6 @@
    <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>
@@ -75,6 +72,9 @@
    <input type="radio" name="hdwr_type_new" value="{{ choice.0 }}" >{{ choice.1 }}
    {% endfor %}
    </td></tr>
+   <tr> <td> <b>dhcp</b></td>
+   <td>
+   <input type="checkbox" name="dhcp_new"></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>
@@ -84,6 +84,9 @@
    <input type="radio" name="hdwr_type_new2" value="{{ choice.0 }}" >{{ choice.1 }}
    {% endfor %}
    </td></tr>
+   <tr> <td> <b>dhcp</b></td>
+   <td>
+   <input type="checkbox" name="dhcp_new2"></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>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
index 1c869f0d7..03d65d058 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
@@ -37,12 +37,6 @@
    <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 }}
-   {% endfor %}
-   </td></tr>
    <tr> <td> <b>outbound_smtp</b></td>
    <td>
    {% for choice in yesno %}
@@ -62,6 +56,12 @@
    <input type="radio" name="hdwr_type" value="{{ choice.0 }}" >{{ choice.1 }}
    {% endfor %}
    </td></tr>
+   <tr> <td> <b>dhcp</b></td>
+   <td>
+   {% for choice in yesno %}
+   <input type="radio" name="dhcp" value="{{ choice.0 }}" >{{ choice.1 }}
+   {% endfor %}
+   </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>