diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-11-20 13:33:29 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-11-20 13:33:29 -0500 |
| commit | 8d8e84201a07a197ff035f405d24940775e86153 (patch) | |
| tree | 1295bf171fb805ba397ea734ba87610bb09f12d2 /webui_templates | |
| parent | ff1ceabf551e6bdf9b84bd1c8dcfd45d53456965 (diff) | |
| download | cobbler-8d8e84201a07a197ff035f405d24940775e86153.tar.gz cobbler-8d8e84201a07a197ff035f405d24940775e86153.tar.xz cobbler-8d8e84201a07a197ff035f405d24940775e86153.zip | |
Ongoing changes to make the webapp conform with network field changes
Diffstat (limited to 'webui_templates')
| -rw-r--r-- | webui_templates/profile_edit.tmpl | 5 | ||||
| -rw-r--r-- | webui_templates/system_edit.tmpl | 17 |
2 files changed, 12 insertions, 10 deletions
diff --git a/webui_templates/profile_edit.tmpl b/webui_templates/profile_edit.tmpl index 1e614183..86194c8f 100644 --- a/webui_templates/profile_edit.tmpl +++ b/webui_templates/profile_edit.tmpl @@ -245,10 +245,11 @@ function disablename(value) </td> <td> #if $profile - <input type="text" name="name_servers" id="name_servers" value="$profile.name_servers"> + #set joined = " ".join($profile.name_servers) + <input type="text" name="name_servers" id="name_servers" value="$joined"> #else <input type="text" name="name_servers" id="name_servers" value=""> - #end + #end if <p class="context-tip">Name servers, space delimited, if not provided by DHCP</p> </td> </tr> diff --git a/webui_templates/system_edit.tmpl b/webui_templates/system_edit.tmpl index 42eb3911..d79c9c04 100644 --- a/webui_templates/system_edit.tmpl +++ b/webui_templates/system_edit.tmpl @@ -46,10 +46,9 @@ function intf_update_visibility() { is_slave=document.getElementById("bonding_is_slave").checked is_master=document.getElementById("bonding_is_master").checked - is_static=document.getElementById("static_true").checked intf_enable_field("static",!is_slave) - intf_enable_field("ipaddress",(!is_slave) && is_static) + intf_enable_field("ipaddress",(!is_slave)) intf_enable_field("subnet",(!is_slave) && is_static) intf_enable_field("dns_name",!is_slave) intf_enable_field("static_routes",!is_slave) @@ -270,7 +269,8 @@ function build_interface_table() interface_table['$iname']["ipaddress"] = "$system.interfaces[$iname]['ip_address']" interface_table['$iname']["subnet"] = "$system.interfaces[$iname]['subnet']" interface_table['$iname']["dns_name"] = "$system.interfaces[$iname]['dns_name']" - interface_table['$iname']["static_routes"] = "$system.interfaces[$iname]['static_routes']" + #set joined = " ".join($system.interfaces[$iname]['static_routes']) + interface_table['$iname']["static_routes"] = "$joined" interface_table['$iname']["dhcptag"] = "$system.interfaces[$iname]['dhcp_tag']" interface_table['$iname']["virtbridge"] = "$system.interfaces[$iname]['virt_bridge']" interface_table['$iname']["present"] = "1" @@ -547,7 +547,7 @@ function page_onload() { <input type="text" size="64" style="width: 150px;" name="hostname" id="hostname" value="$system.hostname" /> #else <input type="text" size="64" style="width: 150px;" name="hostname" id="hostname" /> - #end + #end if <p class="context-tip">Ex: "vanhalen.example.org". Used for /etc/sysconfig/network.</p> </td> </tr> @@ -561,7 +561,7 @@ function page_onload() { <input type="text" size="64" style="width: 150px;" name="gateway" id="gateway" /> #else <input type="text" size="64" style="width: 150px;" name="gateway" id="gateway" value="$system.gateway" /> - #end + #end if <p class="context-tip">Ex: "192.168.1.11". For use with static IP configs.</p> </td> </tr> @@ -573,10 +573,11 @@ function page_onload() { </td> <td class="netedit"> #if $system - <input type="text" name="name_servers" id="name_servers" value="$system.name_servers"> + #set joined = " ".join($profile.name_servers) + <input type="text" name="name_servers" id="name_servers" value="$joined"> #else <input type="text" name="name_servers" id="name_servers" value="<<inherit>>"> - #end + #end if <p class="context-tip">Name servers, space delimited, if not provided by DHCP</p> </td> </tr> @@ -904,7 +905,7 @@ function page_onload() { <td class="nicedit"> <label for="static_routes">Static Routes</label> </td> - <td class="static_routes"> + <td class="nicedit"> <input type="text" size="128" style="width: 150px;" name="static_routes" id="static_routes" /> <p class="context-tip">optional list of ipaddress:netmask:gateway, space delimited</p> </td> |