Merge branch 'new-manage-jenkins-layout-2' into new-header-test

janfaracik · Jan 18, 2025 · 193b9e2 · 193b9e2
2 parents 5fe08a0 + 4e30765
commit 193b9e2
Show file tree

Hide file tree

Showing 49 changed files with 96 additions and 732 deletions.
diff --git a/core/src/main/resources/hudson/AboutJenkins/index.jelly b/core/src/main/resources/hudson/AboutJenkins/index.jelly
@@ -24,8 +24,10 @@ THE SOFTWARE.
 
 <!-- About Jenkins page -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
-  <l:layout type="one-column" permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%about(app.VERSION)}">
+<j:jelly xmlns:st="jelly:stapler" xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
+  <l:layout permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%about(app.VERSION)}">
+    <st:include page="sidepanel.jelly" class="hudson.model.ManagementLink" />
+
     <l:header>
       <script src="${resURL}/jsbundles/section-to-tabs.js" type="text/javascript" defer="true" />
     </l:header>

diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage.jelly b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage.jelly
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <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="${%Manage Old Data}">
-  <st:include page="sidepanel.jelly" it="${app}"/>
+  <st:include page="sidepanel.jelly" class="hudson.model.ManagementLink" />
   <!-- no need for additional breadcrumb here as we're on an "index" page already including breadcrumb -->
   <l:main-panel>
     <h1>${%Manage Old Data}</h1>

diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly
@@ -27,7 +27,8 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <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="${%Log Recorders}" type="one-column">
+<l:layout title="${%Log Recorders}">
+  <st:include page="sidepanel.jelly" class="hudson.model.ManagementLink" />
   <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
   <l:main-panel xmlns:local="local">
     <l:app-bar title="${%Log Recorders}">

diff --git a/core/src/main/resources/hudson/model/ComputerSet/index.jelly b/core/src/main/resources/hudson/model/ComputerSet/index.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
 <l:layout title="${%Nodes}">
-  <st:include page="sidepanel.jelly" />
+  <st:include page="sidepanel.jelly" class="hudson.model.ManagementLink" />
   <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
   <l:main-panel>
     <l:app-bar title="${%Nodes}">

diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_bg.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_bg.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_ca.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_ca.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_cs.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_cs.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_da.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_da.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_de.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_de.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_el.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_el.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_es.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_es.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_fi.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_fi.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_fr.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_fr.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_he.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_he.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_hu.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_hu.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_it.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_it.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_ja.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_ja.properties
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel_ko.properties b/core/src/main/resources/hudson/model/ComputerSet/sidepanel_ko.properties