|
1 | 1 | <?jelly escape-by-default='true'?> |
2 | | -<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson" xmlns:st="jelly:stapler"> |
| 2 | +<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"> |
| 3 | + <l:userExperimentalFlag var="newDashboardPage" flagClassName="jenkins.model.experimentalflags.NewDashboardPageUserExperimentalFlag" /> |
| 4 | + |
3 | 5 | <j:set var="views" value="${it.owner.views}"/> |
4 | 6 | <j:set var="currentView" value="${it}"/> |
5 | 7 | <j:if test="${items.isEmpty()}"> |
6 | | -<!-- <st:include it="${it.owner.viewsTabBar}" page="viewTabs"/>--> |
| 8 | + <j:if test="${!newDashboardPage}"> |
| 9 | + <st:include it="${it.owner.viewsTabBar}" page="viewTabs"/> |
| 10 | + </j:if> |
7 | 11 | <st:include it="${it}" page="noJob.jelly"/> |
8 | 12 | </j:if> |
9 | 13 |
|
10 | 14 | <j:if test="${!items.isEmpty()}"> |
11 | | - <div class="jenkins-inline-page"> |
12 | | - <div class="jenkins-inline-page__side-panel"> |
13 | | - <j:if test="${h.hasPermission(app.READ)}"> |
14 | | - <j:forEach var="w" items="${it.widgets}"> |
15 | | - <j:set var="view" value="${it}" /> |
16 | | - <st:include it="${w}" page="index.jelly" /> |
17 | | - </j:forEach> |
18 | | - </j:if> |
19 | | - </div> |
20 | | - <t:projectView jobs="${items}" showViewTabs="true" columnExtensions="${it.columns}" indenter="${it.indenter}" itemGroup="${it.owner.itemGroup}"> |
21 | | -<!-- <st:include it="${it.owner.viewsTabBar}" page="viewTabs"/>--> |
22 | | - </t:projectView> |
23 | | - </div> |
| 15 | + <j:choose> |
| 16 | + <j:when test="${newDashboardPage}"> |
| 17 | + <div class="jenkins-inline-page"> |
| 18 | + <div class="jenkins-inline-page__side-panel"> |
| 19 | + <j:if test="${h.hasPermission(app.READ)}"> |
| 20 | + <j:forEach var="w" items="${it.widgets}"> |
| 21 | + <j:set var="view" value="${it}" /> |
| 22 | + <st:include it="${w}" page="index.jelly" /> |
| 23 | + </j:forEach> |
| 24 | + </j:if> |
| 25 | + </div> |
| 26 | + <t:projectView jobs="${items}" showViewTabs="true" columnExtensions="${it.columns}" indenter="${it.indenter}" itemGroup="${it.owner.itemGroup}" /> |
| 27 | + </div> |
| 28 | + </j:when> |
| 29 | + <j:otherwise> |
| 30 | + <t:projectView jobs="${items}" showViewTabs="true" columnExtensions="${it.columns}" indenter="${it.indenter}" itemGroup="${it.owner.itemGroup}"> |
| 31 | + <st:include it="${it.owner.viewsTabBar}" page="viewTabs"/> |
| 32 | + </t:projectView> |
| 33 | + </j:otherwise> |
| 34 | + </j:choose> |
24 | 35 | </j:if> |
25 | 36 | </j:jelly> |
0 commit comments