Skip to content

[JENKINS-69787] Use (x) icon for dismissing admin monitors #25972

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

Closed
Jayesh45-master wants to merge 1 commit into from
Closed

[JENKINS-69787] Use (x) icon for dismissing admin monitors #25972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,16 @@ THE SOFTWARE.
data-url="${rootURL}/${it.url}/test" data-context="${rootURL}">
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
<f:submit name="yes" value="${%More Info}"/>
<l:isAdmin>
<f:submit name="no" value="${%Dismiss}"/>
</l:isAdmin>
<l:isAdmin>
<button type="submit"
name="no"
class="jenkins-button jenkins-button--icon"
aria-label="${%Dismiss}"
tooltip="${%Dismiss}">
<l:icon src="symbol-close" />
</button>
</l:isAdmin>

</form>
<div>${%blurb}</div>
<div class="js-context-message reverse-proxy__hidden">${%missingContextMessage(rootURL)}</div>
Expand Down
11 changes: 7 additions & 4 deletions core/src/main/resources/lib/form/repeatableDeleteButton.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@ THE SOFTWARE.
<st:adjunct includes="lib.form.repeatable.repeatable"/>

<j:set var="deleteText" value="${attrs.value ?: '%Delete'}" />
<button class="repeatable-delete danger" type="button" style="--width: ${deleteText.length()}ch">
<l:icon src="symbol-close" />
<span>${deleteText}</span>
</button>
<button
type="button"
class="repeatable-delete"
aria-label="${deleteText}"
tooltip="${deleteText}">
<l:icon src="symbol-close" />
</button>
</j:jelly>