diff options
author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 21:15:41 +0000 |
---|---|---|
committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 21:15:41 +0000 |
commit | f226b22dab0d99b0d6e9f739f314799dec81c52f (patch) | |
tree | 4481bb0e5c30ac07806654943a564e7f146f6b7a /remoting | |
parent | 408ca9fd4cbbbea81a9c96fb7c0fe6b00c3849a8 (diff) | |
download | chromium_src-f226b22dab0d99b0d6e9f739f314799dec81c52f.zip chromium_src-f226b22dab0d99b0d6e9f739f314799dec81c52f.tar.gz chromium_src-f226b22dab0d99b0d6e9f739f314799dec81c52f.tar.bz2 |
Chromoting: Add home and reconnect button to me2me finish page.
Change "OK" button for it2me to go home instead of to the access code page.
BUG=109703
TEST=none
Review URL: http://codereview.chromium.org/9107066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/webapp/_locales/en/messages.json | 4 | ||||
-rw-r--r-- | remoting/webapp/choice.html | 19 | ||||
-rw-r--r-- | remoting/webapp/event_handlers.js | 12 |
3 files changed, 30 insertions, 5 deletions
diff --git a/remoting/webapp/_locales/en/messages.json b/remoting/webapp/_locales/en/messages.json index 786d07a..8b58be9 100644 --- a/remoting/webapp/_locales/en/messages.json +++ b/remoting/webapp/_locales/en/messages.json @@ -209,6 +209,10 @@ "message": "Chromoting BETA", "description": "The product name. Displayed in various Chromium pages, including the New Tab page, and displayed prominently on the app's main page." }, + "RECONNECT": { + "message": "Reconnect", + "description": "Label for button to reconnect to the previous Me2Me host. This button appears on the 'session-finished' page." + }, "SIGN_OUT_BUTTON": { "message": "Sign out", "description": "Sign out button, visible if the user has authenticated. Clicking this clears authentication credentials and returns the web-app to the initial 'unauthenticated' state." diff --git a/remoting/webapp/choice.html b/remoting/webapp/choice.html index 270896d..89b606d 100644 --- a/remoting/webapp/choice.html +++ b/remoting/webapp/choice.html @@ -272,13 +272,28 @@ found in the LICENSE file. <div data-ui-mode="client.connect-failed.it2me client.session-finished.it2me" class="centered-button"> - <button id="client-finished-button" + <button id="client-finished-it2me-button" type="button" class="big-button" i18n-content="OK" autofocus="autofocus"> </button> - </div> <!-- client.connect-failed client.session-finished --> + </div> <!-- client.connect-failed.it2me client.session-finished.it2me --> + + <div data-ui-mode="client.connect-failed.me2me client.session-finished.me2me" + class="centered-button"> + <button id="client-finished-me2me-button" + type="button" + class="big-button" + i18n-content="OK" + autofocus="autofocus"> + </button> + <button id="client-reconnect-button" + type="button" + class="big-button" + i18n-content="RECONNECT"> + </button> + </div> <!-- client.connect-failed.me2me client.session-finished.me2me --> </div> <!-- client-panel --> diff --git a/remoting/webapp/event_handlers.js b/remoting/webapp/event_handlers.js index bafb58e..d3293a2 100644 --- a/remoting/webapp/event_handlers.js +++ b/remoting/webapp/event_handlers.js @@ -11,9 +11,12 @@ function onLoad() { var goHome = function() { remoting.setMode(remoting.AppMode.HOME); }; - var goClient = function() { + var goEnterAccessCode = function() { remoting.setMode(remoting.AppMode.CLIENT_UNCONNECTED); }; + var reload = function() { + location.reload(); + }; /** @param {Event} event */ var sendAccessCode = function(event) { remoting.connectIt2Me(); @@ -34,11 +37,14 @@ function onLoad() { { event: 'click', id: 'toggle-scaling', fn: remoting.toggleScaleToFit }, { event: 'click', id: 'auth-button', fn: doAuthRedirect }, { event: 'click', id: 'share-button', fn: remoting.tryShare }, - { event: 'click', id: 'access-mode-button', fn: goClient }, + { event: 'click', id: 'access-mode-button', fn: goEnterAccessCode }, { event: 'click', id: 'cancel-share-button', fn: remoting.cancelShare }, { event: 'click', id: 'host-finished-button', fn: goHome }, { event: 'click', id: 'client-cancel-button', fn: goHome }, - { event: 'click', id: 'client-finished-button', fn: goClient }, + { event: 'click', id: 'client-finished-it2me-button', + fn: goEnterAccessCode }, + { event: 'click', id: 'client-finished-me2me-button', fn: goHome }, + { event: 'click', id: 'client-reconnect-button', fn: reload }, { event: 'click', id: 'cancel-button', fn: remoting.cancelPendingOperation }, { event: 'submit', id: 'access-code-form', fn: sendAccessCode }, |