Skip to content

Commit

Permalink
Add more icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@janfaracik
janfaracik committed Feb 9, 2022
1 parent 4748b61 commit 40eddca
Show file tree
Hide file tree
Showing 11 changed files with 204 additions and 75 deletions.
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/views/StatusColumn/column.jelly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson" xmlns:l="/lib/layout">
<td class="jenkins-table__cell--tight jenkins-table__icon" data="${job.iconColor.ordinal()}">
<div class="jenkins-table__cell__button-wrapper">
<div class="jenkins-table__cell__button-wrapper" tooltip="${job.iconColor.description}">
<l:icon src="symbol-status-${job.iconColor}" />
</div>
</td>
Expand Down
189 changes: 120 additions & 69 deletions core/src/main/resources/jenkins/model/Jenkins/legend.jelly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,82 +26,133 @@ THE SOFTWARE.
<!-- show the icon legend -->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
<l:layout>
<st:include page="sidepanel.jelly" />
<l:layout title="${%Icon legend}">

<l:app-bar title="${title}" />

<st:include page="sidepanel.jelly"/>

<l:main-panel>
<table cellpadding="5" id="legend-table">
<tr><td>
<l:icon class="icon-nobuilt icon-xlg"/>
<dl class="app-icon-legend">
<dt>
<l:icon src="symbol-status-notbuilt"/>
</dt>
<dd>
${%lightgrey}
</td></tr>
<tr><td>
<l:icon class="icon-nobuilt-anime icon-xlg"/>
${%lightgrey_anime}
</td></tr>

<tr><td>
<l:icon class="icon-disabled icon-xlg"/>
</dd>

<!-- <dt>-->
<!-- <l:icon class="icon-nobuilt-anime icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%lightgrey_anime}-->
<!-- </dd>-->

<dt>
<l:icon src="symbol-status-disabled"/>
</dt>
<dd>
${%grey}
</td></tr>
<tr><td>
<l:icon class="icon-disabled-anime icon-xlg"/>
${%grey_anime}
</td></tr>

<tr><td>
<l:icon class="icon-aborted icon-xlg"/>
</dd>

<!-- <dt>-->
<!-- <l:icon class="icon-disabled-anime icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%grey_anime}-->
<!-- </dd>-->

<dt>
<l:icon src="symbol-status-aborted"/>
</dt>
<dd>
${%darkgrey}
</td></tr>
<tr><td>
<l:icon class="icon-aborted-anime icon-xlg"/>
${%darkgrey_anime}
</td></tr>

<tr><td>
<l:icon class="icon-blue icon-xlg"/>
</dd>

<!-- <dt>-->
<!-- <l:icon class="icon-aborted-anime icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%darkgrey_anime}-->
<!-- </dd>-->

<dt>
<l:icon src="symbol-status-blue"/>
</dt>
<dd>
${%blue}
</td></tr>
<tr><td>
<l:icon class="icon-blue-anime icon-xlg"/>
${%blue_anime}
</td></tr>
<tr><td>
<l:icon class="icon-yellow icon-xlg"/>
</dd>

<!-- <dt>-->
<!-- <l:icon class="icon-blue-anime icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%blue_anime}-->
<!-- </dd>-->

<dt>
<l:icon src="symbol-status-yellow"/>
</dt>
<dd>
${%yellow}
</td></tr>
<tr><td>
<l:icon class="icon-yellow-anime icon-xlg"/>
${%yellow_anime}
</td></tr>
<tr><td>
<l:icon class="icon-red icon-xlg"/>
</dd>

<!-- <dt>-->
<!-- <l:icon class="icon-yellow-anime icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%yellow_anime}-->
<!-- </dd>-->

<dt>
<l:icon src="symbol-status-red"/>
</dt>
<dd>
${%red}
</td></tr>
<tr><td>
<l:icon class="icon-red-anime icon-xlg"/>
${%red_anime}
</td></tr>
<tr><td>
<l:icon class="icon-health-80plus icon-xlg"/>
${%health-81plus}
</td></tr>
<tr><td>
<l:icon class="icon-health-60to79 icon-xlg"/>
${%health-61to80}
</td></tr>
<tr><td>
<l:icon class="icon-health-40to59 icon-xlg"/>
${%health-41to60}
</td></tr>
<tr><td>
<l:icon class="icon-health-20to39 icon-xlg"/>
${%health-21to40}
</td></tr>
<tr><td>
<l:icon class="icon-health-00to19 icon-xlg"/>
${%health-00to20}
</td></tr>
</table>
</dd>

<!-- <dt>-->
<!-- <l:icon class="icon-red-anime icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%red_anime}-->
<!-- </dd>-->

<!-- <dt>-->
<!-- <l:icon class="icon-health-80plus icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%health-81plus}-->
<!-- </dd>-->

<!-- <dt>-->
<!-- <l:icon class="icon-health-60to79 icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%health-61to80}-->
<!-- </dd>-->

<!-- <dt>-->
<!-- <l:icon class="icon-health-40to59 icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%health-41to60}-->
<!-- </dd>-->

<!-- <dt>-->
<!-- <l:icon class="icon-health-20to39 icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%health-21to40}-->
<!-- </dd>-->

<!-- <dt>-->
<!-- <l:icon class="icon-health-00to19 icon-xlg"/>-->
<!-- </dt>-->
<!-- <dd>-->
<!-- ${%health-00to20}-->
<!-- </dd>-->
</dl>
</l:main-panel>
</l:layout>
</j:jelly>
1 change: 1 addition & 0 deletions war/src/main/less/base-styles-v2.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,5 @@ html {
@import './modules/tooltips';

@import './pages/about';
@import './pages/icon-legend';
@import './pages/plugin-manager';
5 changes: 0 additions & 5 deletions war/src/main/less/base/style.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1365,11 +1365,6 @@ td.matrix-cell {
text-align: center;
}

/* ========================= legend.jelly ================== */
table#legend-table td {
vertical-align: middle;
}

/* ========================= select.jelly ================== */
select.select-ajax-pending {
padding-left: 1.5em;
Expand Down
24 changes: 24 additions & 0 deletions war/src/main/less/pages/icon-legend.less
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.app-icon-legend {
display: grid;
grid-template-columns: auto 1fr;
grid-gap: 1rem;
align-items: center;
margin: 0;
padding: 0;

dt {
display: flex;
align-items: center;
justify-items: center;

svg {
width: 3rem;
height: 3rem;
}
}

dd {
margin: 0;
padding: 0;
}
}
10 changes: 10 additions & 0 deletions war/src/main/resources/images/symbols/status-aborted.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions war/src/main/resources/images/symbols/status-blue.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions war/src/main/resources/images/symbols/status-disabled.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions war/src/main/resources/images/symbols/status-notbuilt.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions war/src/main/resources/images/symbols/status-red.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions war/src/main/resources/images/symbols/status-yellow.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 40eddca

Please sign in to comment.