From de18e652818f5627360f76f5c9ceb71ec156ed89 Mon Sep 17 00:00:00 2001
From: Ilya Shakhat <ishakhat@mirantis.com>
Date: Wed, 30 Sep 2015 19:14:59 +0300
Subject: [PATCH] Show CI failures directly in DriverLog report

Change-Id: I9e30babcbdfa0b627ac7a0324629d852d6f839d4
---
 .../dashboard/static/js/driverlog-ui.js       | 20 ++++++++++++++-----
 .../templates/reports/driverlog.html          |  4 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/stackalytics/dashboard/static/js/driverlog-ui.js b/stackalytics/dashboard/static/js/driverlog-ui.js
index fb06c8902..68b6e75da 100644
--- a/stackalytics/dashboard/static/js/driverlog-ui.js
+++ b/stackalytics/dashboard/static/js/driverlog-ui.js
@@ -178,7 +178,7 @@ function showSummary(base_url) {
 
                 var releases_list = [];
                 for (var j = 0; j < tableData[i].releases_info.length; j++) {
-                    releases_list.push("<a href=\"" + tableData[i].releases_info[j].wiki + "\" target=\"_blank\">" +
+                    releases_list.push("<a href=\"" + tableData[i].releases_info[j].wiki + "\">" +
                             tableData[i].releases_info[j].name + "</a>");
                 }
                 tableData[i].in_trunk = releases_list.join(" ");
@@ -189,13 +189,23 @@ function showSummary(base_url) {
                         var last_release = tableData[i].releases_info[tableData[i].releases_info.length - 1].release_id;
                         var master = tableData[i].releases[last_release];
                         if (master.review_url) {
+                            var ci_result = master.ci_result;
+                            var ci_result_str;
+                            var ci_title;
+                            if (ci_result) {
+                                ci_result_str = "<span style=\"color: limegreen; font-size: 130%;\">&#x2714;</span>";
+                                ci_title = "CI is enabled on master and the latest job SUCCEED";
+                            } else {
+                                ci_result_str = "<span style=\"color: darkred\">&#x2714;</span>";
+                                ci_title = "CI is enabled on master and the latest job FAILED";
+                            }
                             tableData[i].ci_tested = "<a href=\"" + master.review_url +
-                                    "\" target=\"_blank\" title=\"CI is enabled on master. Click to see the latest results\"><span style=\"color: #00A000\">&#x2714;</span></a>";
+                                    "\" title=\"" + ci_title + "\">" + ci_result_str + "</a>";
                         } else {
-                            tableData[i].ci_tested = "<span style=\"color: #909090\" title=\"CI is configured, but no results observed\">&#x2714;</span>";
+                            tableData[i].ci_tested = "<span style=\"color: goldenrod\" title=\"CI is configured, but no results observed\">&#x2716;</span>";
                         }
                     } else {
-                        tableData[i].ci_tested = "<span style=\"color: #909090\" title=\"CI is configured, but no results observed\">&#x2714;</span>";
+                        tableData[i].ci_tested = "<span style=\"color: goldenrod\" title=\"CI is configured, but no results observed\">&#x2716;</span>";
                     }
                 } else {
                     tableData[i].ci_tested = "<span style=\"color: darkred\" title=\"CI is not configured\">&#x2716;</span>";
@@ -208,7 +218,7 @@ function showSummary(base_url) {
                         var mn = maintainer.name;
                         if (maintainer.launchpad_id) {
                             maintainers_list.push("<a href=\"http://stackalytics.com/?user_id=" +
-                                maintainer.launchpad_id + "\" target=\"_blank\">" + mn + "</a>");
+                                maintainer.launchpad_id + "\">" + mn + "</a>");
                         }
                         else if (maintainer.irc) {
                             maintainers_list.push("<a href=\"irc:" + maintainer.irc + "\">" + mn + "</a>");
diff --git a/stackalytics/dashboard/templates/reports/driverlog.html b/stackalytics/dashboard/templates/reports/driverlog.html
index 07f1c1b16..9e90b88c8 100644
--- a/stackalytics/dashboard/templates/reports/driverlog.html
+++ b/stackalytics/dashboard/templates/reports/driverlog.html
@@ -92,9 +92,9 @@
                 <td>
                     {%if value.ci_tested %}
                         {%if value.ci_result %}
-                            <span style="color: green">&#x2714;</span>
+                            <span style="color: limegreen">&#x2714;</span>
                         {%else%}
-                            <span style="color: red">&#x2716;</span>
+                            <span style="color: darkred">&#x2716;</span>
                         {%/if%}
                     {%else%}
                         <span style="color: gray">&#x2753;</span>