Move app-bar to main panel (#239)

* Move app-bar to main panel * Update pom.xml Co-authored-by: Alexander Brandes <brandes.alexander@web.de> Co-authored-by: Alexander Brandes <mc.cache@web.de>
jenkinsci · Oct 22, 2022 · 6e2785f · 6e2785f
1 parent 4f59508
commit 6e2785f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
 
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <jenkins.version>2.346.1</jenkins.version>
+        <jenkins.version>2.374</jenkins.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
         <maven-hpi-plugin.injectedTestName>InjectedIT</maven-hpi-plugin.injectedTestName>

diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/index.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/index.jelly
@@ -5,8 +5,8 @@
     <link rel="stylesheet" type="text/css" href="${rootURL}/plugin/jobConfigHistory/css/style.css" />
 
     <st:include it="${it.project}" page="sidepanel.jelly" />
-    <l:app-bar title="${%Job Configuration History}"/>
     <l:main-panel>
+      <l:app-bar title="${%Job Configuration History}"/>
       <div>
         <script src="${rootURL}/plugin/jobConfigHistory/deleteRevisionAndTableEntry.js" />
         <j:set var="defaultEntriesPerPage" value="${it.getMaxEntriesPerPage()}" />

diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/index.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/index.jelly
@@ -19,25 +19,24 @@
     <j:set var="filter" value="${request.getParameter('filter')}" />
     <j:set var="filter" value="${filter == null ? 'system' : filter}" />
 
-    <j:choose>
-      <j:when test="${filter == 'all'}">
-        <l:app-bar title="${%All Configuration History}"></l:app-bar>
-      </j:when>
-      <j:when test="${filter == 'jobs'}">
-        <l:app-bar title="${%Job Configuration History}"></l:app-bar>
-      </j:when>
-      <j:when test="${filter == 'created'}">
-        <l:app-bar title="${%Job Creation History}"></l:app-bar>
-      </j:when>
-      <j:when test="${filter == 'deleted'}">
-        <l:app-bar title="${%Job Deletion History}"></l:app-bar>
-      </j:when>
-      <j:otherwise>
-        <l:app-bar title="${%All Configuration History}"></l:app-bar>
-      </j:otherwise>
-    </j:choose>
-
     <l:main-panel>
+      <j:choose>
+        <j:when test="${filter == 'all'}">
+          <l:app-bar title="${%All Configuration History}" />
+        </j:when>
+        <j:when test="${filter == 'jobs'}">
+          <l:app-bar title="${%Job Configuration History}" />
+        </j:when>
+        <j:when test="${filter == 'created'}">
+          <l:app-bar title="${%Job Creation History}" />
+        </j:when>
+        <j:when test="${filter == 'deleted'}">
+          <l:app-bar title="${%Job Deletion History}" />
+        </j:when>
+        <j:otherwise>
+          <l:app-bar title="${%All Configuration History}" />
+        </j:otherwise>
+      </j:choose>
 
       <j:set var="defaultEntriesPerPage" value="${it.getMaxEntriesPerPage()}" />
       <j:set var="pageNum" value="${request.getParameter('pageNum')}" />