author | Li Xiaodong <i@lxd.me> |
Thu, 24 Oct 2013 09:05:00 +0100 (2013-10-24) | |
changeset 152276 | 5615aa677b90c80d102d35d5a0fe013aad75851c |
parent 152275 | 59608352c11e4e5a029d49a9ce3b6a9d65be48c2 |
child 152277 | cdcf2452599e627da8e37f488e4fcd5e55f5aadc |
push id | 25524 |
push user | philringnalda@gmail.com |
push date | Sat, 26 Oct 2013 02:25:12 +0000 (2013-10-26) |
treeherder | mozilla-central@0280ef5d685c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | paul |
bugs | 917617 |
milestone | 27.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/devtools/app-manager/content/connection-footer.xhtml +++ b/browser/devtools/app-manager/content/connection-footer.xhtml @@ -97,16 +97,17 @@ <div class="connected-indicator"></div> <div class="banner-box"> <div class="banner-content"> <div class="no-simulator"> <span>&connection.noSimulatorInstalled;</span> <button class="action-primary" onclick="UI.installSimulator()" title="&connection.installOneSimulatorTooltip;">&connection.installOneSimulator;</button> </div> <div class="found-simulator"> + <span>&connection.startRegisteredSimulator;</span> <span template-loop='{"arrayPath":"simulators.versions","childSelector":"#simulator-item-template"}'></span> <button class="action-primary" onclick="UI.installSimulator()" title="&connection.installAnotherSimulatorTooltip;">&connection.installAnotherSimulator;</button> </div> <button class="action-cancel" onclick="UI.cancelShowSimulatorList()" title="&connection.cancelShowSimulatorTooltip;">&connection.cancel;</button> </div> </div> </div> @@ -119,17 +120,17 @@ </div> </div> </div> </body> <template id="simulator-item-template"> <span> - <button class="simulator-item" onclick="UI.startSimulator(this.dataset.version)" template='{"type":"attribute","path":"version","name":"data-version"}' title="&connection.startSimulatorTooltip;"> + <button class="simulator-item action-primary" onclick="UI.startSimulator(this.dataset.version)" template='{"type":"attribute","path":"version","name":"data-version"}' title="&connection.startSimulatorTooltip;"> <span template='{"type":"textContent", "path":"version"}'></span> </button> </span> </template> <template id="adb-devices-template"> <span> <button class="adb-device action-primary" onclick="UI.connectToAdbDevice(this.dataset.name)" template='{"type":"attribute","path":"name","name":"data-name"}'>
--- a/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd +++ b/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd @@ -52,16 +52,17 @@ <!ENTITY connection.cancelConnectTooltip "Cancel the connection in progress."> <!ENTITY connection.cancelShowSimulatorTooltip "Exit the Simulator connection mode and return to the initial prompt."> <!ENTITY connection.or "or"> <!ENTITY connection.noSimulatorInstalled "No simulator installed."> <!ENTITY connection.installOneSimulator "Install Simulator"> <!ENTITY connection.installOneSimulatorTooltip "Install a version of the Simulator by downloading the relevant add-on."> <!ENTITY connection.installAnotherSimulator "Add"> <!ENTITY connection.installAnotherSimulatorTooltip "Install an additional version of the Simulator by downloading the relevant add-on."> +<!ENTITY connection.startRegisteredSimulator "Start:"> <!ENTITY projects.localApps "Local Apps"> <!ENTITY projects.addApp "Add"> <!ENTITY projects.addPackaged "Add Packaged App"> <!ENTITY projects.addPackagedTooltip "Add a new packaged app (a directory) from your computer."> <!ENTITY projects.addHosted "Add Hosted App"> <!ENTITY projects.addHostedTooltip "Add a new hosted app (link to a manifest.webapp file) from a remote website."> <!ENTITY projects.title "Local Apps">