moving the StartMethod-specific part of the view rendering to the proper place

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@9412 71c3de6d-444a-0410-be80-ed276b4c234a

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

@@ -19,55 +19,7 @@
         ${it.caption}
       </h1>
 
-      <j:choose>
-        <j:when test="${it.jnlpAgent}">
-          <j:choose>
-            <j:when test="${app.slaveAgentPort==-1}">
-              <img src="${imagesURL}/32x32/error.gif"/>
-              <div class="error">
-                TCP port for JNLP slave agents is disabled.
-                <a href="${rootURL}/configure">Go to system config screen and change it</a>.
-              </div>
-            </j:when>
-            <j:when test="${it.offline and !it.temporarilyOffline}">
-              <l:isAdmin>
-                <p>
-                  <a href="slave-agent.jnlp">
-                    <img src="${imagesURL}/webstart.gif" alt="launch agent" />
-                    Launch slave agent
-                  </a>
-
-                  <!--a href="custom-jnlp" style="margin-left:3em">
-                    (tweak launch parameters)
-                  </a-->
-                </p>
-                <p>
-                  (Click the above link from this slave computer to launch the slave agent via JNLP,
-                  or from command-line run <nowrap><tt>javaws ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</tt></nowrap>)
-                </p>
-              </l:isAdmin>
-            </j:when>
-            <j:otherwise>
-              <p>
-                Connected via JNLP agent.
-              </p>
-            </j:otherwise>
-          </j:choose>
-        </j:when>
-        <j:otherwise>
-          <j:if test="${it.offline and !it.temporarilyOffline}">
-            <p class="error">
-              This node is offline because Hudson failed to launch the slave agent on it.
-              <a href="log">See log for more details</a>
-            </p>
-            <l:isAdmin>
-              <form method="get" action="launchSlaveAgent">
-                <f:submit value="Launch slave agent" />
-              </form>
-            </l:isAdmin>
-          </j:if>
-        </j:otherwise>
-      </j:choose>
+      <st:include from="${it.startMethod}" page="main.jelly" optional="true"/>
 
       <j:if test="${it.node.assignedLabels.size() gt 1}">
         <div>

core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly

@@ -65,7 +65,6 @@
                 <s:dropdownList name="slave.startMethodClass" title="${%Start method}"
                                 help="/help/system-config/master-slave/startMethod.html">
                     <j:forEach var="d" items="${h.getSlaveStartMethodDescriptors()}" varStatus="loop">
-                        <j:if test="${d != null}">
                         <s:dropdownListBlock value="${d.class.name}" name="${d.displayName}"
                                              selected="${s.startMethod.descriptor==d}"
                                              title="${d.displayName}">
@@ -82,7 +81,6 @@
                                 </j:if>
                             </s:nested>
                         </s:dropdownListBlock>
-                        </j:if>
                     </j:forEach>
                 </s:dropdownList>
 

core/src/main/resources/hudson/slaves/CommandStartMethod/main.jelly

+<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">
+  <j:if test="${it.offline and !it.temporarilyOffline}">
+    <p class="error">
+      This node is offline because Hudson failed to launch the slave agent on it.
+      <a href="log">See log for more details</a>
+    </p>
+    <l:isAdmin>
+      <form method="get" action="launchSlaveAgent">
+        <f:submit value="Launch slave agent" />
+      </form>
+    </l:isAdmin>
+  </j:if>
+</j:jelly>
\ No newline at end of file

core/src/main/resources/hudson/slaves/JNLPStartMethod/main.jelly

+<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">
+  <j:choose>
+    <j:when test="${app.slaveAgentPort==-1}">
+      <img src="${imagesURL}/32x32/error.gif"/>
+      <div class="error">
+        TCP port for JNLP slave agents is disabled.
+        <a href="${rootURL}/configure">Go to system config screen and change it</a>.
+      </div>
+    </j:when>
+    <j:when test="${it.offline and !it.temporarilyOffline}">
+      <l:isAdmin>
+        <p>
+          <a href="slave-agent.jnlp">
+            <img src="${imagesURL}/webstart.gif" alt="launch agent" />
+            Launch slave agent
+          </a>
+
+          <!--a href="custom-jnlp" style="margin-left:3em">
+            (tweak launch parameters)
+          </a-->
+        </p>
+        <p>
+          (Click the above link from this slave computer to launch the slave agent via JNLP,
+          or from command-line run <nowrap><tt>javaws ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</tt></nowrap>)
+        </p>
+      </l:isAdmin>
+    </j:when>
+    <j:otherwise>
+      <p>
+        Connected via JNLP agent.
+      </p>
+    </j:otherwise>
+  </j:choose>
+</j:jelly>
\ No newline at end of file