Push

core/src/main/java/hudson/model/ManageJenkinsAction.java

@@ -48,7 +48,10 @@
 public class ManageJenkinsAction implements RootAction, StaplerFallback, ModelObjectWithContextMenu {
     @Override
     public String getIconFileName() {
-        return null;
+        if (Jenkins.get().hasAnyPermission(Jenkins.MANAGE, Jenkins.SYSTEM_READ))
+            return "symbol-settings";
+        else
+            return null;
     }
 
     @Override

core/src/main/java/jenkins/model/Jenkins.java

@@ -114,6 +114,7 @@
 import hudson.model.ListView;
 import hudson.model.LoadBalancer;
 import hudson.model.LoadStatistics;
+import hudson.model.ManageJenkinsAction;
 import hudson.model.ManagementLink;
 import hudson.model.Messages;
 import hudson.model.ModifiableViewGroup;
@@ -4509,6 +4510,12 @@ public void doException() {
     @Override
     public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws IOException, JellyException {
         ContextMenu menu = new ContextMenu().from(this, request, response);
+        for (MenuItem i : menu.items) {
+            if (i.url.equals(request.getContextPath() + "/manage")) {
+                // add "Manage Jenkins" subitems
+                i.subMenu = new ContextMenu().from(ExtensionList.lookupSingleton(ManageJenkinsAction.class), request, response, "index");
+            }
+        }
         return menu;
     }
 

core/src/main/resources/hudson/model/ManageJenkinsAction/index.jelly

@@ -27,7 +27,12 @@ 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 Jenkins}" permissions="${app.MANAGE_AND_SYSTEM_READ}" type="one-column">
+  <l:layout title="${%Manage Jenkins}" permissions="${app.MANAGE_AND_SYSTEM_READ}">
+    <j:if test="${taskTags==null}">
+      <st:include page="sidepanel.jelly" it="${app}" />
+      <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
+    </j:if>
+
     <l:main-panel>
       <l:app-bar title="${%Manage Jenkins}">
         <l:search-bar placeholder="${%Search settings}" id="settings-search-bar" />

core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly

@@ -24,7 +24,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" xmlns:i="jelly:fmt">
-  <l:layout title="${%People} - ${it.parent.viewName}" type="one-column">
+  <l:layout title="${%People} - ${it.parent.viewName}">
+    <st:include page="sidepanel.jelly" it="${it.parent}" />
     <l:breadcrumb title="${%People}" />
     <t:setIconSize/>
     <l:main-panel>

core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/footer.jelly

@@ -0,0 +1,71 @@
+<!--
+The MIT License
+
+Copyright (c) 2016, Daniel Beck, Keith Zantow, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+    <j:set var="activeMonitors" value="${it.getMonitorsToDisplay()}"/>
+
+    <j:if test="${activeMonitors != null and activeMonitors.size() > 0}">
+        <st:adjunct includes="jenkins.management.AdministrativeMonitorsDecorator.resources"/>
+
+        <j:set var="activeNonSecurityAM" value="${it.filterNonSecurityAdministrativeMonitors(activeMonitors)}" />
+        <j:set var="activeNonSecurityAMCount" value="${activeNonSecurityAM.size()}" />
+        <j:set var="activeSecurityAM" value="${it.filterSecurityAdministrativeMonitors(activeMonitors)}" />
+        <j:set var="activeSecurityAMCount" value="${activeSecurityAM.size()}" />
+
+        <div id="visible-am-container" class="am-container">
+            <j:if test="${activeNonSecurityAMCount > 0}">
+                <a id="visible-am-button"
+                   class="am-button"
+                   href="#"
+                   data-href="${rootURL}/administrativeMonitorsApi/nonSecurityPopupContent"
+                   title="${%tooltip(activeNonSecurityAMCount)}">
+                    <l:icon src="symbol-notifications" class="icon-md"/>
+                    <div class="am-monitor__indicator-mobile"/>
+                    <span class="am-monitor__count">
+                        ${activeNonSecurityAMCount}
+                    </span>
+                </a>
+                <div id="visible-am-list" class="am-list">
+                </div>
+            </j:if>
+        </div>
+        <div id="visible-sec-am-container" class="am-container">
+            <j:if test="${activeSecurityAMCount > 0}">
+                <a id="visible-sec-am-button"
+                   class="am-button security-am"
+                   href="#"
+                   data-href="${rootURL}/administrativeMonitorsApi/securityPopupContent"
+                   title="${%tooltipSec(activeSecurityAMCount)}">
+                    <l:icon src="symbol-shield-warning" class="icon-md"/>
+                    <div class="am-monitor__indicator-mobile"/>
+                    <span class="am-monitor__count">
+                        ${activeSecurityAMCount}
+                    </span>
+                </a>
+                <div id="visible-sec-am-list" class="am-list">
+                </div>
+            </j:if>
+        </div>
+    </j:if>
+</j:jelly>

core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/footer.properties

@@ -0,0 +1,2 @@
+tooltip=There are {0} active administrative monitors.
+tooltipSec=There are {0} active security administrative monitors.

core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/footer_bg.properties

@@ -0,0 +1,27 @@
+# The MIT License
+#
+# Bulgarian translation: Copyright (c) 2017, Alexander Shopov <ash@kambanaria.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# There are {0} active administrative monitors.
+tooltip=\
+ В момента има {0} предупреждения.
+Manage\ Jenkins=\
+ Управление на Jenkins

core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/footer_de.properties

@@ -0,0 +1,24 @@
+# The MIT License
+#
+# Copyright (c) 2017 Daniel Beck and a number of other of contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Manage\ Jenkins=Jenkins verwalten
+tooltip={0,choice,0#Keine Administrator-Warnungen sind|1#{0} Administrator-Warnung ist|1<{0} Administrator-Warnungen sind} aktiv.

core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/footer_it.properties

@@ -0,0 +1,25 @@
+# The MIT License
+#
+# Italian localization plugin for Jenkins
+# Copyright © 2020 Alessandro Menti
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Manage\ Jenkins=Gestisci Jenkins
+tooltip=Ci sono {0} monitor amministrativi attivi.

core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/footer_pl.properties

@@ -0,0 +1,24 @@
+# The MIT License
+#
+# Copyright (c) 2016-2017, Damian Szczepanik
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+# There are {0} active administrative monitors.
+tooltip=Znaleziono {0} aktywnych powiadomień dla administratorów
+Manage\ Jenkins=Zarządzaj Jenkinsem

core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/footer_pt_BR.properties

@@ -0,0 +1,24 @@
+# The MIT License
+#
+# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+tooltip=Existem {0} monitores administrativos ativos.
+tooltipSec=Existem {0} monitores administrativos de segurança ativos.

core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/footer_tr.properties

@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2021, Mustafa Ulu
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Manage\ Jenkins=Jenkins''i Yönet
+tooltip={0} adet aktif yönetimsel gösterge var.
+tooltipSec={0} adet aktif yönetimsel güvenlik göstergesi var.

core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/footer_zh_TW.properties

@@ -0,0 +1,2 @@
+tooltip=有 {0} 個啟用中的管理監視器。
+tooltipSec=有 {0} 個啟用中的安全性管理監視器。