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 #479

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<!-- TODO: Waiting for JENKINS-73824 and JENKINS-73835 to make it into an LTS line -->
<jenkins.version>2.481</jenkins.version>
<!-- <jenkins.version>2.481</jenkins.version> -->
<jenkins.version>2.481-rc35491.56cb_9df6e9cd</jenkins.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be in draft so long as this is using an incremental version.

<no-test-jar>false</no-test-jar>
<useBeta>true</useBeta>
<hpi.compatibleSinceVersion>2.26</hpi.compatibleSinceVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,23 @@
-->

<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project">
<p:config-quietPeriod/>

<!-- pseudo-trigger to configure URL to trigger builds remotely. -->
<st:include page="/hudson/model/BuildAuthorizationToken/config.jelly" />

<f:section title="${%Advanced Project Options}" icon="symbol-build-outline plugin-ionicons-api">
<f:section title="${%Pipeline}" icon="symbol-pipeline plugin-workflow-job">
<div class="jenkins-section__description">
${%pipeline.description}
</div>
<f:dropdownDescriptorSelector title="${%Definition}" field="definition" descriptors="${descriptor.getDefinitionDescriptors(it)}"/>
</f:section>

<f:section title="${%Advanced}" icon="symbol-build-outline plugin-ionicons-api">
<f:advanced>
<p:config-quietPeriod/>

<f:entry title="${%Display Name}" field="displayNameOrNull">
<f:textbox />
</f:entry>
</f:advanced>
</f:section>

<f:section title="${%Pipeline}" icon="symbol-pipeline plugin-workflow-job">
<f:dropdownDescriptorSelector title="${%Definition}" field="definition" descriptors="${descriptor.getDefinitionDescriptors(it)}"/>
</f:section>
</j:jelly>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pipeline.description=Define your Pipeline using Groovy directly or pull it from source control. Check the <a target="_blank" href="./pipeline-syntax">Pipeline Syntax</a> page for guidance on writing pipelines.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit pedantic, but the pipeline-syntax link is actually defined in workflow-cps and specific to those FlowDefinition implementations. Can this blurb be kept in workflow-cps, and just shifted up in the config.jelly? Or can this aspect of the redesign be split out for separate consideration so we can go ahead with the rest, which certainly seems welcome?

Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ THE SOFTWARE.
<j:arg value="${it}" type="hudson.model.Item" />
</j:invokeStatic>
<f:descriptorList field="triggers"
title="${%Build Triggers}"
title="${%Triggers}"
description="${%description}"
descriptors="${triggers}"
icon="symbol-trigger"
instances="${it.triggers}">
<d:invokeBody />
</f:descriptorList>
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.

This file was deleted.