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.

Sign up for GitHub

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

Use 'jenkins-button' for tables #9131

Merged
merged 7 commits into from
Apr 10, 2024
Merged

Use 'jenkins-button' for tables #9131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
198fbc8
Init
janfaracik Apr 6, 2024
c6d6ef0
Update Security2780Test.java
janfaracik Apr 6, 2024
cb9728a
Add comment for increasing SVG size in table
janfaracik Apr 8, 2024
9004b9a
Restore previous column.jelly
janfaracik Apr 8, 2024
9bad103
Merge branch 'master' into use-jenkins-button-for-tables
janfaracik Apr 8, 2024
6ea7e01
Fix indentation
janfaracik Apr 8, 2024
c792153
Merge branch 'master' into use-jenkins-button-for-tables
janfaracik Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions core/src/main/resources/hudson/PluginManager/installed.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,14 @@ THE SOFTWARE.
<td class="jenkins-table__cell--tight">
<div class="jenkins-table__cell__button-wrapper">
<j:if test="${p.downgradable}">
<form class="jenkins-buttons-row" method="post"
<form method="post"
class="jenkins-buttons-row"
action="${rootURL}/updateCenter/plugin/${p.shortName}/downgrade">
<button class="jenkins-table__button jenkins-!-color-orange" tooltip="${%downgradeTo(p.backupVersion)}">
<button class="jenkins-button jenkins-button--tertiary jenkins-!-color-orange"
style="padding: 0.5rem"
tooltip="${%downgradeTo(p.backupVersion)}">
<l:icon src="symbol-downgrade-circle"/>
<span class="jenkins-!-margin-left-1"
style="font-size: 0.75rem; font-weight: 600; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 50px;">
<span style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 60px;">
${p.backupVersion}
</span>
</button>
Expand Down Expand Up @@ -220,7 +222,7 @@ THE SOFTWARE.
</j:if>
<button data-action="uninstall"
type="button"
class="jenkins-table__button jenkins-!-destructive-color"
class="jenkins-button jenkins-button--tertiary jenkins-!-destructive-color"
tooltip="${%Uninstall} ${p.updateInfo.displayName ?: p.displayName}"
data-href="plugin/${p.shortName}/doUninstall"
data-message="${%uninstall-title(p.updateInfo.displayName ?: p.displayName)}">
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ THE SOFTWARE.
<local:row name="${lr.name}" href="${lr.searchUrl}/">
<l:isAdmin>
<div class="jenkins-table__cell__button-wrapper">
<a href="${lr.searchUrl}/configure" class="jenkins-table__button">
<a href="${lr.searchUrl}/configure" class="jenkins-button jenkins-button--tertiary">
<l:icon src="symbol-settings" />
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/model/ComputerSet/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ THE SOFTWARE.
<td class="jenkins-table__cell--tight">
<j:if test="${c.hasPermission(c.EXTENDED_READ)}">
<div class="jenkins-table__cell__button-wrapper">
<a href="../${c.url}configure" class="jenkins-table__button">
<a href="../${c.url}configure" class="jenkins-button jenkins-button--tertiary">
<l:icon src="symbol-settings" />
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ window.displayBuilds = function (data) {
var div2 = document.createElement("div");
div2.classList.add("jenkins-table__cell__button-wrapper");
var a3 = document.createElement("a");
a3.classList.add("jenkins-table__button");
a3.classList.add("jenkins-button");
a3.href = e.consoleUrl;
a3.innerHTML = p.dataset.consoleOutputIcon;
div2.appendChild(a3);
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ THE SOFTWARE.
</td>
<td>
<div class="jenkins-table__cell__button-wrapper">
<a href="${user.url}/configure" class="jenkins-table__button">
<a href="${user.url}/configure" class="jenkins-button jenkins-button--tertiary">
<l:icon src="symbol-settings" />
</a>
</div>
</td>
<td>
<j:if test="${user.canDelete()}">
<div class="jenkins-table__cell__button-wrapper">
<l:confirmationLink href="${user.url}/doDelete" class="jenkins-table__button jenkins-!-destructive-color"
<l:confirmationLink href="${user.url}/doDelete" class="jenkins-button jenkins-button--tertiary jenkins-!-destructive-color"
post="true" message="${%delete.user(user.displayName)}">
<l:icon src="symbol-trash" />
</l:confirmationLink>
Expand Down
6 changes: 2 additions & 4 deletions core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ THE SOFTWARE.
</j:otherwise>
</j:choose>
<j:set var="isQueued" value="${app.queue.contains(job)}"/>
<a id="${id}" tooltip="${title}" class="jenkins-table__button jenkins-!-build-color" href="${href}">
<span class="${isQueued ? 'pulse-animation': ''}">
<l:icon src="symbol-play" />
</span>
<a id="${id}" tooltip="${title}" class="jenkins-button jenkins-button--tertiary jenkins-!-build-color ${isQueued ? 'pulse-animation': ''}" href="${href}">
<l:icon src="symbol-play" />
<st:adjunct includes="hudson.views.BuildButtonColumn.icon"/>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/jenkins/agents/CloudSet/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ THE SOFTWARE.
</td>
<td class="jenkins-table__cell--tight">
<div class="jenkins-table__cell__button-wrapper">
<a href="${it.getCloudUrl(request,app,cloud)}configure" class="jenkins-table__button">
<a href="${it.getCloudUrl(request,app,cloud)}configure" class="jenkins-button">
<l:icon src="symbol-settings"/>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/hudson/buildHealth.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ THE SOFTWARE.
<div class="jenkins-table__cell__button-wrapper">
<j:choose>
<j:when test="${!empty(healthReports)}">
<a class="build-health-link jenkins-table__button" href="${empty(link)?'#':link}" style="${attrs.style}">
<a class="build-health-link jenkins-button jenkins-button--tertiary" href="${empty(link)?'#':link}" style="${attrs.style}">
<l:icon src="symbol-weather-${buildHealth.iconClassName}" />
</a>
</j:when>
Expand Down
2 changes: 1 addition & 1 deletion test/src/test/java/jenkins/security/Security2780Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void buildButtonTooltipHasNoXss() throws Exception {
AtomicBoolean alertTriggered = new AtomicBoolean(false);
wc.setAlertHandler((p, s) -> alertTriggered.set(true));
HtmlPage page = wc.goTo("");
page.executeJavaScript("document.querySelector('a.jenkins-table__button')._tippy.show()");
page.executeJavaScript("document.querySelector('.jenkins-table a.jenkins-button')._tippy.show()");
wc.waitForBackgroundJavaScript(2000L);
ScriptResult result = page.executeJavaScript("document.querySelector('.tippy-content').innerHTML;");
Object jsResult = result.getJavaScriptResult();
Expand Down
4 changes: 1 addition & 3 deletions war/src/main/scss/components/_icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,5 @@
}

.pulse-animation {
svg {
daniel-beck marked this conversation as resolved.
Show resolved Hide resolved
animation: pulse-animation 2s ease infinite;
}
animation: pulse-animation 2s ease infinite;
}
4 changes: 4 additions & 0 deletions war/src/main/scss/components/_side-panel-widgets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@
grid-template-columns: auto 1fr auto;
font-weight: 500 !important;

.build-health-link {
margin: -9px -15px;
}

daniel-beck marked this conversation as resolved.
Show resolved Hide resolved
.jenkins-table__cell--tight {
width: auto;
margin-right: 1rem;
Expand Down
15 changes: 13 additions & 2 deletions war/src/main/scss/components/_table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,24 @@
}
}

.jenkins-button {
margin: -10px 0;
padding: 0.5rem 0.75rem;

// Increase the size of symbols compared to regular buttons
svg {
width: 1.375rem !important;
height: 1.375rem !important;
}
}

&__button,
&__icon {
svg,
.build-status-icon__wrapper,
img {
width: 1.5rem !important;
height: 1.5rem !important;
width: 1.375rem !important;
height: 1.375rem !important;
daniel-beck marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
Loading