Merge pull request #805 from alecharp/bug/fixes-branches-tab-duplication

New dashboard page UX duplicates branches button

Author: jtnord

src/main/resources/jenkins/branch/BaseView/main.jelly

@@ -1,14 +1,19 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson" xmlns:st="jelly:stapler">
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:st="jelly:stapler">
   <j:set var="views" value="${it.owner.views}"/>
   <j:set var="currentView" value="${it}"/>
+  <l:userExperimentalFlag var="newDashboardPage" flagClassName="jenkins.model.experimentalflags.NewDashboardPageUserExperimentalFlag"/>
   <j:if test="${items.isEmpty()}">
-    <st:include it="${it.owner.viewsTabBar}" page="viewTabs"/>
+    <j:if test="${!newDashboardPage}">
+      <st:include it="${it.owner.viewsTabBar}" page="viewTabs"/>
+    </j:if>
     <st:include it="${it}" page="noJob.jelly"/>
   </j:if>
   <j:if test="${!items.isEmpty()}">
     <t:projectView jobs="${items}" showViewTabs="true" columnExtensions="${it.columns}" indenter="${it.indenter}" itemGroup="${it.owner.itemGroup}">
-      <st:include it="${it.owner.viewsTabBar}" page="viewTabs"/>
+      <j:if test="${!newDashboardPage}">
+        <st:include it="${it.owner.viewsTabBar}" page="viewTabs"/>
+      </j:if>
     </t:projectView>
   </j:if>
 </j:jelly>