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

Replace static icon references with symbol API #7052

Merged
merged 1 commit into from
Sep 4, 2022
Merged

Replace static icon references with symbol API #7052

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
36 changes: 18 additions & 18 deletions core/src/main/resources/hudson/model/AllView/noJob.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ div {
a(href: "newJob", class: "content-block__link") {
span(_("createJob"))
span(class: "trailing-icon") {
l.svgIcon(
class: "icon-sm",
href: "${resURL}/images/material-icons/svg-sprite-navigation-symbol.svg#ic_arrow_forward_24px")
l.icon(
class: "icon-md",
src: "symbol-arrow-right")
}
}
}
Expand All @@ -48,9 +48,9 @@ div {
a(href: "computer/new", class: "content-block__link") {
span(_("setUpAgent"))
span(class: "trailing-icon") {
l.svgIcon(
class: "icon-sm",
href: "${resURL}/images/material-icons/svg-sprite-navigation-symbol.svg#ic_arrow_forward_24px")
l.icon(
class: "icon-md",
src: "symbol-arrow-right")
}
}
}
Expand All @@ -60,9 +60,9 @@ div {
a(href: "configureClouds", class: "content-block__link") {
span(_("setUpCloud"))
span(class: "trailing-icon") {
l.svgIcon(
class: "icon-sm",
href: "${resURL}/images/material-icons/svg-sprite-navigation-symbol.svg#ic_arrow_forward_24px")
l.icon(
class: "icon-md",
src: "symbol-arrow-right")
}
}
}
Expand Down Expand Up @@ -96,9 +96,9 @@ div {
a(href: "newJob", class: "content-block__link") {
span(_("createJob"))
span(class: "trailing-icon") {
l.svgIcon(
class: "icon-sm",
href: "${resURL}/images/material-icons/svg-sprite-navigation-symbol.svg#ic_arrow_forward_24px")
l.icon(
class: "icon-md",
src: "symbol-arrow-right")
}
}
}
Expand All @@ -125,9 +125,9 @@ div {
class: "content-block__link") {
span(_("Log in to Jenkins"))
span(class: "trailing-icon") {
l.svgIcon(
class: "icon-sm",
href: "${resURL}/images/material-icons/svg-sprite-navigation-symbol.svg#ic_arrow_forward_24px")
l.icon(
class: "icon-md",
src: "symbol-arrow-right")
}
}
}
Expand All @@ -137,9 +137,9 @@ div {
a(href: "signup", class: "content-block__link") {
span(_("Sign up for Jenkins"))
span(class: "trailing-icon") {
l.svgIcon(
class: "icon-sm",
href: "${resURL}/images/material-icons/svg-sprite-navigation-symbol.svg#ic_arrow_forward_24px")
l.icon(
class: "icon-md",
src: "symbol-arrow-right")
}

}
Expand Down
4 changes: 1 addition & 3 deletions core/src/main/resources/hudson/util/JenkinsReloadFailed/index.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ l.layout {
l.header(title:"Jenkins")
l.main_panel {
h1 {
l.icon(class: 'icon-error icon-xlg')
basil marked this conversation as resolved.
Show resolved Hide resolved
text(" ")
text(_("Error"))
}
p(_("msg"))
pre(Functions.printThrowable(my.cause))
}
}
}
5 changes: 1 addition & 4 deletions core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@
</j:otherwise>
</j:choose>
<a href="${rootURL}/${user.url}" class="model-link">
<l:svgIcon
class="am-monitor-icon" >
<use href="${resURL}/images/material-icons/svg-sprite-social-symbol.svg#ic_person_24px"></use>
</l:svgIcon>
<l:icon src="symbol-person-circle" class="icon-md"/>
<span class="hidden-xs hidden-sm">${userName}</span>
</a>
<j:if test="${app.securityRealm.canLogOut()}">
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/resources/lib/layout/helpIcon.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Outputs a help icon

The help link is rendered as an SVG with an (?) icon.

@since 2.234
<st:attribute name="iconSize">
Icon size, available are: small, medium, large, xlarge
Expand All @@ -19,7 +19,7 @@
<j:if test="${attrs.iconSize != null}">
<j:set var="iconSize" value="icon-${iconSize}"/>
</j:if>
<l:svgIcon tooltip="${tooltip}"
<l:icon tooltip="${tooltip}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caused SECURITY-2886.

class="${class} ${iconSize}"
href="${resURL}/images/material-icons/svg-sprite-action-symbol.svg#ic_help_24px" />
src="symbol-help-circle" />
</j:jelly>