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.

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

Refine content and appearance of the project 'Configure' screen #9734

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
25e3247
Init
janfaracik Aug 3, 2024
00fcdb9
Update core/src/main/resources/jenkins/console/Messages.properties
janfaracik Aug 3, 2024
e9c7735
Move getDescription, update Javadoc
janfaracik Aug 13, 2024
8fb3b92
Merge branch 'master' into improve-user-settings
janfaracik Aug 13, 2024
676996e
Merge branch 'master' into improve-user-settings
janfaracik Aug 14, 2024
8a11ed5
Merge branch 'master' into improve-user-settings
janfaracik Aug 14, 2024
4e7e208
Merge branch 'master' into improve-user-settings
janfaracik Aug 15, 2024
f3126d1
Update config-builders.jelly
janfaracik Aug 19, 2024
ae49cc0
Merge branch 'improve-user-settings' into improve-project-settings
janfaracik Aug 19, 2024
b1c83f4
Push
janfaracik Aug 19, 2024
d4cead3
Push
janfaracik Aug 19, 2024
d66d73b
Merge branch 'master' into improve-project-settings
janfaracik Aug 26, 2024
16a9ee0
Merge branch 'master' into improve-project-settings
janfaracik Sep 4, 2024
375ddd0
Merge branch 'master' into improve-project-settings
janfaracik Sep 12, 2024
64f7463
Merge branch 'master' into improve-project-settings
janfaracik Sep 16, 2024
dba3d2c
Update _section.scss
janfaracik Sep 16, 2024
5a84f3d
Update AbstractProject.java
janfaracik Sep 16, 2024
0e78870
Update Functions.java
janfaracik Sep 16, 2024
ff8602c
Add resources
janfaracik Sep 16, 2024
57a3edf
Move prop
janfaracik Sep 16, 2024
9334be5
Move props
janfaracik Sep 16, 2024
439ddec
Add periods to descriptions
janfaracik Sep 16, 2024
6406b9b
Merge branch 'master' into improve-project-settings
janfaracik Sep 17, 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
5 changes: 4 additions & 1 deletion core/src/main/resources/lib/form/descriptorList.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ THE SOFTWARE.
Sets the icon on the sidebar item for the section anchor link
The icon isn't visible in the section itself
</st:attribute>
<st:attribute name="description" since="TODO">
Optional attribute to set a description for the section
</st:attribute>
<st:attribute name="descriptors" use="required">
hudson.model.Descriptor collection whose configuration page is rendered.
</st:attribute>
Expand Down Expand Up @@ -72,7 +75,7 @@ THE SOFTWARE.
<j:set var="instances" value="${attrs.instances ?: instance[field] ?: descriptor['default'+h.capitalize(field)]}"/>

<j:if test="${!empty(descriptors) or context['org.apache.commons.jelly.body']!=null}">
<f:section title="${attrs.title}" name="${attrs.field?:attrs.name}" icon="${attrs.icon}">
<f:section title="${attrs.title}" name="${attrs.field?:attrs.name}" icon="${attrs.icon}" description="${attrs.description}">
<j:if test="${attrs.field!=null}">
<div class="stapler-class-bag tr">
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ THE SOFTWARE.
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
<j:set var="wrappers" value="${h.getBuildWrapperDescriptors(it)}" />
<j:if test="${!empty(wrappers)}">
<f:descriptorList title="${%Build Environment}"
<f:descriptorList title="${%Environment}"
description="${%description}"
descriptors="${wrappers}"
instances="${it.buildWrappers}"
icon="symbol-environment" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
description=Configure settings and variables that define the context in which your build runs, like credentials, paths, and global parameters.
14 changes: 7 additions & 7 deletions core/src/main/resources/lib/hudson/project/config-builders.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ THE SOFTWARE.
-->
<?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:f="/lib/form" xmlns:p="/lib/hudson/project">
<f:section title="${%Build Steps}" icon="symbol-build-steps">
<f:block>
<f:hetero-list name="builder" hasHeader="true"
descriptors="${h.getBuilderDescriptors(it)}"
items="${it.builders}"
addCaption="${%Add build step}"/>
</f:block>
<f:section title="${%Build Steps}"
description="${%description}"
icon="symbol-build-steps">
<f:hetero-list name="builder" hasHeader="true"
descriptors="${h.getBuilderDescriptors(it)}"
items="${it.builders}"
addCaption="${%Add build step}"/>
</f:section>
</j:jelly>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
description=Automate your build process with ordered tasks like code compilation, testing, and deployment.
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
<f:section title="${%Post-build Actions}" icon="symbol-post-build">
<f:block>
<f:hetero-list name="publisher" hasHeader="true"
descriptors="${h.getPublisherDescriptors(it)}"
items="${it.publishersList}"
oneEach="true"
menuAlign="bl-tl"
honorOrder="true"
addCaption="${%Add post-build action}"/>
</f:block>
<f:section title="${%Post-build Actions}" icon="symbol-post-build"
description="${%description}">
<f:hetero-list name="publisher" hasHeader="true"
descriptors="${h.getPublisherDescriptors(it)}"
items="${it.publishersList}"
oneEach="true"
menuAlign="bl-tl"
honorOrder="true"
addCaption="${%Add post-build action}"/>
</f:section>
</j:jelly>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
description=Define what happens after a build completes, like sending notifications, archiving artifacts, or triggering other jobs.
4 changes: 3 additions & 1 deletion core/src/main/resources/lib/hudson/project/config-scm.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ THE SOFTWARE.
<!-- SCM config pane -->
<?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:f="/lib/form">
<f:section title="${%Source Code Management}" icon="symbol-source-code-management">
<f:section title="${%Source Code Management}"
description="${%description}"
icon="symbol-source-code-management">
<!-- Could use f:descriptorRadioList were it not for scm/scmd compatibility code; pending JENKINS-20959 would not help with performance -->
<j:forEach var="descriptor" items="${h.getSCMDescriptors(instance)}" varStatus="loop">
<j:set var="scmd" value="${descriptor}" /><!-- backward compatibility with <1.238 -->
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
description=Connect and manage your code repository to automatically pull the latest code for your builds.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ THE SOFTWARE.
<j:invokeStatic var="triggers" className="hudson.triggers.Trigger" method="for_">
<j:arg value="${it}" type="hudson.model.Item" />
</j:invokeStatic>
<f:descriptorList title="${%Build Triggers}"
<f:descriptorList title="${%Triggers}"
description="${%description}"
descriptors="${triggers}"
instances="${it.triggers}"
icon="symbol-trigger">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
description=Set up automated actions that start your build based on specific events, like code changes or scheduled times.
2 changes: 1 addition & 1 deletion war/src/main/js/section-to-sidebar-items.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createElementFromHtml, toId } from "./util/dom";

const HEADER_SELECTOR =
".config-table .jenkins-app-bar h2, .config-table > .jenkins-section > .jenkins-section__title";
".config-table .jenkins-app-bar h2, .config-table > .jenkins-section > .jenkins-section__title, .config-table > section > .jenkins-section > .jenkins-section__title";
const DEFAULT_ICON = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M262.29 192.31a64 64 0 1057.4 57.4 64.13 64.13 0 00-57.4-57.4zM416.39 256a154.34 154.34 0 01-1.53 20.79l45.21 35.46a10.81 10.81 0 012.45 13.75l-42.77 74a10.81 10.81 0 01-13.14 4.59l-44.9-18.08a16.11 16.11 0 00-15.17 1.75A164.48 164.48 0 01325 400.8a15.94 15.94 0 00-8.82 12.14l-6.73 47.89a11.08 11.08 0 01-10.68 9.17h-85.54a11.11 11.11 0 01-10.69-8.87l-6.72-47.82a16.07 16.07 0 00-9-12.22 155.3 155.3 0 01-21.46-12.57 16 16 0 00-15.11-1.71l-44.89 18.07a10.81 10.81 0 01-13.14-4.58l-42.77-74a10.8 10.8 0 012.45-13.75l38.21-30a16.05 16.05 0 006-14.08c-.36-4.17-.58-8.33-.58-12.5s.21-8.27.58-12.35a16 16 0 00-6.07-13.94l-38.19-30A10.81 10.81 0 0149.48 186l42.77-74a10.81 10.81 0 0113.14-4.59l44.9 18.08a16.11 16.11 0 0015.17-1.75A164.48 164.48 0 01187 111.2a15.94 15.94 0 008.82-12.14l6.73-47.89A11.08 11.08 0 01213.23 42h85.54a11.11 11.11 0 0110.69 8.87l6.72 47.82a16.07 16.07 0 009 12.22 155.3 155.3 0 0121.46 12.57 16 16 0 0015.11 1.71l44.89-18.07a10.81 10.81 0 0113.14 4.58l42.77 74a10.8 10.8 0 01-2.45 13.75l-38.21 30a16.05 16.05 0 00-6.05 14.08c.33 4.14.55 8.3.55 12.47z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>`;

window.addEventListener("load", function () {
Expand Down
2 changes: 1 addition & 1 deletion war/src/main/scss/components/_section.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

.jenkins-section__description {
// Tweaked margin so that it appears visually centred when placed next to `.jenkins-section__title`
daniel-beck marked this conversation as resolved.
Show resolved Hide resolved
margin: -0.5rem 0 1rem;
margin: -0.8125rem 0 1rem;
color: var(--text-color-secondary);
line-height: 1.66;
}
Expand Down
Loading