Navigation Menu

Skip to content

Commit

Permalink
[FIXED JENKINS-20303] Fix paths to help text.
Browse files Browse the repository at this point in the history
  • Loading branch information
orrc committed May 14, 2014
1 parent 2745ab1 commit ab4aa12
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
Expand Up @@ -5,10 +5,10 @@

<f:radioBlock name="android-emulator.useNamed" value="true"
title="${%Run existing emulator}" checked="${instance.useNamedEmulator}"
help="${resURL}/plugin/android-emulator/help-emulatorNamed.html">
help="/plugin/android-emulator/help-emulatorNamed.html">
<f:block>
<table style="margin-left:2em">
<f:entry title="${%AVD name}" help="${resURL}/plugin/android-emulator/help-avdName.html">
<f:entry title="${%AVD name}" help="/plugin/android-emulator/help-avdName.html">
<f:textbox name="android-emulator.avdName" value="${instance.avdName}"
checkUrl="'descriptorByName/AndroidEmulator/checkAvdName?value='+escape(this.value)"/>
<f:description>${%Enter the name of an existing Android emulator configuration}</f:description>
Expand All @@ -19,42 +19,42 @@

<f:radioBlock name="android-emulator.useNamed" value="false"
title="${%Run emulator with properties}" checked="${!instance.useNamedEmulator}"
help="${resURL}/plugin/android-emulator/help-emulatorCustom.html">
help="/plugin/android-emulator/help-emulatorCustom.html">
<f:block>
<table style="margin-left:2em">
<f:entry title="${%Android OS version}" help="${resURL}/plugin/android-emulator/help-osVersion.html">
<f:entry title="${%Android OS version}" help="/plugin/android-emulator/help-osVersion.html">
<f:editableComboBox id="android-emulator.osVersion" field="osVersion"
items="${descriptor.androidVersions}"
checkUrl="'descriptorByName/AndroidEmulator/checkOsVersion?value='+escape(this.value)" />
</f:entry>
<f:entry title="${%Screen density}" help="${resURL}/plugin/android-emulator/help-screenDensity.html">
<f:entry title="${%Screen density}" help="/plugin/android-emulator/help-screenDensity.html">
<f:editableComboBox name="android-emulator.screenDensity" field="screenDensity"
items="${descriptor.deviceDensities}"
checkUrl="'descriptorByName/AndroidEmulator/checkScreenDensity?value='+escape(this.value)" />
</f:entry>
<f:entry title="${%Screen resolution}" help="${resURL}/plugin/android-emulator/help-screenResolution.html">
<f:entry title="${%Screen resolution}" help="/plugin/android-emulator/help-screenResolution.html">
<f:editableComboBox id="android-emulator.screenResolution" field="screenResolution"
items="${descriptor.deviceResolutions}"
checkUrl="'descriptorByName/AndroidEmulator/checkScreenResolution?value='+ escape(this.value)
+'&amp;density='+ escape(Form.findMatchingInput(this,'android-emulator.screenDensity').value)
+'&amp;osVersion='+ escape(document.getElementById('android-emulator.osVersion').value)" />
</f:entry>
<f:entry title="${%Device locale}" help="${resURL}/plugin/android-emulator/help-deviceLocale.html">
<f:entry title="${%Device locale}" help="/plugin/android-emulator/help-deviceLocale.html">
<f:editableComboBox id="android-emulator.deviceLocale" field="deviceLocale"
items="${descriptor.emulatorLocales}"
checkUrl="'descriptorByName/AndroidEmulator/checkDeviceLocale?value='+escape(this.value)" />
</f:entry>
<f:entry title="${%SD card size}" help="${resURL}/plugin/android-emulator/help-sdCard.html">
<f:entry title="${%SD card size}" help="/plugin/android-emulator/help-sdCard.html">
<f:textbox name="android-emulator.sdCardSize" value="${instance.sdCardSize}" style="width:6em"
checkUrl="'descriptorByName/AndroidEmulator/checkSdCardSize?value='+escape(this.value)" />
</f:entry>
<f:entry title="${%Target ABI}" help="${resURL}/plugin/android-emulator/help-targetAbi.html">
<f:entry title="${%Target ABI}" help="/plugin/android-emulator/help-targetAbi.html">
<f:editableComboBox id="android-emulator.targetAbi" field="targetAbi"
items="${descriptor.targetAbis}"
checkUrl="'descriptorByName/AndroidEmulator/checkTargetAbi?value='+escape(this.value)" />
</f:entry>

<f:entry title="${%Hardware}" help="${resURL}/plugin/android-emulator/help-hardware.html">
<f:entry title="${%Hardware}" help="/plugin/android-emulator/help-hardware.html">
<f:repeatable var="hw" name="hardwareProperties" items="${instance.hardwareProperties}"
add="${%Add custom hardware property...}" minimum="0">
<table width="100%">
Expand Down Expand Up @@ -82,17 +82,17 @@
</f:radioBlock>

<f:section title="${%Common emulator options}">
<f:entry help="${resURL}/plugin/android-emulator/help-wipeData.html">
<f:entry help="/plugin/android-emulator/help-wipeData.html">
<f:checkbox id="android-emulator.wipeData" name="android-emulator.wipeData"
checked="${instance.wipeData}" />
<label class="attach-previous">${%Reset emulator state at start-up}</label>
</f:entry>
<f:entry help="${resURL}/plugin/android-emulator/help-showWindow.html">
<f:entry help="/plugin/android-emulator/help-showWindow.html">
<f:checkbox id="android-emulator.showWindow" name="android-emulator.showWindow"
checked="${instance.showWindow}" />
<label class="attach-previous">${%Show emulator window}</label>
</f:entry>
<f:entry help="${resURL}/plugin/android-emulator/help-useSnapshots.html">
<f:entry help="/plugin/android-emulator/help-useSnapshots.html">
<f:checkbox id="android-emulator.useSnapshots" name="android-emulator.useSnapshots"
checked="${instance.useSnapshots}" />
<label class="attach-previous">${%Use emulator snapshots}</label>
Expand All @@ -105,21 +105,21 @@
<f:block>
<table style="margin-left:2em">
<f:advanced>
<f:entry title="${%Post-build}" help="${resURL}/plugin/android-emulator/help-deleteAfterBuild.html">
<f:entry title="${%Post-build}" help="/plugin/android-emulator/help-deleteAfterBuild.html">
<f:checkbox id="android-emulator.deleteAfterBuild" name="android-emulator.deleteAfterBuild"
checked="${instance.deleteAfterBuild}" />
<label class="attach-previous">${%Delete emulator after build}</label>
</f:entry>
<f:entry title="${%Startup delay}" help="${resURL}/plugin/android-emulator/help-startupDelay.html">
<f:entry title="${%Startup delay}" help="/plugin/android-emulator/help-startupDelay.html">
<f:textbox name="android-emulator.startupDelay" value="${instance.startupDelay}" style="width:3em"
default="0" />
<f:description>${%Wait this many seconds before attempting to start the emulator}</f:description>
</f:entry>
<f:entry title="${%Emulator options}" help="${resURL}/plugin/android-emulator/help-commandLineOptions.html">
<f:entry title="${%Emulator options}" help="/plugin/android-emulator/help-commandLineOptions.html">
<f:textbox name="android-emulator.commandLineOptions" value="${instance.commandLineOptions}" />
<f:description>${%Will be given when starting the Android &lt;tt>emulator&lt;/tt> executable}</f:description>
</f:entry>
<f:entry title="${%Emulator executable}" help="${resURL}/plugin/android-emulator/help-executable.html">
<f:entry title="${%Emulator executable}" help="/plugin/android-emulator/help-executable.html">

<f:editableComboBox id="android-emulator.executable" field="executable"
items="${descriptor.executables}"
Expand Down
Expand Up @@ -4,18 +4,18 @@

<f:entry title="${%Android SDK root}"
description="${%Enter the path to the root of an Android SDK installation}"
help="${resURL}/plugin/android-emulator/help-sdkRoot.html">
help="/plugin/android-emulator/help-sdkRoot.html">
<input class="setting-input validated" name="android-emulator.androidHome"
type="text" value="${descriptor.androidHome}"
checkUrl="'buildWrapper/AndroidEmulator/checkAndroidHome?value='+escape(this.value)" />
</f:entry>

<f:entry help="${resURL}/plugin/android-emulator/help-installSdk.html">
<f:entry help="/plugin/android-emulator/help-installSdk.html">
<f:checkbox name="android-emulator.shouldInstallSdk" checked="${descriptor.shouldInstallSdk}" />
<label class="attach-previous">${%Automatically install Android components when required}</label>
</f:entry>

<f:entry help="${resURL}/plugin/android-emulator/help-keepInWorkspace.html">
<f:entry help="/plugin/android-emulator/help-keepInWorkspace.html">
<f:checkbox name="android-emulator.shouldKeepInWorkspace" checked="${descriptor.shouldKeepInWorkspace}" />
<label class="attach-previous">${%Keep emulators in the job workspace, in the .android subdirectory, to isolate them as much as possible}</label>
</f:entry>
Expand Down
Expand Up @@ -5,13 +5,13 @@
<f:description>${%Path to an Android package file, within the current workspace, to be installed}</f:description>
</f:entry>

<f:entry help="${resURL}/plugin/android-emulator/help-uninstallFirst.html">
<f:entry help="/plugin/android-emulator/help-uninstallFirst.html">
<f:checkbox id="android-emulator.uninstallFirst" name="android-emulator.uninstallFirst"
title="${%Uninstall existing APK first}"
checked="${instance.shouldUninstallFirst()}" />
</f:entry>

<f:entry help="${resURL}/plugin/android-emulator/help-failOnInstallFailure.html">
<f:entry help="/plugin/android-emulator/help-failOnInstallFailure.html">
<f:checkbox id="android-emulator.failOnInstallFailure" name="android-emulator.failOnInstallFailure"
title="${%Fail the build if installation fails}"
checked="${h.defaultToTrue(instance.shouldFailBuildOnFailure())}" />
Expand Down
Expand Up @@ -5,7 +5,7 @@
<f:description>${%ID of the Android package to be uninstalled}</f:description>
</f:entry>

<f:entry help="${resURL}/plugin/android-emulator/help-failOnUninstallFailure.html">
<f:entry help="/plugin/android-emulator/help-failOnUninstallFailure.html">
<f:checkbox id="android-emulator.failOnUninstallFailure" name="android-emulator.failOnUninstallFailure"
title="${%Fail the build if uninstallation fails}"
checked="${instance.shouldFailBuildOnFailure()}" />
Expand Down

0 comments on commit ab4aa12

Please sign in to comment.