Changeset 287

Timestamp:

Jul 16, 2018, 7:47:01 PM (6 years ago)

Author:

g7moreau

Message:

Continue replacing check with red arrow

Location:

trunk/nagios-velvice

Files:

• velvice.cgi (modified) (5 diffs)
• velvice.css (modified) (1 diff)

trunk/nagios-velvice/velvice.cgi

@@ -15 +15 @@
 use strict;
 use warnings;
-use version; our $VERSION = version->declare('0.8.5');
+use version; our $VERSION = version->declare('0.8.6');
 
 use CGI;
@@ -183 +183 @@
       if ($hostname ne $current_host) {
          $current_host = $hostname;
-         $htmlpage .= "  <td rowspan='$hostcount{$hostname}' $stylecolor>"
+         $htmlpage .= "  <td $stylecolor rowspan='$hostcount{$hostname}'>"
             . "<a href=\"$cgi_script_name?check=" . uri_encode($hostname) . '">&#8623;</a></td>' . "\n";
-         $htmlpage .= "  <td class='hoop' rowspan='$hostcount{$hostname}' $stylecolor>"
+         $htmlpage .= "  <td $stylecolor class='hoop' rowspan='$hostcount{$hostname}'>"
             . "<a href=\"$config->{'nagios-server'}{'status-cgi'}?host=" . uri_encode($hostname) . "\">$hostname</a></td>\n";
          }
@@ -195 +195 @@
          $bold++ if $service =~ m/$act_regex/ and $config->{'remote-action'}{$act_name}{'style'} eq 'bold';
          }
-      $htmlpage .= $bold ? "  <td class='hoop bold' $stylecolor>" : "  <td class='hoop' $stylecolor>";
+      $htmlpage .= $bold ? "  <td $stylecolor class='hoop bold'>" : "  <td $stylecolor class='hoop'>";
       $htmlpage .= "$service</td>\n";
 
-      $htmlpage .= "  <td class='hoop' $stylecolor>$status</td>\n";
-      $htmlpage .= "  <td class='comment' $stylecolor>$output</td>\n";
-      $htmlpage .= "  <td class='days";
+      $htmlpage .= "  <td $stylecolor class='hoop'>$status</td>\n";
+      $htmlpage .= "  <td $stylecolor class='comment'>$output</td>\n";
+      $htmlpage .= "  <td $stylecolor class='days'>$downtime days</td>\n";
 
       if (($cgi_check =~ m/all/i)
@@ -215 +215 @@
          my $future = $now + 20 + int(rand($interval - 20)); # 5 * 60 = 300
 
-         $htmlpage .= ' checking'; # add class checking
+         $htmlpage .= "  <td class='checking'>" . ($future - $now) . "</td>\n"
          #$htmlpage .= " -- <b>CHECK</b> [$now/" . ($future - $now) . "]";
          printf $nagios_cmd "[%lu] SCHEDULE_FORCED_SVC_CHECK;%s;%s;%lu\n", $now, $hostname, $service, $now;
@@ -239 +239 @@
          }
 
-      $htmlpage .= "' $stylecolor>$downtime days</td>\n";
       $htmlpage .= " </tr>\n";
       }

trunk/nagios-velvice/velvice.css

@@ -101 +101 @@
    content:          "\21B5";
    padding:          0ex 0.8ex 0ex 0.8ex;
-   border-radius:    0ex 0px 0px 2ex;
+   border-radius:    0ex 1ex 1ex 0ex;
    }