Skip to content

Commit bda0512

Browse files
authored
Merge branch 'master' into new-header
2 parents 9b3f850 + 9466b9e commit bda0512

File tree

8 files changed

+110
-2
lines changed

8 files changed

+110
-2
lines changed

.github/workflows/crowdin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v4
2020

2121
- name: crowdin action
22-
uses: crowdin/github-action@v2.5.0
22+
uses: crowdin/github-action@v2.7.0
2323
with:
2424
upload_translations: false
2525
download_translations: true

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ THE SOFTWARE.
2929
<parent>
3030
<groupId>org.jenkins-ci.plugins</groupId>
3131
<artifactId>plugin</artifactId>
32-
<version>5.7</version>
32+
<version>5.9</version>
3333
<relativePath />
3434
</parent>
3535

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package io.jenkins.plugins.designlibrary;
2+
3+
import edu.umd.cs.findbugs.annotations.NonNull;
4+
import hudson.Extension;
5+
6+
@Extension
7+
public class EmptyStates extends UISample {
8+
9+
@Override
10+
public @NonNull String getDisplayName() {
11+
return "Empty States";
12+
}
13+
14+
@Override
15+
public String getIconFileName() {
16+
return "symbol-trash-bin-outline plugin-ionicons-api";
17+
}
18+
19+
@Override
20+
public String getDescription() {
21+
return "For when there is no data, no configuration or no plugins installed that support the required feature an empty state can be provided instead.";
22+
}
23+
24+
@Extension
25+
public static final class DescriptorImpl extends UISampleDescriptor {}
26+
}
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<!--
2+
The MIT License
3+
4+
Copyright 2022 Jenkins project contributors
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
THE SOFTWARE.
23+
-->
24+
25+
<?jelly escape-by-default='true'?>
26+
<j:jelly xmlns:j="jelly:core" xmlns:s="/lib/samples" xmlns:f="/lib/form" xmlns:l="/lib/layout">
27+
<s:layout>
28+
<s:section>
29+
<s:group>
30+
<s:preview>
31+
<l:notice title="${%noticeTitle}" icon="symbol-plugins" />
32+
</s:preview>
33+
<s:code file="empty-states.jelly" />
34+
</s:group>
35+
36+
<p class="jdl-paragraph">${%parameters}</p>
37+
<ul class="jdl-list">
38+
<li>title - ${%parameters.title}</li>
39+
<li>icon - ${%parameters.icon}</li>
40+
</ul>
41+
</s:section>
42+
43+
<s:section title="${%childSectionTitle}" description="${%descriptionChildContent}">
44+
<s:group>
45+
<s:preview>
46+
<l:notice title="${%childNoticeTitle}" icon="symbol-weather-icon-health-00to19">
47+
<button
48+
type="button"
49+
class="jenkins-button jenkins-button--secondary">
50+
${%newJobText}
51+
</button>
52+
</l:notice>
53+
</s:preview>
54+
<s:code file="empty-states-child-content.jelly" />
55+
</s:group>
56+
</s:section>
57+
</s:layout>
58+
</j:jelly>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
noticeTitle=No plugins installed
2+
parameters=Supported Parameters:
3+
parameters.title=The message displayed in the notice box
4+
parameters.icon=The icon shown with the message
5+
descriptionChildContent=You can also include child content within the notice as a call to action.
6+
7+
8+
childSectionTitle=Child content inside notices
9+
childNoticeTitle=No jobs created
10+
newJobText=Create your first job

src/main/resources/scss/components/_component-sample.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,10 @@
7171
animation: none;
7272
box-shadow: var(--jdl-box-shadow);
7373
}
74+
75+
.jenkins-notice {
76+
margin-bottom: 0;
77+
width: 100%;
78+
max-width: 650px;
79+
}
7480
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<l:notice title="No jobs created" icon="symbol-weather-icon-health-00to19">
2+
<button
3+
type="button"
4+
class="jenkins-button jenkins-button--secondary">
5+
Create your first job
6+
</button>
7+
</l:notice>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<l:notice title="No plugins installed" icon="symbol-plugins" />

0 commit comments

Comments
 (0)