diff options
Diffstat (limited to 'webui_templates')
-rw-r--r-- | webui_templates/system_edit.tmpl | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/webui_templates/system_edit.tmpl b/webui_templates/system_edit.tmpl index b2486022..9eeaa79b 100644 --- a/webui_templates/system_edit.tmpl +++ b/webui_templates/system_edit.tmpl @@ -51,8 +51,7 @@ function intf_update_visibility() intf_enable_field("static",!is_slave) intf_enable_field("ipaddress",(!is_slave) && is_static) intf_enable_field("subnet",(!is_slave) && is_static) - intf_enable_field("gateway",(!is_slave) && is_static) - intf_enable_field("hostname",!is_slave) + intf_enable_field("dns_name",!is_slave) intf_enable_field("dhcptag",!is_slave) intf_enable_field("virtbridge",!is_master) intf_enable_field("bondingopts",is_master) @@ -97,11 +96,10 @@ function on_interface_add() interface_table[iname]["bondingmaster"] = "" interface_table[iname]["bondingopts"] = "" interface_table[iname]["ipaddress"] = "" - interface_table[iname]["hostname"] = "" + interface_table[iname]["dns_name"] = "" interface_table[iname]["dhcptag"] = "" interface_table[iname]["virtbridge"] = "" interface_table[iname]["subnet"] = "" - interface_table[iname]["gateway"] = "" interface_table[iname]["static"] = false interface_table[iname]["present"] = "1" interface_table[iname]["original"] = "0" @@ -184,8 +182,7 @@ function save_intf(which) itable["static"] = document.getElementById("static_true").checked itable["ipaddress"] = get_enabled_field("ipaddress",(!is_slave) && is_static) itable["subnet"] = get_enabled_field("subnet",(!is_slave) && is_static) - itable["gateway"] = get_enabled_field("gateway",(!is_slave) && is_static) - itable["hostname"] = get_enabled_field("hostname",!is_slave) + itable["dns_name"] = get_enabled_field("dns_name",!is_slave) itable["dhcptag"] = get_enabled_field("dhcptag",!is_slave) itable["virtbridge"] = get_enabled_field("virtbridge",!is_master) itable["present"] = document.getElementById("present").value @@ -215,8 +212,7 @@ function load_intf() } document.getElementById("ipaddress").value = interface_table[intf]["ipaddress"] document.getElementById("subnet").value = interface_table[intf]["subnet"] - document.getElementById("gateway").value = interface_table[intf]["gateway"] - document.getElementById("hostname").value = interface_table[intf]["hostname"] + document.getElementById("dns_name").value = interface_table[intf]["dns_name"] document.getElementById("dhcptag").value = interface_table[intf]["dhcptag"] document.getElementById("virtbridge").value = interface_table[intf]["virtbridge"] document.getElementById("present").value = interface_table[intf]["present"] @@ -236,8 +232,7 @@ function clear_intf() document.getElementById("static_false").checked = true document.getElementById("ipaddress").value = "" document.getElementById("subnet").value = "" - document.getElementById("gateway").value = "" - document.getElementById("hostname").value = "" + document.getElementById("dns_name").value = "" document.getElementById("dhcptag").value = "" document.getElementById("virtbridge").value = "" document.getElementById("present").value = "1" @@ -269,8 +264,7 @@ function build_interface_table() } interface_table['$iname']["ipaddress"] = "$system.interfaces[$iname]['ip_address']" interface_table['$iname']["subnet"] = "$system.interfaces[$iname]['subnet']" - interface_table['$iname']["gateway"] = "$system.interfaces[$iname]['gateway']" - interface_table['$iname']["hostname"] = "$system.interfaces[$iname]['hostname']" + interface_table['$iname']["dns_name"] = "$system.interfaces[$iname]['dns_name']" interface_table['$iname']["dhcptag"] = "$system.interfaces[$iname]['dhcp_tag']" interface_table['$iname']["virtbridge"] = "$system.interfaces[$iname]['virt_bridge']" interface_table['$iname']["present"] = "1" @@ -286,8 +280,7 @@ function build_interface_table() interface_table["eth0"]["static"] = "" interface_table["eth0"]["ipaddress"] = "" interface_table["eth0"]["subnet"] = "" - interface_table["eth0"]["gateway"] = "" - interface_table["eth0"]["hostname"] = "" + interface_table["eth0"]["dns_name"] = "" interface_table["eth0"]["dhcptag"] = "" interface_table["eth0"]["virtbridge"] = "" interface_table["eth0"]["present"] = "1" @@ -728,6 +721,16 @@ function page_onload() { </td> </tr> + <tr id="gateway_row"> + <td> + <label for="gateway">Gateway</label> + </td> + <td> + <input type="text" size="64" style="width: 150px;" name="gateway" id="gateway" /> + <p class="context-tip">Ex: "192.168.1.11". For use with static IP configs.</p> + </td> + </tr> + ## FIXME: it might be a good idea to color code the power section in the same ## way we color code the interface section (see "nicedit" in CSS) as well as ## the virt section being a different color @@ -852,23 +855,13 @@ function page_onload() { </td> </tr> - <tr id="gateway_row"> - <td class="nicedit"> - <label for="gateway">Gateway</label> - </td> - <td class="nicedit"> - <input type="text" size="64" style="width: 150px;" name="gateway" id="gateway" /> - <p class="context-tip">Ex: "192.168.1.11". For use in kickstart templates for static IPs.</p> - </td> - </tr> - - <tr id="hostname_row"> + <tr id="dns_name_row"> <td class="nicedit"> - <label for="hostname">Hostname</label> + <label for="dns_name">DNS name</label> </td> <td class="nicedit"> - <input type="text" size="255" style="width: 300px;" name="hostname" id="hostname" /> - <p class="context-tip">Example: vanhalen.example.org</p> + <input type="text" size="255" style="width: 300px;" name="dns_name" id="dns_name" /> + <p class="context-tip">Example: vanhalen.example.org, used by manage_dns feature</p> </td> </tr> |