Possibly clearer presentation of options, and showing how to run a headless slave.

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

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

@@ -33,18 +33,37 @@ THE SOFTWARE.
     <j:when test="${it.offline and !it.temporarilyOffline}">
       <l:isAdmin><!-- TODO: we need a permission to launch a slave -->
         <p>
-          <a href="slave-agent.jnlp" id="jnlp-link">
-            <img src="${imagesURL}/webstart.gif" alt="${%launch agent}" />
-            ${%Launch slave agent}
-          </a>
-
-          <!--a href="custom-jnlp" style="margin-left:3em">
-            (tweak launch parameters)
-          </a-->
+          ${%Connect slave to Hudson one of these ways:}
         </p>
+        <ol>
+          <li>
+            <p>
+              <a href="slave-agent.jnlp" id="jnlp-link">
+                <img src="${imagesURL}/webstart.gif" alt="${%launch agent}" />
+              </a>
+              ${%Launch agent from browser on slave}
+            </p>
+          </li>
+          <li>
+            <p>
+              ${%Run from slave command line:}
+            </p>
+            <pre>javaws ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
+          </li>
+          <li>
+            <p>
+              ${%Or if the slave is headless:}
+            </p>
+            <pre>java -jar <a href="${rootURL}/jnlpJars/slave.jar">slave.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}slave-agent.jnlp</pre>
+          </li>
+        </ol>
+        <!--
         <p>
-          ${%click.above_link(h.inferHudsonURL(request), it.url)}
+          <a href="custom-jnlp" style="margin-left:3em">
+            (tweak launch parameters)
+          </a>
         </p>
+        -->
       </l:isAdmin>
     </j:when>
     <j:otherwise>

core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties

@@ -22,6 +22,3 @@
 
 slaveAgentPort.disabled=TCP port for JNLP slave agents is disabled.
 configure.link.text=Go to system config screen and change it
-click.above_link=\
-  (Click the above link from this slave computer to launch the slave agent via JNLP,\
-  or from command-line run <nowrap><tt>javaws {0}{1}slave-agent.jnlp</tt></nowrap>)
\ No newline at end of file

core/src/main/resources/hudson/slaves/JNLPLauncher/main_de.properties

@@ -20,10 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-slaveAgentPort.disabled=TCP-Port für JNLP-Slaves ist deaktiviert.
+slaveAgentPort.disabled=TCP-Port f\u00FCr JNLP-Slaves ist deaktiviert.
 configure.link.text=Zu Systemkonfiguration wechseln und konfigurieren
-click.above_link=\
-  (Klicken Sie auf den obenstehenden Verweis, um auf dem Rechner, auf dem dieser \
-  Webbrowser läuft, einen Slave-Agenten via JNLP zu starten oder führen Sie in \
-  der Kommandozeile den Befehl \
-  <nowrap><tt>javaws {0}{1}slave-agent.jnlp</tt></nowrap> aus.)
\ No newline at end of file

core/src/main/resources/hudson/slaves/JNLPLauncher/main_fr.properties

@@ -20,11 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-slaveAgentPort.disabled=Le port TCP pour l''esclave JNLP est désactivé.
-configure.link.text=Allez à l''écran de configuration du système et changez-le
-launch\ agent=lancer l''agent
-Launch\ slave\ agent=Lancer l''agent de l''esclave
-click.above_link=\
-  (Cliquez sur le lien ci-dessus à partir de cette machine esclave pour lancer l''agent \
-  par JNLP ou à partir de la ligne de commande lancez <nowrap><tt>javaws {0}{1}slave-agent.jnlp</tt></nowrap>)
-Connected\ via\ JNLP\ agent.=Connecté via l''agent JNLP.
+slaveAgentPort.disabled=Le port TCP pour l''esclave JNLP est d\u00E9sactiv\u00E9.
+configure.link.text=Allez \u00E0 l''\u00E9cran de configuration du syst\u00E8me et changez-le
+launch\ agent=lancer l''agent
+Connected\ via\ JNLP\ agent.=Connect\u00E9 via l''agent JNLP.

core/src/main/resources/hudson/slaves/JNLPLauncher/main_ja.properties

@@ -22,10 +22,5 @@
 
 slaveAgentPort.disabled=JNLP\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u7528\u306ETCP\u30DD\u30FC\u30C8\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
 configure.link.text=\u30B7\u30B9\u30C6\u30E0\u306E\u8A2D\u5B9A\u753B\u9762\u3067\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u3002
-Launch\ slave\ agent=\u30B9\u30EC\u30FC\u30D6\u8D77\u52D5
-click.above_link=\
-  (\u30B9\u30EC\u30FC\u30D6\u7528\u306E\u30DE\u30B7\u30F3\u304B\u3089\u3001\u4E0A\u8A18\u306E\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066JNLP\u7D4C\u7531\u3067\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u8D77\u52D5\u3059\u308B\u304B\u3001\
-  \u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u3067<nowrap><tt>javaws {0}{1}slave-agent.jnlp</tt></nowrap>\u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002)
 Connected\ via\ JNLP\ agent.=JNLP\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u7D4C\u7531\u3067\u63A5\u7D9A
 launch\ agent=\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306E\u8D77\u52D5
-Launch\ slave\ agent=\u30B9\u30EC\u30FC\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306E\u8D77\u52D5