* Major changes from Ryan Kucera to add style sheets to the CGI

[BackupPC.git] / lib / BackupPC / CGI / GeneralInfo.pm

diff --git a/lib/BackupPC/CGI/GeneralInfo.pm b/lib/BackupPC/CGI/GeneralInfo.pm
index bb71e51..1418ace 100644 (file)
--- a/lib/BackupPC/CGI/GeneralInfo.pm
+++ b/lib/BackupPC/CGI/GeneralInfo.pm
@@ -54,14 +54,14 @@ sub action
         (my $cmd = $Jobs{$host}{cmd}) =~ s/$BinDir\///g;
         (my $xferPid = $Jobs{$host}{xferPid}) =~ s/,/, /g;
         $jobStr .= <<EOF;
-<tr><td> ${HostLink($host)} </td>
-    <td align="center"> $Jobs{$host}{type} </td>
-    <td align="center"> ${UserLink(defined($Hosts->{$host})
+<tr><td class="border"> ${HostLink($host)} </td>
+    <td align="center" class="border"> $Jobs{$host}{type} </td>
+    <td align="center" class="border"> ${UserLink(defined($Hosts->{$host})
                                        ? $Hosts->{$host}{user} : "")} </td>
-    <td> $startTime </td>
-    <td> $cmd </td>
-    <td align="center"> $Jobs{$host}{pid} </td>
-    <td align="center"> $xferPid </td>
+    <td class="border"> $startTime </td>
+    <td class="border"> $cmd </td>
+    <td align="center" class="border"> $Jobs{$host}{pid} </td>
+    <td align="center" class="border"> $xferPid </td>
 EOF
         $jobStr .= "</tr>\n";
     }
@@ -89,14 +89,14 @@ EOF
         }
         (my $shortErr = $Status{$host}{error}) =~ s/(.{48}).*/$1.../;   
         $statusStr .= <<EOF;
-<tr><td> ${HostLink($host)} </td>
-    <td align="center"> $Status{$host}{type} </td>
-    <td align="center"> ${UserLink(defined($Hosts->{$host})
+<tr><td class="border"> ${HostLink($host)} </td>
+    <td align="center" class="border"> $Status{$host}{type} </td>
+    <td align="center" class="border"> ${UserLink(defined($Hosts->{$host})
                                        ? $Hosts->{$host}{user} : "")} </td>
-    <td align="right"> $startTime </td>
-    <td> $XferViewStr </td>
-    <td align="right"> $errorTime </td>
-    <td> ${EscHTML($shortErr)} </td></tr>
+    <td align="right" class="border"> $startTime </td>
+    <td class="border"> $XferViewStr </td>
+    <td align="right" class="border"> $errorTime </td>
+    <td class="border"> ${EscHTML($shortErr)} </td></tr>
 EOF
     }
     my $now          = timeStamp2(time);
@@ -107,6 +107,7 @@ EOF
     my $numUserQueue = $QueueLen{UserQueue};
     my $numCmdQueue  = $QueueLen{CmdQueue};
     my $serverStartTime = timeStamp2($Info{startTime});
+    my $configLoadTime  = timeStamp2($Info{ConfigLTime});
     my $poolInfo     = genPoolInfo("pool", \%Info);
     my $cpoolInfo    = genPoolInfo("cpool", \%Info);
     if ( $Info{poolFileCnt} > 0 && $Info{cpoolFileCnt} > 0 ) {
@@ -123,9 +124,8 @@ EOF
     } elsif ( $Info{cpoolFileCnt} > 0 ) {
         $poolInfo = $cpoolInfo;
     }
-
-    Header($Lang->{H_BackupPC_Server_Status});
-    print (eval ("qq{$Lang->{BackupPC_Server_Status}}"));
+    my $content = eval ("qq{$Lang->{BackupPC_Server_Status}}");
+    Header($Lang->{H_BackupPC_Server_Status}, $content);
     Trailer();
 }