--- lib/PXElator/html.pm	2009/08/31 15:14:43	386
+++ lib/PXElator/html.pm	2011/02/12 14:47:00	559
@@ -51,7 +51,6 @@
 		, qq|<select type=select name=$name>|
 		, join("\n", map { my $selected = $_ eq $selected_option ? 'selected' : ''; qq|<option name=$_ $selected>$_</option>| } @_ )
 		, qq|</select>|
-		, qq|</form>|
 	);
 }
 
@@ -71,7 +70,7 @@
 	my ($ip,$conf,$format) = @_;
 	my @editable = splice(@_,3);
 
-	warn "# conf ",dump( $ip, $conf, $format, [ @editable ] );
+#	warn "# conf ",dump( $ip, $conf, $format, [ @editable ] );
 
 	$format ||= 'inline';
 
@@ -85,7 +84,8 @@
 		} else {
 			if ( $name eq 'amt' ) {
 				my $amt_ip = amt::ip($ip,$html);
-				$html = qq|<a title="$html" href=http://$amt_ip:16992/logon.htm target=$amt_ip>$amt_ip</a>|;
+				# $html contains password!
+				$html = qq|<a href=http://$amt_ip:16992/logon.htm target=$amt_ip>$amt_ip</a>|;
 
 				if ( $format ne 'inline' ) {
 					my $power = amt::power_on($ip);
@@ -99,15 +99,20 @@
 			} elsif ( $name eq 'ssh' ) {
 				$html =~ s{\s(\S{16}).+(\S{16})\s}{ $1..$2 };
 				chomp($html);
-			}
-			$html = qq|<pre style="display: inline">$html</pre>|
-			unless
-			$html =~ s{\b(\S+)\t(\S+)\t(\S+)\b}{<b title="$1/$2">$3</b> }gs;
+			} elsif ( $name eq 'kvm' ) {
+				$html = qq|<a href="/start_stop/kvm?nr=$html">$html</a>|;
+			} elsif ( $name eq 'munin' ) {
+				$html = join("\n", map { my $url = $_; $url =~ s/-d\w+\.\w+$/.html/; qq|<a href="$url"><div style="float:right;overflow:hidden;width:415px;height:180px"><img src="$_" style="margin: -30px 0 0 -60px"></div></a>| } split(/\s+/s,$html));
+			} elsif ( $name eq 'ports' ) {
+				$html =~ s{\b(\S+)\t(\S+)\t(\S+)\b}{<b title="$1/$2">$3</b> }gs;
+			} else {
+				$html = qq|<tt>$html</tt>|;
+			};
 		
 			if ( $format =~ /edit|table/ ) {
 				( $name, $html );
 			} else {
-				qq|<em>$name</em> $html<br>|
+				qq|<div class="config $name"><em>$name</em> $html</div>|
 			}
 		}
 	} grep { length($conf->{$_}) > 0 } sort keys %$conf;