Skip to content

Commit

Permalink
Utilize new table design (#145)
Browse files Browse the repository at this point in the history
* feat: Utilize new table design

* fix: Minor fixup

* build: Use bom of 2.319.x
  • Loading branch information
NotMyFault authored Mar 2, 2022
1 parent fc82a38 commit d604662
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</pluginRepositories>
<properties>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.289.1</jenkins.version>
<jenkins.version>2.321</jenkins.version>
<java.level>8</java.level>
<no-test-jar>false</no-test-jar>
<useBeta>true</useBeta>
Expand All @@ -74,8 +74,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.289.x</artifactId>
<version>1090.v0a_33df40457a_</version>
<artifactId>bom-2.319.x</artifactId>
<version>1148.v7261f385f859</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,27 @@
<!--
Renders the flow node in a tree list view
-->
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:i="jelly:fmt">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
<l:ajax>
<div id="nodeGraph">
<table class="pane bigtable">
<table class="jenkins-table">
<j:set var="columns" value="${it.columns}"/>
<!-- header row -->
<tr>
<th>${%Step}</th>
<j:forEach var="column" items="${columns}">
<st:include from="${column}" page="columnHeader"/>
</j:forEach>
</tr>
<thead>
<tr>
<th>${%Step}</th>
<j:forEach var="column" items="${columns}">
<st:include from="${column}" page="columnHeader"/>
</j:forEach>
</tr>
</thead>

<j:forEach var="row" items="${it.rows}">
<j:set var="node" value="${row.node}"/>
<tr style="opacity: ${row.isExecuted()?'1.0':'0.3'}"> <!-- Muted if not executed -->
<!-- tooltip is for now debugging only -->
<j:set var="exec_state" value=""/>
<j:if test="${!row.executed}"><j:set var="exec_state" value=" (${%not executed})"/></j:if>
<j:set var="timeType" value="${row.isStart() ? 'in block' : 'in self'}"></j:set>
<j:set var="timeType" value="${row.isStart() ? 'in block' : 'in self'}"/>
<td style="padding-left: ${row.treeDepth*20+5}px" tooltip="ID: ${node.id}${exec_state}">
<a href="${rootURL}/${node.url}">
${row.displayName} - (${row.durationString} ${timeType})
Expand Down

0 comments on commit d604662

Please sign in to comment.