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

feat: [JENKINS-66699] Exchange default PNGs with SVG icons #230

Merged
merged 3 commits into from
Oct 1, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public Object unmarshal(HierarchicalStreamReader reader, final UnmarshallingCont
@Override
public String getIconFileName() {
return isVisible()
? "/plugin/credentials/images/24x24/credentials.png"
? "/plugin/credentials/images/credentials.svg"
: null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public class GlobalCredentialsConfiguration extends ManagementLink
public String getIconFileName() {
return ExtensionList.lookup(CredentialsDescriptor.class).isEmpty()
? null
: "/plugin/credentials/images/48x48/credentials.png";
: "/plugin/credentials/images/credentials.svg";
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public String getCategoryName() {

@Override
public String getIconFileName() {
return "/plugin/credentials/images/48x48/credentials.png";
return "/plugin/credentials/images/credentials.svg";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,22 @@ public void start() throws Exception {
}) {
IconSet.icons.addIcon(new Icon(
String.format("icon-credentials-%s icon-sm", name),
String.format("credentials/images/16x16/%s.png", name),
String.format("credentials/images/%s.svg", name),
Icon.ICON_SMALL_STYLE, IconType.PLUGIN)
);
IconSet.icons.addIcon(new Icon(
String.format("icon-credentials-%s icon-md", name),
String.format("credentials/images/24x24/%s.png", name),
String.format("credentials/images/%s.svg", name),
Icon.ICON_MEDIUM_STYLE, IconType.PLUGIN)
);
IconSet.icons.addIcon(new Icon(
String.format("icon-credentials-%s icon-lg", name),
String.format("credentials/images/32x32/%s.png", name),
String.format("credentials/images/%s.svg", name),
Icon.ICON_LARGE_STYLE, IconType.PLUGIN)
);
IconSet.icons.addIcon(new Icon(
String.format("icon-credentials-%s icon-xlg", name),
String.format("credentials/images/48x48/%s.png", name),
String.format("credentials/images/%s.svg", name),
Icon.ICON_XLARGE_STYLE, IconType.PLUGIN)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ public CredentialsStore getStore() {
@Override
public String getIconFileName() {
return isVisible()
? "/plugin/credentials/images/24x24/system-store.png"
? "/plugin/credentials/images/system-store.svg"
: null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ public CredentialsStore getStore() {
@Override
public String getIconFileName() {
return isVisible()
? "/plugin/credentials/images/24x24/user-store.png"
? "/plugin/credentials/images/user-store.svg"
: null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public ModelObject getContext() {
@Override
public String getIconFileName() {
return isVisible()
? "/plugin/credentials/images/24x24/credentials.png"
? "/plugin/credentials/images/credentials.svg"
: null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<l:layout title="${it.fullDisplayName}" norefresh="true" permission="${it.domain.parent.DELETE}">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<h1><img src="${resURL}/plugin/credentials/images/48x48/move.png" alt=""/>${%Move}</h1>
<h1><img src="${resURL}/plugin/credentials/images/move.svg" alt=""/>${%Move}</h1>
<form method="post" action="doMove">
${%blurb(it.displayName,it.typeName)}
<br />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<l:side-panel>
<l:tasks>
<j:set var="url" value="${h.getNearestAncestorUrl(request,it)}"/>
<l:task icon="images/24x24/up.png" href="../.." title="${%backto(it.domain.displayName)}" contextMenu="false"/>
<l:task icon="images/24x24/setting.png" href="${url}/update" title="${%Update}" permission="${it.domain.parent.UPDATE}"/>
<l:task icon="images/24x24/edit-delete.png" href="${url}/delete" title="${%Delete}" permission="${it.domain.parent.DELETE}"/>
NotMyFault marked this conversation as resolved.
Show resolved Hide resolved
<l:task icon="plugin/credentials/images/24x24/move.png" href="${url}/move" title="${%Move}" permission="${it.domain.parent.DELETE}"/>
<l:task icon="plugin/credentials/images/up.svg" href="../.." title="${%backto(it.domain.displayName)}" contextMenu="false"/>
<l:task icon="plugin/credentials/images/setting.svg" href="${url}/update" title="${%Update}" permission="${it.domain.parent.UPDATE}"/>
<l:task icon="plugin/credentials/images/edit-delete.svg" href="${url}/delete" title="${%Delete}" permission="${it.domain.parent.DELETE}"/>
<l:task icon="plugin/credentials/images/move.svg" href="${url}/move" title="${%Move}" permission="${it.domain.parent.DELETE}"/>
</l:tasks>
</l:side-panel>
</j:jelly>
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<td>
<j:if test="${h.hasPermission(c, it.parent.UPDATE)}">
<a href="credential/${c.urlName}/update">
<img src="${resURL}/images/${iconSize}/setting.png" alt="${%Update}"
<img src="${resURL}/plugin/credentials/images/setting.svg" alt="${%Update}"
tooltip="${%Update}" class="icon${iconSize}"/>
</a>
</j:if>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
<l:side-panel>
<l:tasks>
<j:set var="url" value="${h.getNearestAncestorUrl(request,it)}"/>
<l:task icon="images/24x24/up.png" href="../.." title="${%Back to credential domains}" contextMenu="false"/>
<l:task icon="plugin/credentials/images/24x24/new-credential.png" href="newCredentials" title="${%Add Credentials}" permission="${it.parent.CREATE}" />
<l:task icon="plugin/credentials/images/up.svg" href="../.." title="${%Back to credential domains}" contextMenu="false"/>
<l:task icon="plugin/credentials/images/new-credential.svg" href="newCredentials" title="${%Add Credentials}" permission="${it.parent.CREATE}" />
<j:if test="${!it.global and it.parent.domainsModifiable}">
<l:task icon="images/24x24/setting.png" href="${url}/configure" title="${%Configure}" permission="${it.parent.MANAGE_DOMAINS}"/>
<l:task icon="images/24x24/edit-delete.png" href="${url}/delete" title="${%Delete domain}" permission="${it.parent.MANAGE_DOMAINS}"/>
NotMyFault marked this conversation as resolved.
Show resolved Hide resolved
<l:task icon="plugin/credentials/images/setting.svg" href="${url}/configure" title="${%Configure}" permission="${it.parent.MANAGE_DOMAINS}"/>
<l:task icon="plugin/credentials/images/edit-delete.svg" href="${url}/delete" title="${%Delete domain}" permission="${it.parent.MANAGE_DOMAINS}"/>
</j:if>
</l:tasks>
</l:side-panel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
href="${h.getActionUrl(it.url,action)}"
permission="${action.VIEW}">
<j:if test="${action.domainsModifiable}">
<l:task icon="plugin/credentials/images/24x24/new-domain.png" title="${%Add domain}"
<l:task icon="plugin/credentials/images/new-domain.svg" title="${%Add domain}"
href="newDomain"
permission="${it.MANAGE_DOMAINS}"/>
</j:if>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
href="${h.getActionUrl(storeBaseUrl,action)}"
permission="${action.VIEW}">
<j:if test="${action.domainsModifiable}">
<l:task icon="plugin/credentials/images/24x24/new-domain.png" title="${%Add domain}"
<l:task icon="plugin/credentials/images/new-domain.svg" title="${%Add domain}"
href="newDomain"
permission="${action.MANAGE_DOMAINS}"/>
</j:if>
Expand Down
Binary file removed src/main/webapp/images/16x16/certificate.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/credential.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/credentials.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/domain.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/folder-store.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/move.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/new-credential.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/new-domain.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/system-store.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/user-store.png
Binary file not shown.
Binary file removed src/main/webapp/images/16x16/userpass.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/certificate.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/credential.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/credentials.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/domain.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/folder-store.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/move.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/new-credential.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/new-domain.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/system-store.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/user-store.png
Binary file not shown.
Binary file removed src/main/webapp/images/24x24/userpass.png
Binary file not shown.
Binary file removed src/main/webapp/images/32x32/certificate.png
Binary file not shown.
Binary file removed src/main/webapp/images/32x32/credential.png
Binary file not shown.
Binary file removed src/main/webapp/images/32x32/credentials.png
Binary file not shown.
Binary file removed src/main/webapp/images/32x32/domain.png
Diff not rendered.
Binary file removed src/main/webapp/images/32x32/folder-store.png
Diff not rendered.
Binary file removed src/main/webapp/images/32x32/move.png
Diff not rendered.
Binary file removed src/main/webapp/images/32x32/new-credential.png
Diff not rendered.
Binary file removed src/main/webapp/images/32x32/new-domain.png
Diff not rendered.
Binary file removed src/main/webapp/images/32x32/system-store.png
Diff not rendered.
Binary file removed src/main/webapp/images/32x32/user-store.png
Diff not rendered.
Binary file removed src/main/webapp/images/32x32/userpass.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/certificate.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/credential.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/credentials.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/domain.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/folder-store.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/move.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/new-credential.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/new-domain.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/system-store.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/user-store.png
Diff not rendered.
Binary file removed src/main/webapp/images/48x48/userpass.png
Diff not rendered.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
196 changes: 196 additions & 0 deletions src/main/webapp/images/edit-delete.svg
File renamed without changes.
File renamed without changes
File renamed without changes
Loading