Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-72944] reduce spacing in buildhistory widget #9122

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 13 additions & 16 deletions core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
Expand Up @@ -57,23 +57,20 @@ THE SOFTWARE.
<t:buildProgressBar build="${build}"/>
</j:if>
</div>
<div class="pane build-controls">
<div class="middle-align build-badge">
<j:set var="badges" value="${build.badgeActions}"/>
<j:if test="${!empty(badges)}">
<st:nbsp/>
<j:forEach var="badge" items="${badges}">
<st:include it="${badge}" page="badge.jelly" />
</j:forEach>
</j:if>
</div>
<div class="pane build-badges">
<j:if test="${build.building}">
<div class="build-stop">
<!-- Check CANCEL permission for Project, Admin permission otherwise -->
<j:if test="${empty(it.widget.owner.CANCEL) ? h.hasPermission(app.ADMINISTER) : it.widget.owner.hasPermission(it.widget.owner.CANCEL)}">
<l:stopButton href="${link}stop" alt="${%Cancel}" confirm="${%confirm(build.fullDisplayName)}" />
</j:if>
</div>
<!-- Check CANCEL permission for Project, Admin permission otherwise -->
<j:if test="${empty(it.widget.owner.CANCEL) ? h.hasPermission(app.ADMINISTER) : it.widget.owner.hasPermission(it.widget.owner.CANCEL)}">
<l:stopButton href="${link}stop" alt="${%Cancel}" confirm="${%confirm(build.fullDisplayName)}" />
</j:if>
</j:if>
<j:set var="badges" value="${build.badgeActions}"/>
<j:if test="${!empty(badges)}">
<j:forEach var="badge" items="${badges}">
<div class="run-badge">
<st:include it="${badge}" page="badge.jelly" />
</div>
</j:forEach>
</j:if>
</div>
<j:if test="${!empty build.truncatedDescription}">
Expand Down
Expand Up @@ -62,12 +62,12 @@ THE SOFTWARE.
</div>
</j:if>
</div>
<div class="pane build-controls">
<div class="build-stop">
<j:if test="${item.hasCancelPermission()}">
<div class="pane build-badges">
<j:if test="${item.hasCancelPermission()}">
<div class="run-badge">
<l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" alt="${%Cancel this build}"/>
</j:if>
</div>
</div>
</j:if>
</div>
<div class="left-bar"></div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion test/src/test/java/hudson/model/RunTest.java
Expand Up @@ -157,7 +157,7 @@ private void ensureXssIsPrevented(FreeStyleProject upProject, String validationP
HtmlPage htmlPage = wc.goTo(upProject.getUrl());

// trigger the tooltip display
htmlPage.executeJavaScript("document.querySelector('#buildHistory table .build-badge svg')._tippy.show()");
htmlPage.executeJavaScript("document.querySelector('#buildHistory table .run-badge svg')._tippy.show()");
wc.waitForBackgroundJavaScript(500);
ScriptResult result = htmlPage.executeJavaScript("document.querySelector('.tippy-content').innerHTML;");
Object jsResult = result.getJavaScriptResult();
Expand Down