use agent-subpage for disconnect, mark offline and update offline pages

Author: mawinter69

core/src/main/java/jenkins/model/details/MonitoringDetails.java

@@ -2,7 +2,7 @@
 
 import hudson.model.Computer;
 
-public class MonitoringDetails extends Detail{
+public class MonitoringDetails extends Detail {
     public MonitoringDetails(Computer computer) {
         super(computer);
     }

core/src/main/resources/hudson/model/Computer/markOffline.jelly

@@ -28,22 +28,20 @@ THE SOFTWARE.
     <st:redirect url="setOfflineCause"/>
   </j:if>
 
-  <l:layout title="${%title(it.displayName)}">
-    <st:include page="sidepanel.jelly" />
-    <l:breadcrumb title="${%Mark offline}" />
-    <l:main-panel>
-      <l:hasPermission permission="${it.DISCONNECT}">
-        <h2>${%title(it.displayName)}</h2>
+  <l:agent-subpage title="${%Mark offline}" agent="${it}">
+    <l:userExperimentalFlag var="newAgentPage" flagClassName="jenkins.model.experimentalflags.NewAgentPageUserExperimentalFlag" />
+
+    <l:app-bar title="${newAgentPage ? '%Take Offline' : '%title(it.displayName)'}"/>
+    <l:hasPermission permission="${it.DISCONNECT}">
+      <p>
+        ${%blurb}
+      </p>
+      <form method="post" action="toggleOffline">
+        <f:textarea name="offlineMessage" />
         <p>
-          ${%blurb}
+          <f:submit value="${%submit}"  />
         </p>
-        <form method="post" action="toggleOffline">
-          <f:textarea name="offlineMessage" />
-          <p>
-            <f:submit value="${%submit}"  />
-          </p>
-        </form>
-      </l:hasPermission>
-    </l:main-panel>
-  </l:layout>
+      </form>
+    </l:hasPermission>
+  </l:agent-subpage>
 </j:jelly>

core/src/main/resources/hudson/model/Computer/markOffline.properties

@@ -1,3 +1,3 @@
 title=Taking {0} Offline
 blurb=You can optionally explain why you are taking this node offline, so that others can see why:
-submit=Mark this node temporarily offline
+submit=Mark temporarily offline

core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly

@@ -24,22 +24,19 @@ 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="${%title(it.displayName)}">
-    <st:include page="sidepanel.jelly" />
-    <l:breadcrumb title="${%Update offline reason}" />
-    <l:main-panel>
-      <l:hasPermission permission="${it.DISCONNECT}">
-        <h2>${%title(it.displayName)}</h2>
+  <l:agent-subpage title="${%Update offline reason}" agent="${it}">
+    <l:hasPermission permission="${it.DISCONNECT}">
+      <l:userExperimentalFlag var="newAgentPage" flagClassName="jenkins.model.experimentalflags.NewAgentPageUserExperimentalFlag" />
+      <l:app-bar title="${newAgentPage ? '%Set Offline Reason' : '%title(it.displayName)'}"/>
+      <p>
+        ${%blurb}
+      </p>
+      <form method="post" action="changeOfflineCause">
+        <f:textarea name="offlineMessage" value="${it.temporaryOfflineCauseReason}"/>
         <p>
-          ${%blurb}
+          <f:submit value="${%submit}"  />
         </p>
-        <form method="post" action="changeOfflineCause">
-          <f:textarea name="offlineMessage" value="${it.temporaryOfflineCauseReason}"/>
-          <p>
-            <f:submit value="${%submit}"  />
-          </p>
-        </form>
-      </l:hasPermission>
-    </l:main-panel>
-  </l:layout>
+      </form>
+    </l:hasPermission>
+  </l:agent-subpage>
 </j:jelly>

core/src/main/resources/hudson/model/Computer/setOfflineCause.properties

@@ -1,3 +1,3 @@
 title=Set {0} Offline Reason
-blurb=You can set or update the reason why this node offline, so that others can see why:
+blurb=You can set or update the reason why this node is offline, so that others can see why:
 submit=Update reason

core/src/main/resources/hudson/slaves/SlaveComputer/disconnect.jelly

@@ -25,16 +25,15 @@ THE SOFTWARE.
 <!-- Disconnect confirmation -->
 <?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="${it.displayName} ${%disconnect}">
-    <st:include page="sidepanel.jelly" />
-    <l:breadcrumb title="${%Disconnect}" />
-    <l:main-panel>
-      <form method="post" action="doDisconnect">
-        ${%disconnect.computer(it.displayName)}
-        <f:submit value="${%Yes}" />
-        <p>${%blurb}</p>
-        <f:textarea name="offlineMessage" />
-      </form>
-    </l:main-panel>
-  </l:layout>
+  <l:agent-subpage title="${%Disconnect}" agent="${it}">
+    <l:userExperimentalFlag var="newAgentPage" flagClassName="jenkins.model.experimentalflags.NewAgentPageUserExperimentalFlag" />
+    <l:app-bar title="${newAgentPage ? '%Disconnect' : '%disconnect.computer(it.displayName)'}"/>
+    <p>${%blurb}</p>
+    <form method="post" action="doDisconnect">
+      <f:textarea name="offlineMessage"/>
+      <p>
+        <f:submit value="${%Disconnect}"/>
+      </p>
+    </form>
+  </l:agent-subpage>
 </j:jelly>