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

Use Notice component for views lacking jobs #9724

Merged
merged 4 commits into from
Sep 15, 2024
Merged

Use Notice component for views lacking jobs #9724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5128f4
Use notice for views lacking jobs
janfaracik Sep 12, 2024
9da5c82
Update _notice.scss
janfaracik Sep 12, 2024
c0ae082
Rename text to title, use 'invokeBody' rather than description field
janfaracik Sep 14, 2024
20f24f7
Merge branch 'master' into new-view-notice
janfaracik Sep 14, 2024
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
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/PluginManager/installed.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ THE SOFTWARE.

<j:choose>
<j:when test="${noPlugins}">
<l:notice icon="symbol-plugins" text="${%No plugins installed}" />
<l:notice icon="symbol-plugins" title="${%No plugins installed}" />
</j:when>
<j:otherwise>
<table id="plugins" class="jenkins-table sortable">
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/PluginManager/updates.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ THE SOFTWARE.
</table>
</j:when>
<j:otherwise>
<l:notice icon="symbol-up-to-date" text="${%No updates available}" />
<l:notice icon="symbol-up-to-date" title="${%No updates available}" />
</j:otherwise>
</j:choose>
<d:invokeBody/>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/logging/LogRecorder/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ THE SOFTWARE.
</l:app-bar>

<j:if test="${noLogs}">
<l:notice text="${%No logs available}" icon="symbol-journal" />
<l:notice title="${%No logs available}" icon="symbol-journal" />
</j:if>

<t:logRecords logRecords="${it.logRecords}"/>
Expand Down
11 changes: 6 additions & 5 deletions core/src/main/resources/hudson/model/View/noJob.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ THE SOFTWARE.
-->

<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%description_1}
<j:if test="${it.hasPermission(it.CONFIGURE)}">
${%description_2}
</j:if>
<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
<l:notice title="${%description_1}" icon="symbol-weather-icon-health-00to19">
<j:if test="${it.hasPermission(it.CONFIGURE)}">
${%description_2}
</j:if>
</l:notice>
</j:jelly>
2 changes: 1 addition & 1 deletion core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ THE SOFTWARE.

<j:choose>
<j:when test="${empty(app.pluginManager.plugins) and empty(app.pluginManager.failedPlugins)}">
<l:notice icon="symbol-plugins" text="${%No plugins installed}" />
<l:notice icon="symbol-plugins" title="${%No plugins installed}" />
</j:when>
<j:otherwise>
<table class="jenkins-table sortable">
Expand Down
11 changes: 7 additions & 4 deletions core/src/main/resources/lib/layout/notice.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ THE SOFTWARE.
-->

<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:d="jelly:define">
<st:documentation>
<st:attribute name="text" use="required">
Sets the text for the notice. HTML isn't supported.
<st:attribute name="title" use="required">
Sets the title for the notice. HTML isn't supported.
</st:attribute>
<st:attribute name="icon" use="required">
Sets the icon for the notice. Supports Jenkins Symbols and regular images.
Expand All @@ -35,6 +35,9 @@ THE SOFTWARE.

<div class="jenkins-notice">
<l:icon src="${attrs.icon}" />
<div>${attrs.text}</div>
<div>${attrs.title}</div>
<div class="jenkins-notice__description">
<d:invokeBody />
</div>
</div>
</j:jelly>
15 changes: 13 additions & 2 deletions war/src/main/scss/components/_notice.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,22 @@
background: var(--button-background);
border-radius: 0.66rem;
font-size: var(--font-size-base);
margin-bottom: 30px;
font-weight: 500;
margin-bottom: var(--section-padding);
font-weight: 450;
padding: calc(var(--section-padding) * 2);
text-align: center;

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

&__description {
color: var(--text-color-secondary);
margin-top: -0.375rem;

&:empty {
display: none;
}
}
}
Loading