Title: [161454] trunk/Tools
Revision
161454
Author
a...@apple.com
Date
2014-01-07 14:06:08 -0800 (Tue, 07 Jan 2014)

Log Message

Popovers at build.webkit.org/dashboard could have titles
https://bugs.webkit.org/show_bug.cgi?id=126495

Reviewed by Timothy Hatcher.

Added titles to all popovers except for pending revisions one, which I would like
to improve more (probably add an ETA).

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js:
(BuildbotBuilderQueueView.prototype._presentPopoverFailureLogs): Moved code for
adding a title to base class.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
(BuildbotQueueView.prototype._presentPopoverForPendingCommits): Moved code for inserting
a divider to a separate function.
(BuildbotQueueView.prototype._presentPopoverForRevisionRange): Added a title.
(BuildbotQueueView.prototype._presentNoChangePopover): Updated the text to match
title from above function.
(BuildbotQueueView.prototype._revisionPopoverContentForIteration): Renamed "contentElement"
variable to "content" to match all other code.
(BuildbotQueueView.prototype._addIterationHeadingToPopover): Added.
(BuildbotQueueView.prototype._addDividerToPopover): Added.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js:
(BuildbotTesterQueueView.prototype._popoverContentForLayoutTestRegressions): Add a title.
(BuildbotTesterQueueView.prototype._presentPopoverForLayoutTestRegressions): Ditto.
(BuildbotTesterQueueView.prototype._presentPopoverForMultipleFailureKinds): Ditto.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css:

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js (161453 => 161454)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js	2014-01-07 21:50:49 UTC (rev 161453)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js	2014-01-07 22:06:08 UTC (rev 161454)
@@ -143,18 +143,9 @@
             content.appendChild(line);
         }
 
-        var title = document.createElement("div");
-        title.className = "build-logs-popover-title";
-        title.textContent = iteration.queue.id;
-        content.appendChild(title);
+        this._addIterationHeadingToPopover(iteration, content);
+        this._addDividerToPopover(content);
         
-        var builderPageLine = document.createElement("a");
-        builderPageLine.className = "build-page-link";
-        builderPageLine.href = ""
-        builderPageLine.textContent = "build #" + iteration.id;
-        builderPageLine.target = "_blank";
-        content.appendChild(builderPageLine);
-
         var logsHeadingLine = document.createElement("div");
         logsHeadingLine.className = "build-logs-heading";
         logsHeadingLine.textContent = iteration.firstFailedStepName + " failed";

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js (161453 => 161454)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js	2014-01-07 21:50:49 UTC (rev 161453)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js	2014-01-07 22:06:08 UTC (rev 161454)
@@ -166,11 +166,8 @@
         if (latestProductiveIteration.internalRevision && internalTrac.latestRecordedRevisionNumber)
             var linesForInternal = this._popoverLinesForCommitRange(internalTrac, latestProductiveIteration.internalRevision + 1, internalTrac.latestRecordedRevisionNumber);
 
-        if (linesForOpenSource.length && linesForInternal.length) {
-            var divider = document.createElement("div");
-            divider.className = "divider";
-            content.appendChild(divider);
-        }
+        if (linesForOpenSource.length && linesForInternal.length)
+            this._addDividerToPopover(content);
 
         for (var i = 0; i != linesForInternal.length; ++i)
             content.appendChild(linesForInternal[i]);
@@ -191,6 +188,12 @@
         if (!linesForCommits.length)
             return false;
 
+        var line = document.createElement("div");
+        line.className = "title";
+        line.textContent = "new commits in this build";
+        content.appendChild(line);
+        this._addDividerToPopover(content);
+
         for (var i = 0; i != linesForCommits.length; ++i)
             content.appendChild(linesForCommits[i]);
 
@@ -208,7 +211,7 @@
 
         var line = document.createElement("div");
         line.className = "no-commits";
-        line.textContent = "no new commits in this buildbot queue iteration";
+        line.textContent = "no new commits in this build";
         
         content.appendChild(line);
 
@@ -221,9 +224,9 @@
 
     _revisionPopoverContentForIteration: function(iteration, internal)
     {
-        var contentElement = document.createElement("span");
-        contentElement.textContent = "r" + (internal ? iteration.internalRevision : iteration.openSourceRevision);
-        contentElement.classList.add("revision-number");
+        var content = document.createElement("span");
+        content.textContent = "r" + (internal ? iteration.internalRevision : iteration.openSourceRevision);
+        content.classList.add("revision-number");
 
         var previousIteration = iteration.previousProductiveIteration;
         if (previousIteration) {
@@ -233,14 +236,48 @@
                 lastRevision: internal ? iteration.internalRevision : iteration.openSourceRevision
             };
             if (context.firstRevision <= context.lastRevision)
-                new PopoverTracker(contentElement, this._presentPopoverForRevisionRange.bind(this), context);
+                new PopoverTracker(content, this._presentPopoverForRevisionRange.bind(this), context);
             else
-                new PopoverTracker(contentElement, this._presentNoChangePopover.bind(this), context);
+                new PopoverTracker(content, this._presentNoChangePopover.bind(this), context);
         }
 
-        return contentElement;
+        return content;
     },
 
+    _addIterationHeadingToPopover: function(iteration, content, additionalText)
+    {
+        var title = document.createElement("div");
+        title.className = "popover-iteration-heading";
+
+        var queueName = document.createElement("span");
+        queueName.className = "queue-name";
+        queueName.textContent = iteration.queue.id;
+        title.appendChild(queueName);
+
+        var buildbotLink = document.createElement("a");
+        buildbotLink.className = "buildbot-link";
+        buildbotLink.textContent = "build #" + iteration.id;
+        buildbotLink.href = ""
+        buildbotLink.target = "_blank";
+        title.appendChild(buildbotLink);
+
+        if (additionalText) {
+            var additionalTextElement = document.createElement("span");
+            additionalTextElement.className = "additional-text";
+            additionalTextElement.textContent = additionalText;
+            title.appendChild(additionalTextElement);
+        }
+
+        content.appendChild(title);
+    },
+
+    _addDividerToPopover: function(content)
+    {
+        var divider = document.createElement("div");
+        divider.className = "divider";
+        content.appendChild(divider);
+    },
+
     revisionContentForIteration: function(iteration)
     {
         console.assert(iteration.openSourceRevision);

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js (161453 => 161454)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js	2014-01-07 21:50:49 UTC (rev 161453)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js	2014-01-07 22:06:08 UTC (rev 161454)
@@ -140,6 +140,9 @@
         var content = document.createElement("div");
         content.className = "test-results-popover";
 
+        this._addIterationHeadingToPopover(iteration, content, "layout test failures");
+        this._addDividerToPopover(content);
+
         if (!iteration.layoutTestResults.regressions) {
             var message = document.createElement("div");
             message.className = "loading-failure";
@@ -199,6 +202,9 @@
             var content = document.createElement("div");
             content.className = "test-results-popover";
 
+            this._addIterationHeadingToPopover(iteration, content, "layout test failures");
+            this._addDividerToPopover(content);
+
             var loadingIndicator = document.createElement("div");
             loadingIndicator.className = "loading-indicator";
             loadingIndicator.textContent = "Loading\u2026";
@@ -236,6 +242,9 @@
         var content = document.createElement("div");
         content.className = "test-results-popover";
 
+        this._addIterationHeadingToPopover(iteration, content);
+        this._addDividerToPopover(content);
+
         if (layoutTestResults.failureCount) {
             var message = (layoutTestResults.tooManyFailures ? layoutTestResults.failureCount + "\uff0b" : layoutTestResults.failureCount) + "\u00a0" +
                 (layoutTestResults.failureCount === 1 ? "layout test failure" : "layout test failures");

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css (161453 => 161454)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css	2014-01-07 21:50:49 UTC (rev 161453)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css	2014-01-07 22:06:08 UTC (rev 161454)
@@ -40,8 +40,16 @@
     margin-top: 10px;
 }
 
-.commit-history-popover > .pending-commit,
-.commit-history-popover > .no-commits {
+.popover .divider {
+    height: 7px;
+}
+
+.popover .popover-iteration-heading .buildbot-link,
+.popover .popover-iteration-heading .additional-text {
+    padding-left: 5px;
+}
+
+.commit-history-popover {
     font-family: "HelveticaNeue-Light", "Helvetica Neue", sans-serif;
     color: rgb(145, 135, 95);
     font-size: 12px;
@@ -59,8 +67,12 @@
     color: black;
 }
 
-.commit-history-popover > .divider {
-    height: 7px;
+.build-logs-popover {
+    font-family: "HelveticaNeue-Light", "Helvetica Neue", sans-serif;
+    color: rgb(145, 135, 95);
+    font-size: 12px;
+    text-align: left;
+    padding: 1px 6px 1px 6px;
 }
 
 .build-logs-popover {

Modified: trunk/Tools/ChangeLog (161453 => 161454)


--- trunk/Tools/ChangeLog	2014-01-07 21:50:49 UTC (rev 161453)
+++ trunk/Tools/ChangeLog	2014-01-07 22:06:08 UTC (rev 161454)
@@ -1,5 +1,37 @@
 2014-01-07  Alexey Proskuryakov  <a...@apple.com>
 
+        Popovers at build.webkit.org/dashboard could have titles
+        https://bugs.webkit.org/show_bug.cgi?id=126495
+
+        Reviewed by Timothy Hatcher.
+
+        Added titles to all popovers except for pending revisions one, which I would like
+        to improve more (probably add an ETA).
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js:
+        (BuildbotBuilderQueueView.prototype._presentPopoverFailureLogs): Moved code for 
+        adding a title to base class.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
+        (BuildbotQueueView.prototype._presentPopoverForPendingCommits): Moved code for inserting
+        a divider to a separate function.
+        (BuildbotQueueView.prototype._presentPopoverForRevisionRange): Added a title.
+        (BuildbotQueueView.prototype._presentNoChangePopover): Updated the text to match
+        title from above function.
+        (BuildbotQueueView.prototype._revisionPopoverContentForIteration): Renamed "contentElement"
+        variable to "content" to match all other code.
+        (BuildbotQueueView.prototype._addIterationHeadingToPopover): Added.
+        (BuildbotQueueView.prototype._addDividerToPopover): Added.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js:
+        (BuildbotTesterQueueView.prototype._popoverContentForLayoutTestRegressions): Add a title.
+        (BuildbotTesterQueueView.prototype._presentPopoverForLayoutTestRegressions): Ditto.
+        (BuildbotTesterQueueView.prototype._presentPopoverForMultipleFailureKinds): Ditto.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/QueueView.css:
+
+2014-01-07  Alexey Proskuryakov  <a...@apple.com>
+
         There should be a delay when quickly switching to a different popover at build.webkit.org/dashboard
         https://bugs.webkit.org/show_bug.cgi?id=126472
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to