More facelift.
authorFrantišek Dvořák <valtri@civ.zcu.cz>
Sun, 18 Mar 2012 14:19:27 +0000 (15:19 +0100)
committerFrantišek Dvořák <valtri@civ.zcu.cz>
Sun, 18 Mar 2012 14:19:27 +0000 (15:19 +0100)
dashboard.pl

index a0282a4..cbe95a6 100755 (executable)
@@ -73,8 +73,8 @@ foreach my $s (keys %list) {
                                        $result=`grep -- '-TEST FAILED-' $item->{dir}/report.twiki 2>/dev/null| wc -l | sed 's/ *//g'`;
                                        chomp $result;
                                } else {
-                                       if ($section == 0) { $result = 'Error'; }
-                                       else { $result = 'Failed'; }
+                                       if ($section == 0) { $result = 'Deploy Fail'; }
+                                       else { $result = 'TestSuite Fail'; }
                                }
                        } else { undef $result; }
                        $item->{result} = defined $result ? $result : '-';
@@ -153,7 +153,7 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
                .FAIL {border:1px solid black; text-align:center;background-color: #ff4c4c;}
                .NA {border:1px solid black; text-align:center;background-color: #ffffff;}
                .date {font-size:xx-small; color: #404040;}
-               .platf{font-family:sans-serif; border:1px solid black; text-align:center;background-color: #eeeeee;}
+               .platf{font-family:sans-serif; font-size:smaller; border:1px solid black; text-align:center;background-color: #eeeeee;}
                .comment {font-size:small;margin:0px 0px 0px 0px;}
                p.comment {margin:15px 0px 0px 0px;}
                p.modified {margin:0px 0px 0px 0px;}
@@ -161,6 +161,7 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
                td.modified {font-size:small; border:0px none; float:right; text-align: right;}
                td.thanks {font-size:small; border:0px none; text-align: right;}
                td.heading {font-size:xx-large; font-family:sans-serif; font-weight:bold; border: 0px none; float:left; text-align:left; white-space:nowrap;}
+               img { border:0px; }
        </style>
 </head>
 
@@ -172,7 +173,7 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
                        <table class="modified">
                                <tr>
                                        <td class="heading">Continuous Test Dashboard</td>
-                                       <td class="thanks"><img alt="MetaCentrum" src="http://www.metacentrum.cz/export/sites/metacentrum/images/metalogo/metalogo_pruhledne_150.png"/></td>
+                                       <td class="thanks"><A HREF="https://www.metacentrum.cz/en/"><img alt="MetaCentrum" src="http://www.metacentrum.cz/export/sites/metacentrum/images/metalogo/metalogo_pruhledne_150.png"/></A></td>
                                </tr>
                        </table>
                </td>
@@ -207,30 +208,36 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
                foreach my $c (sort keys %components) {
                        $item = $list{install}{$c}{$p};
                        if (defined $item) {
-                               if ($item->{result} eq '0') { $class='OK'; }
-                               else { $class='FAIL'; }
-
-                               if ( $item->{result} eq '1' ) { $result="<b>$item->{result} error</b>"; }
-                               elsif ($item->{result} =~ /^[0-9]+$/) { $result="<b>$item->{result} errors</b>"; }
-                               else { $result = "<b>$item->{result}</b>"; }
+                               if ($item->{result} eq '0') {
+                                       $class='OK';
+                                       $result="<B>OK</B>"; }
+                               else {
+                                       $class='FAIL';
+                                       if ( $item->{result} eq '1' ) { $result="<b>$item->{result} error</b>"; }
+                                       elsif ($item->{result} =~ /^[0-9]+$/) { $result="<b>$item->{result}&nbsp;tests failed</b>"; }
+                                       else { $result = "<b>$item->{result}</b>"; }
+                               }
 
                                print "         <td class=\"$class\"><span class=\"date\">$item->{date}</span><br/><a href=\"$item->{dir}/\">$result</a></td>\n";
                        } else {
-                               print "         <td class=\"NA\"></td>\n"
+                               print "         <td class=\"NA\"><span class=\"date\">&nbsp;</span><br/>&nbsp;</td>\n"
                        }
 
                        $item = $list{upgrade}{$c}{$p};
                        if (defined $item) {
-                               if ($item->{result} eq '0') { $class='OK'; }
-                               else { $class='FAIL'; }
-
-                               if ( $item->{result} eq '1' ) { $result="<b>$item->{result} error</b>"; }
-                               elsif ($item->{result} =~ /^[0-9]+$/) { $result="<b>$item->{result} errors</b>"; }
-                               else { $result = "<b>$item->{result}</b>"; }
+                               if ($item->{result} eq '0') {
+                                       $class='OK';
+                                       $result="<B>OK</B>"; }
+                               else {
+                                       $class='FAIL';
+                                       if ( $item->{result} eq '1' ) { $result="<b>$item->{result} error</b>"; }
+                                       elsif ($item->{result} =~ /^[0-9]+$/) { $result="<b>$item->{result}&nbsp;tests failed</b>"; }
+                                       else { $result = "<b>$item->{result}</b>"; }
+                               }
 
                                print "         <td class=\"$class\"><span class=\"date\">$item->{date}</span><br/><a href=\"$item->{dir}/\">$result</a></td>\n";
                        } else {
-                               print "         <td class=\"NA\"></td>\n"
+                               print "         <td class=\"NA\"><span class=\"date\">&nbsp;</span><br/>&nbsp;</td>\n"
                        }
                }
                print " </tr>\n";