From 74b15d47ffdbec12927dd67835735eca80b44332 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 7 Mar 2022 22:52:43 +0100 Subject: [PATCH] Use modern icons in workspace view of a job (#6229) --- .../hudson/model/DirectoryBrowserSupport.java | 8 ++++---- .../main/java/org/jenkins/ui/icon/IconSet.java | 4 ---- .../model/DirectoryBrowserSupport/dir.jelly | 2 +- .../hudson/model/Run/artifacts-index.jelly | 2 +- .../main/resources/lib/hudson/artifactList.jelly | 2 +- war/src/main/webapp/images/16x16/folder-error.gif | Bin 378 -> 0 bytes war/src/main/webapp/images/16x16/folder-error.png | Bin 381 -> 0 bytes war/src/main/webapp/images/16x16/text-error.gif | Bin 252 -> 0 bytes war/src/main/webapp/images/16x16/text-error.png | Bin 290 -> 0 bytes war/src/main/webapp/images/16x16/text.gif | Bin 168 -> 0 bytes war/src/main/webapp/images/16x16/text.png | Bin 227 -> 0 bytes 11 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 war/src/main/webapp/images/16x16/folder-error.gif delete mode 100644 war/src/main/webapp/images/16x16/folder-error.png delete mode 100644 war/src/main/webapp/images/16x16/text-error.gif delete mode 100644 war/src/main/webapp/images/16x16/text-error.png delete mode 100644 war/src/main/webapp/images/16x16/text.gif delete mode 100644 war/src/main/webapp/images/16x16/text.png diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java index c6c595becd..1df1e1ab69 100644 --- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java +++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java @@ -659,16 +659,16 @@ public final class DirectoryBrowserSupport implements HttpResponse { public String getIconName() { if (isReadable) - return isFolder ? "folder.png" : "text.png"; + return isFolder ? "folder.svg" : "document.svg"; else - return isFolder ? "folder-error.png" : "text-error.png"; + return isFolder ? "folder-delete.svg" : "document-delete.svg"; } public String getIconClassName() { if (isReadable) - return isFolder ? "icon-folder" : "icon-text"; + return isFolder ? "icon-folder" : "icon-document"; else - return isFolder ? "icon-folder-error" : "icon-text-error"; + return isFolder ? "icon-folder-delete" : "icon-document-delete"; } public long getSize() { diff --git a/core/src/main/java/org/jenkins/ui/icon/IconSet.java b/core/src/main/java/org/jenkins/ui/icon/IconSet.java index 280f010278..fdc1c1edca 100644 --- a/core/src/main/java/org/jenkins/ui/icon/IconSet.java +++ b/core/src/main/java/org/jenkins/ui/icon/IconSet.java @@ -329,7 +329,6 @@ public class IconSet { icons.addIcon(new Icon("icon-edit-delete icon-sm", "16x16/edit-delete.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-edit-select-all icon-sm", "16x16/edit-select-all.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-empty icon-sm", "16x16/empty.gif", Icon.ICON_SMALL_STYLE)); - icons.addIcon(new Icon("icon-folder-error icon-sm", "16x16/folder-error.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-folder-open icon-sm", "16x16/folder-open.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-green icon-sm", "16x16/green.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-green-anime icon-sm", "16x16/green_anime.gif", Icon.ICON_SMALL_STYLE)); @@ -344,8 +343,6 @@ public class IconSet { icons.addIcon(new BuildStatusIcon("icon-nobuilt-anime icon-sm", "build-status/build-status-sprite.svg#never-built", Icon.ICON_SMALL_STYLE, true)); icons.addIcon(new BuildStatusIcon("icon-red icon-sm", "build-status/build-status-sprite.svg#last-failed", Icon.ICON_SMALL_STYLE)); icons.addIcon(new BuildStatusIcon("icon-red-anime icon-sm", "build-status/build-status-sprite.svg#last-failed", Icon.ICON_SMALL_STYLE, true)); - icons.addIcon(new Icon("icon-text-error icon-sm", "16x16/text-error.gif", Icon.ICON_SMALL_STYLE)); - icons.addIcon(new Icon("icon-text icon-sm", "16x16/text.gif", Icon.ICON_SMALL_STYLE)); icons.addIcon(new BuildStatusIcon("icon-yellow icon-sm", "build-status/build-status-sprite.svg#last-unstable", Icon.ICON_SMALL_STYLE)); icons.addIcon(new BuildStatusIcon("icon-yellow-anime icon-sm", "build-status/build-status-sprite.svg#last-unstable", Icon.ICON_SMALL_STYLE, true)); icons.addIcon(new Icon("icon-collapse icon-sm", "16x16/collapse.png", Icon.ICON_SMALL_STYLE)); @@ -355,7 +352,6 @@ public class IconSet { icons.addIcon(new Icon("icon-edit-select-all icon-sm", "16x16/edit-select-all.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-empty icon-sm", "16x16/empty.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-expand icon-sm", "16x16/expand.png", Icon.ICON_SMALL_STYLE)); - icons.addIcon(new Icon("icon-folder-error icon-sm", "16x16/folder-error.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-folder-open icon-sm", "16x16/folder-open.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new Icon("icon-go-next icon-sm", "16x16/go-next.png", Icon.ICON_SMALL_STYLE)); icons.addIcon(new BuildStatusIcon("icon-grey icon-sm", "build-status/build-status-sprite.svg#never-built", Icon.ICON_SMALL_STYLE)); diff --git a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly index 6ab362f305..d0afa4d630 100644 --- a/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly +++ b/core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly @@ -39,7 +39,7 @@ THE SOFTWARE. / - + diff --git a/core/src/main/resources/hudson/model/Run/artifacts-index.jelly b/core/src/main/resources/hudson/model/Run/artifacts-index.jelly index 67a057e8ea..4a5f41c21b 100644 --- a/core/src/main/resources/hudson/model/Run/artifacts-index.jelly +++ b/core/src/main/resources/hudson/model/Run/artifacts-index.jelly @@ -33,7 +33,7 @@ THE SOFTWARE. - + ${f.displayPath} diff --git a/core/src/main/resources/lib/hudson/artifactList.jelly b/core/src/main/resources/lib/hudson/artifactList.jelly index 59bb5d4a90..d4909b1731 100644 --- a/core/src/main/resources/lib/hudson/artifactList.jelly +++ b/core/src/main/resources/lib/hudson/artifactList.jelly @@ -55,7 +55,7 @@ THE SOFTWARE. - + ${f.displayPath} diff --git a/war/src/main/webapp/images/16x16/folder-error.gif b/war/src/main/webapp/images/16x16/folder-error.gif deleted file mode 100644 index 2ff8d9cf96613d43f8bc45de65413fa08f1fd9d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 378 zcmZ?wbhEHb6krfw_-e|qjGcW87uRJ@j;q|<*Liua@$ui}=f5c=bXQp9wutaO5s~|1 zVh_Z{9!g1V($KgmFCQ8neA~ptBy~xAV(dN-56kpL$*GCynW?$?*%4*46RT#O%*aS; zUY*;%EOX}Byt(J5O`lpY@7(+a^Oh}JwqnJKj&;{M*I(~ie|^>Jl|378%-(%>|Neak z4(vaClt}@IM~_w8K;Wssn)AA za(gqc)RELuRFs!zp>ny+5B8a{)2)dAvYKq_!vDM8LRVS1W0Wu#(* ztH#*tzS8Kf$K#B#*k55?$!KV_3JT#G8s8Qc-4hhs6cgYV7TFRK*&iP{XQGI%){3v! z|NsBh3kz6wo144caGuU?ozC7A6xk0C*9{EQ2?&X=*J+u})(#JCho;*!G`>hkrUwVI zC@6~h$L9b500neXPE-H?|Nj8{whmJO004zaL_t(|0aVPzfdWtzL(!Y>;{p^y|IJVW z?i!r4dKw`BA%RH=leEPWNnnbggw$5?CtI5 z@9*#b|Nj6000000A^8La0015UEC2ui01yBW000GfU^R_oIbvNmrEJTtYNusdZF5{4 zXI5`ry-NRHx`Hlx{1UE z8VtnY@CY>5fB_3F1Aa1f903Xl1_T2FhAth71_h4{0Td=A0S}K55t1$e01jv!ApkoA CAzY&X diff --git a/war/src/main/webapp/images/16x16/text-error.png b/war/src/main/webapp/images/16x16/text-error.png deleted file mode 100644 index e1c0cbe263993945beac842796b41038f989a668..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y$ZW{!3>{3aOXk;C7{T4PZ!6K z3dWwkt&E2aL|pE+&aAXu|8Q=|PTuW_Y0pv^pP%75ukrFhu+C{CISC#%dqytqbIcQ7 z^7J2nT(;ZRXAi3mPk_0}mfN{ck6%mBXgs%)F}*F}_-Lb<#51l=TrIGHs9oCrgIa{W=ga< z-6+Y5SbDjpM#rqLW#K#aKdTP*WHeNX^mbR@~N#!d6gj04T03{_nw4EwE49tL`m!PC{xWt~$(698(&cD?`r diff --git a/war/src/main/webapp/images/16x16/text.gif b/war/src/main/webapp/images/16x16/text.gif deleted file mode 100644 index df68a9d5a73ffff32ed927dd32a34efe24506ad3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmZ?wbhEHb6krfw_{_u5*x0yb%a&ccb{#o#uUh%)ZC4_9!xhHtssw$|k0^j+T7_ZBpy N@(JvDKaYdK8UO<{M0EfF diff --git a/war/src/main/webapp/images/16x16/text.png b/war/src/main/webapp/images/16x16/text.png deleted file mode 100644 index a82aaac503273a16aafa78f4b79232fd6b76c3cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`t2|vCLn;`PW>^+Kn|17%8^hD& z#3KegM=$u@Z0&8HBK?>_G4{rr-Qrv3{b_f5x4rbNyp*^~hrM z!?dM3JI?SdnWF9LxJFX(`5mvIhJsa~K(>b%^{T5X~S2K9J`njxgN@xNAWW!fd