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

[JENKINS-70169] Add missing breadcrumb items in resources/jenkins #7487

Merged
merged 7 commits into from
Dec 29, 2022
Merged

[JENKINS-70169] Add missing breadcrumb items in resources/jenkins #7487

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6600d66
[JENKINS-70169] Add missing breadcrumb items in resources/jenkins
lemeurherveCB Dec 7, 2022
67ab511
fix: new view
lemeurherve Dec 7, 2022
fbb95c3
Merge branch 'master' into JENKINS-70169-breadcrumb-resources-jenkins
lemeurherve Dec 7, 2022
78132d8
Update core/src/main/resources/jenkins/security/apitoken/LegacyApiTok…
lemeurherve Dec 7, 2022
4e3ab58
Remove "no need for breadcrumb" comment
lemeurherve Dec 8, 2022
4f9cfed
Apply suggestions from code review
lemeurherve Dec 8, 2022
e5258e8
Merge branch 'master' into JENKINS-70169-breadcrumb-resources-jenkins
NotMyFault Dec 27, 2022
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
1 change: 1 addition & 0 deletions core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ THE SOFTWARE.
<l:layout permission="${it.EXTENDED_READ}" title="${it.displayName}">
<j:set var="readOnlyMode" value="${!h.hasPermission(it, it.CONFIGURE)}" />
<st:include page="sidepanel.jelly"/>
<l:breadcrumb title="${%Configure}" />
<l:main-panel>
<f:form method="post" action="configSubmit" name="config">
<j:set var="instance" value="${it.node}" />
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/jenkins/model/Jenkins/_restart.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ 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:i="jelly:fmt">
<l:layout title="${%Restart Jenkins}">
<st:include page="sidepanel.jelly" />
<l:breadcrumb title="${%Restart}" />
<l:main-panel>
<j:choose>
<j:when test="${app.lifecycle.canRestart()}">
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/jenkins/model/Jenkins/_safeRestart.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ 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:i="jelly:fmt">
<l:layout title="Safely Restart Jenkins">
<st:include page="sidepanel.jelly" />
<l:breadcrumb title="${%Safe Restart}" />
<l:main-panel>
<j:choose>
<j:when test="${app.lifecycle.canRestart()}">
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/jenkins/model/Jenkins/configure.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ 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">
<l:layout permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%Configure System}" type="one-column">
<st:include page="sidepanel.jelly" />
<!-- no need for breadcrumb here -->
lemeurherve marked this conversation as resolved.
Show resolved Hide resolved
<f:breadcrumb-config-outline title="${%Configure System}" />

<l:main-panel>
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ 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">
<l:layout title="${%Check File Fingerprint}">
<st:include page="sidepanel.jelly" />
<l:breadcrumb title="${%Check File Fingerprint}" />
<l:main-panel>
<h1>
${%Check File Fingerprint}
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/jenkins/model/Jenkins/legend.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ THE SOFTWARE.
<l:app-bar title="${title}" />

<st:include page="sidepanel.jelly"/>
<l:breadcrumb title="${%Icon legend}" />
lemeurherve marked this conversation as resolved.
Show resolved Hide resolved

<l:main-panel>
<h2>${%Status}</h2>
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/jenkins/model/Jenkins/newView.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ THE SOFTWARE.
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
<l:layout permission="${app.primaryView.CREATE}" title="${%New View}">
<st:include page="sidepanel.jelly" />
<l:breadcrumb title="${%New view}" />
<l:main-panel>
<j:invokeStatic var="views" className="hudson.model.View" method="allInstantiable" />
<n:form title="${%New View}" nameTitle="${%View name}" action="createView" copyTitle="${%Copy Existing View}"
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ 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">
<l:layout>
<st:include page="sidepanel.jelly" />
<l:breadcrumb title="${%Project Relationship Help}" />
lemeurherve marked this conversation as resolved.
Show resolved Hide resolved
<l:main-panel>
<h1>${%Title}</h1>
<p>
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ 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">
<l:layout title="${%Project Relationship}">
<st:include page="sidepanel.jelly" />
<l:breadcrumb title="${%Project Relationship}" />

<l:main-panel>
<l:app-bar title="${%Project Relationship}">
Expand Down
1 change: 1 addition & 0 deletions ...main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ THE SOFTWARE.
<l:layout title="${%title}">
<st:adjunct includes="jenkins.security.apitoken.LegacyApiTokenAdministrativeMonitor.resources"/>
<st:include page="sidepanel.jelly" it="${app}"/>
<l:breadcrumb title="${%Manage}" />
lemeurherve marked this conversation as resolved.
Show resolved Hide resolved
<l:main-panel>
<div class="legacy-token-usage">

Expand Down