Skip to content

Commit acc4a10

Browse files
committed
Update main.jelly
1 parent f09ea88 commit acc4a10

File tree

1 file changed

+26
-15
lines changed
  • src/main/resources/jenkins/branch/BaseView

1 file changed

+26
-15
lines changed
Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
11
<?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+
35
<j:set var="views" value="${it.owner.views}"/>
46
<j:set var="currentView" value="${it}"/>
57
<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>
711
<st:include it="${it}" page="noJob.jelly"/>
812
</j:if>
913

1014
<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>
2435
</j:if>
2536
</j:jelly>

0 commit comments

Comments
 (0)