diff options
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/sync_setup_overlay.html | 16 | ||||
| -rw-r--r-- | chrome/browser/resources/sync_setup_overlay.js | 5 |
2 files changed, 12 insertions, 9 deletions
diff --git a/chrome/browser/resources/sync_setup_overlay.html b/chrome/browser/resources/sync_setup_overlay.html index 80629c1..4199d77 100644 --- a/chrome/browser/resources/sync_setup_overlay.html +++ b/chrome/browser/resources/sync_setup_overlay.html @@ -300,14 +300,18 @@ </div> <div id="sync-existing-passphrase-container" hidden> <div id="enter-passphrase"> - <div id="normal-body" i18n-content="enterPassphraseBody" hidden> - </div> - <div id="passphrase-rejected-body" + <span id="normal-body" i18n-content="enterPassphraseBody" hidden> + </span> + <span id="passphrase-rejected-body" i18n-content="enterOtherPassphraseBody" hidden> - </div> - <div id="google-passphrase-needed-body" + </span> + <span id="google-passphrase-needed-body" i18n-content="enterGooglePassphraseBody" hidden> - </div> + </span> + <a id="passphrase-learn-more" i18n-content="learnMore" + i18n-values="href:syncErrorHelpURL" class="reset-hidden" + target="_blank" hidden> + </a> </div> <div id="passphrase-input"> <input id="passphrase" name="passphrase" type="password" diff --git a/chrome/browser/resources/sync_setup_overlay.js b/chrome/browser/resources/sync_setup_overlay.js index 39da92e..e07fb09 100644 --- a/chrome/browser/resources/sync_setup_overlay.js +++ b/chrome/browser/resources/sync_setup_overlay.js @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -471,10 +471,9 @@ cr.define('options', function() { else $('normal-body').hidden = false; + $('passphrase-learn-more').hidden = false; $('incorrect-passphrase').hidden = !args["passphrase_setting_rejected"]; - $('sync-passphrase-warning').hidden = false; - $('passphrase').focus(); }, |