style: Exchange icon and allow overrides

jenkinsci · Dec 12, 2021 · 6bca63e · 6bca63e
1 parent 797eb56
commit 6bca63e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 96 deletions.
diff --git a/src/main/resources/lib/configfiles/configfiles.jelly b/src/main/resources/lib/configfiles/configfiles.jelly
@@ -45,13 +45,13 @@ THE SOFTWARE.
                     <tr valign="center" style="border-top: thin inset darkgray">
                         <td width="32">
                             <a href="editConfig?id=${t.id}">
-                                <img width="16" height="16" title="${%edit script} ${t.name}"
-                                     src="${imagesURL}/16x16/document_edit.gif"/>
+                                <l:icon title="${%edit script} ${t.name}"
+                                     class="icon-notepad icon-md"/>
                             </a>
                             <j:out value=" "/>
                             <l:confirmationLink href="removeConfig?id=${t.id}" post="true" message="Sure you want to delete [${t.name}]?">
-                                <img width="16" height="16" title="${%remove script} ${t.name}"
-                                     src="${imagesURL}/16x16/edit-delete.gif"/>
+                                <l:icon title="${%remove script} ${t.name}"
+                                     class="icon-edit-delete icon-md"/>
                             </l:confirmationLink>
                         </td>
                         <td>

diff --git a/src/main/resources/lib/configfiles/providerlist.jelly b/src/main/resources/lib/configfiles/providerlist.jelly
@@ -43,13 +43,13 @@ THE SOFTWARE.
                     <tr valign="center" style="border-top: thin inset darkgray">
                         <td width="32">
                             <a href="editConfig?id=${t.id}">
-                                <img width="16" height="16" title="${%edit script} ${t.name}"
-                                     src="${imagesURL}/16x16/document_edit.gif" />
+                                <l:icon title="${%edit script} ${t.name}"
+                                     class="icon-notepad icon-xlg" />
                             </a>
                             <j:out value=" " />
                             <l:confirmationLink href="removeConfig?id=${t.id}" post="true" message="Sure you want to delete [${t.name}]?">
-                                <img width="16" height="16" title="${%remove script} ${t.name}"
-                                     src="${imagesURL}/16x16/edit-delete.gif" />
+                                <l:icon title="${%remove script} ${t.name}"
+                                     class="icon-edit-delete icon-md" />
                             </l:confirmationLink>
                         </td>
                         <td >

diff --git a/src/main/resources/lib/configfiles/sitepanel.jelly b/src/main/resources/lib/configfiles/sitepanel.jelly
@@ -31,9 +31,9 @@ THE SOFTWARE.
     <l:header />
     <l:side-panel>
         <l:tasks>
-            <l:task icon="images/24x24/setting.gif" href="${rootURL}/manage" title="${%Manage Jenkins}" />
-            <l:task icon="images/24x24/next.gif" href="configfiles" title="${%Config Files}" />
-            <l:task icon="images/24x24/new-package.gif" href="selectProvider" title="${%Add a new Config}" />
+            <l:task icon="icon-gear2 icon-md" href="${rootURL}/manage" title="${%Manage Jenkins}" />
+            <l:task icon="icon-next icon-md" href="configfiles" title="${%Config Files}" />
+            <l:task icon="icon-new-package icon-md" href="selectProvider" title="${%Add a new Config}" />
         </l:tasks>
     </l:side-panel>
 </j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/configfiles.jelly b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/configfiles.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
 
     <l:main-panel>
         <h1>
-            <img src="${it.getIconUrl(rootURL)}" alt="" />
+            <img src="${it.getIconUrl(rootURL)}" height="48px" width="48px" alt="" />
             <j:out value=" " />
             ${%Config File Management}
         </h1>

diff --git a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/edit.jelly b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/edit.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 		<l:main-panel>
 			<h1>
-				<img width="48" height="48" src="${imagesURL}/16x16/document_edit.gif" />
+				<l:icon class="icon-notepad icon-xlg" />
 				<img width="16" height="16" src="${imagesURL}/16x16/empty.gif" />
 				${%Edit Configuration File}
 			</h1>
@@ -64,4 +64,4 @@ THE SOFTWARE.
 	      });
 	    </script>
     </j:if>	
-</j:jelly>
+</j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/selectprovider.jelly b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/selectprovider.jelly
@@ -31,7 +31,7 @@ THE SOFTWARE.
 
 		<l:main-panel>
 			<h1>
-				<img width="48" height="48" src="${imagesURL}/16x16/document_edit.gif" />
+				<l:icon class="icon-notepad icon-xlg" />
 				<img width="16" height="16" src="${imagesURL}/16x16/empty.gif" />
 				<j:out value="${%filetype}" />
 			</h1>
@@ -41,4 +41,4 @@ THE SOFTWARE.
 
 		</l:main-panel>
 	</l:layout>
-</j:jelly>
+</j:jelly>
diff --git a/src/main/webapp/images/mvn_s.png b/src/main/webapp/images/mvn_s.png
diff --git a/src/main/webapp/images/mvn_s.svg b/src/main/webapp/images/mvn_s.svg