Changeset 286

Timestamp:

Jul 16, 2018, 7:36:34 PM (6 years ago)

Author:

g7moreau

Message:

• Try to push force check with a red arrow

Location:

trunk/nagios-velvice

Files:

• velvice.cgi (modified) (5 diffs)
• velvice.css (modified) (2 diffs)

trunk/nagios-velvice/velvice.cgi

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

trunk/nagios-velvice/velvice.css

@@ -76 +76 @@
 td {
    border:           0px;
+   vertical-align:   middle;
    }
 
@@ -84 +85 @@
 td.hoop {
    border:           1px solid #777;
+   }
+
+td.comment {
+   max-width:        60%;
+   font-size:        small;
+   }
+
+td.days {
+   text-align:       right;
+   }
+
+td.checking:after {
+   background-color: red;
+   color:            white;
+   content:          "\21B5";
+   padding:          0ex 0.8ex 0ex 0.8ex;
+   border-radius:    0ex 0px 0px 2ex;
    }