--- lib/PXElator/httpd.pm	2009/08/29 15:52:50	345
+++ lib/PXElator/httpd.pm	2009/08/29 16:51:07	346
@@ -239,24 +239,29 @@
 		}
 
 		if ( $ip && $ip ne $server::ip ) {
-			my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
 
-			my $nmap = qq|<a href=/nmap?scan=$ip>nmap</a>|;
+			my @editable = ( qw/hostname deploy homepage/ );
+
+			client::conf( $ip, $_ => $param->{$_} ) foreach @editable;
+
+			my $conf = client::all_conf( $ip );
+			my $deploy = delete $conf->{deploy};
 
+			my $nmap = qq|<a href=/nmap?scan=$ip>nmap</a>|;
 			my @table = (
 				'ip' => qq|<input type=text name=change_ip value="$ip" onChange="document.getElementById('old_ip').style.display = '';"><span id=old_ip style="display: none; color: #888;">old: $ip<span>|,
-				'hostname' => qq|<input type=text name=hostname value="$hostname">|,
-				'ping' => ping::host($ip) ? qq|<span style="color:green">up</span> $nmap| : qq|<a href=/wol/$ip title=wol>down</a> $nmap|,
+				'mac' => format::mac( delete $conf->{mac}, 'html' ),
+				'hostname' => qq|<input type=text name=hostname value="| . delete($conf->{hostname}) . qq|">|,
+				'ping' => ping::host($ip) ? qq|<span style="color:green">up</span> $nmap| : qq|<span style="color: red">down</span> <a href=/wol/$ip>wol</a> $nmap|,
+				'deploy' => html::select( 'deploy', $deploy, config::available ),
+				html::conf( $ip, $conf, 'edit', @editable )
 			);
 
-			my $config;
+warn "XX conf ",dump( $conf );
+
+			my $config = '';
 
-			if ( my $mac = client::mac_from_ip( $ip ) ) {
-				my $deploy = client::conf( $ip, 'deploy' => $param->{deploy} );
-				push @table, (
-					'mac' => format::mac( $mac => 'html' ),
-					'deploy' => html::select( 'deploy', $deploy, config::available )
-				);
+			if ( $deploy ) {
 				if ( $config = config::for_ip( $ip ) ) {
 					$config = qq|<h2>config</h2>| . html::pre( $config );
 				}
@@ -308,19 +313,8 @@
 							, format::mac( $mac => 'html' )
 							, $arp->{$mac}
 							, delete $conf->{hostname}
-							, join("\n", map {
-								my $name = $_;
-								my $html = $conf->{$name};
-								if ( $name eq 'amt' ) {
-									$html = qq|<a title="$html" href=http://$ip:16992/logon.htm>logon</a>|;
-								}
-								$html = qq|<pre style="display: inline">$html</pre>|
-								unless
-#0 &&
-								$html =~ s{\b(\S+)\t(\S+)\t(\S+)\b}{<b title="$1/$2">$3</b> }gs;
-								qq|<em>$name</em> $html<br>|
-							} keys %$conf )
-						);
+							, html::conf( $ip, $conf, 'inline' )
+						)
 					} client::all_ips
 				)
 				;