...
 
Commits (6)
......@@ -20,6 +20,7 @@ preprocess do
drm-intel-next-queued
drm-misc-fixes
drm-misc-next-fixes
drm-intel-media
linus
linux-next
airlied
......
......@@ -102,3 +102,31 @@ body {
.dropdown:hover .dropdown-content {
display: block;
}
.triangle-down {
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-top: 8px solid #fff;
display: inline-block;
margin-left: 2px;
margin-right: 2px;
}
.triangle-right {
width: 0;
height: 0;
border-top: 5px solid transparent;
border-bottom: 5px solid transparent;
border-left: 8px solid #fff;
display: inline-block;
margin-left: 2px;
margin-right: 2px;
}
......@@ -82,6 +82,12 @@ function addMachine()
}
function removeElement(element)
{
element.parentElement.removeChild(element);
}
function addNavbar()
{
var navbar = document.createElement("div");
......@@ -93,11 +99,11 @@ function addNavbar()
if (isPremerge()) {
var toDelete = document.querySelector("#run_name_href");
toDelete.parentElement.removeChild(toDelete);
removeElement(toDelete);
} else {
var toDelete = document.querySelectorAll(".run_name_dropdown");
for (var i = 0; i < toDelete.length; i++) {
toDelete[i].parentElement.removeChild(toDelete[i]);
removeElement(toDelete[i]);
}
}
......@@ -108,11 +114,27 @@ function addNavbar()
}
addStylesheet();
function cleanupNavbarForGrids()
{
removeElement(document.querySelector("#tree_name").parentElement.parentElement);
removeElement(document.querySelector("#run_name_href").parentElement);
}
function isSingleTestResult() {
return !!document.querySelector("h1");
}
addStylesheet();
document.addEventListener("DOMContentLoaded", function(event) {
addMachine();
if (isSingleTestResult())
addMachine();
wrapContent();
addNavbar();
if (!isSingleTestResult())
cleanupNavbarForGrids();
});
This diff is collapsed.
<!DOCTYPE html>
<html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Intel GFX CI - Links</title>
<title></title>
<meta name="description" content="Results of Intel&#39;s Graphics CI systems">
<link rel="stylesheet" href="/assets/detailed.css" type="text/css">
<link rel="stylesheet" href="/assets/generic.css" type="text/css">
......
......@@ -2,7 +2,7 @@
<a href="/"><img src="/assets/favicon.gif" border=0 alt="Home"></img></a>
<div class="dropdown">
<button>
tree <% if @item[:tree] %> &#11166; <%= @item[:tree] %> <% end %> &#11167;
tree <% if @item[:tree] %> <div class="triangle-right"></div> <%= @item[:tree] %> <% end %> <div class="triangle-down"></div>
</button>
<div class="dropdown-content">
<% @config[:trees].each do |tree| %>
......@@ -24,7 +24,7 @@
<% if @item[:current_tree_view] %>
<div class="dropdown">
<button>view &#11166; <%= @item[:current_tree_view_type] %> &#11167;</button>
<button>view <div class="triangle-right"></div> <%= @item[:current_tree_view_type] %> <div class="triangle-down"></div></button>
<div class="dropdown-content">
<% @config[:view_types].each_pair do |path, name| %>
<% if @item[:current_tree_view] != path %>
......@@ -38,7 +38,7 @@
<!-- for the test-result.js -->
<% if @page == :test_result %>
<div class="dropdown">
<button><span id="tree_name"></span> &#11167;</button>
<button><span id="tree_name"></span> <div class="triangle-down"></div></button>
<div class="dropdown-content">
<% @config[:view_types].each_pair do |path, name| %>
<a href="../../<%= path %>"><%= name %></a>
......@@ -51,7 +51,7 @@
<a id="run_name_href" href=".."><span class="run_name"></span></a>
<!-- pre-merge result view selection, removed via js for the post-merge -->
<button class="run_name_dropdown"><span class="run_name"></span> &#11167;</button>
<button class="run_name_dropdown"><span class="run_name"></span> <div class="triangle-down"></div></button>
<div class="dropdown-content run_name_dropdown">
<% @config[:view_types].each_pair do |path, name| %>
<a href="../<%= path %>"><%= name %></a>
......
......@@ -118,12 +118,15 @@ module I915DisplayInfo
if is_display_port(name)
lines.shift while !(lines.empty? || is_dp_branch_line?(lines.first))
branch = lines.shift.scan(/DP branch device present: (yes|no)/)
if branch.flatten.first == 'yes'
type, dev, hw, sw = get_branch_info(lines)
connector_status[name]['to'] = "#{type}" if status == 'connected'
connector_status[name]['via'] = "#{dev} v#{sw}" if !dev.empty?
lines.shift while !(lines.empty? || is_dp_branch_line?(lines.first) || is_connector_line?(lines.first))
if is_dp_branch_line?(lines.first)
branch = lines.shift.scan(/DP branch device present: (yes|no)/)
if branch.flatten.first == 'yes'
type, dev, hw, sw = get_branch_info(lines)
connector_status[name]['to'] = "#{type}" if status == 'connected'
connector_status[name]['via'] = "#{dev} v#{sw}" if !dev.empty?
end
end
end
......
......@@ -84,6 +84,7 @@ multiple commits/merges.
| [drm-intel-next-queued][dinq] | [docs][drm-intel-doc] | [repo][dinq-repo] |
| [drm-misc-fixes][drm-misc-fixes] | [docs][drm-misc-doc] | [repo][drm-misc-fixes-repo] |
| [drm-misc-next-fixes][drm-misc-next-fixes] | [docs][drm-misc-doc] | [repo][drm-misc-next-fixes-repo] |
| [drm-intel-media][drm-intel-media] | ??? | [repo][drm-intel-media-repo] |
| [Dave Airlie's branch][airlied] | ??? | [repo][airlied-repo] |
*\*: IGT results are part of the drm-tip visualisation*
......@@ -116,6 +117,9 @@ multiple commits/merges.
[drm-misc-next-fixes-repo]: https://cgit.freedesktop.org/drm-misc/log/?h=drm-misc-next-fixes
[drm-misc-doc]: https://drm.pages.freedesktop.org/maintainer-tools/drm-misc.html
[drm-intel-media]: /tree/drm-intel-media/
[drm-intel-media-repo]: https://cgit.freedesktop.org/~tursulin/drm-intel/?h=media
[airlied]: /tree/airlied/
[airlied-repo]: https://cgit.freedesktop.org/~airlied/linux/log/?h=for-intel-ci
......