diff options
Diffstat (limited to 'chrome/browser')
10 files changed, 423 insertions, 370 deletions
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc index 06976db..a2de479 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc @@ -82,8 +82,8 @@ void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw, AddString(dict, "signinprefix", IDS_SYNC_LOGIN_SIGNIN_PREFIX); AddString(dict, "signinsuffix", IDS_SYNC_LOGIN_SIGNIN_SUFFIX); AddString(dict, "cannotbeblank", IDS_SYNC_CANNOT_BE_BLANK); - AddString(dict, "emaillabel", IDS_SYNC_LOGIN_EMAIL); - AddString(dict, "passwordlabel", IDS_SYNC_LOGIN_PASSWORD); + AddString(dict, "emaillabel", IDS_SYNC_LOGIN_EMAIL_SAME_LINE); + AddString(dict, "passwordlabel", IDS_SYNC_LOGIN_PASSWORD_SAME_LINE); AddString(dict, "invalidcredentials", IDS_SYNC_INVALID_USER_CREDENTIALS); AddString(dict, "signin", IDS_SYNC_SIGNIN); AddString(dict, "couldnotconnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT); diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc index 4dd404b..53c1718e 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc @@ -26,8 +26,8 @@ TEST(CloudPrintResources, SharedStringsCheck) { TestStringStillOkForCloudPrint(IDS_SYNC_LOGIN_SIGNIN_PREFIX); TestStringStillOkForCloudPrint(IDS_SYNC_LOGIN_SIGNIN_SUFFIX); TestStringStillOkForCloudPrint(IDS_SYNC_CANNOT_BE_BLANK); - TestStringStillOkForCloudPrint(IDS_SYNC_LOGIN_EMAIL); - TestStringStillOkForCloudPrint(IDS_SYNC_LOGIN_PASSWORD); + TestStringStillOkForCloudPrint(IDS_SYNC_LOGIN_EMAIL_SAME_LINE); + TestStringStillOkForCloudPrint(IDS_SYNC_LOGIN_PASSWORD_SAME_LINE); TestStringStillOkForCloudPrint(IDS_SYNC_INVALID_USER_CREDENTIALS); TestStringStillOkForCloudPrint(IDS_SYNC_SIGNIN); TestStringStillOkForCloudPrint(IDS_SYNC_LOGIN_COULD_NOT_CONNECT); diff --git a/chrome/browser/resources/sync_promo.css b/chrome/browser/resources/sync_promo.css index 7f5d744..9fd6057 100644 --- a/chrome/browser/resources/sync_promo.css +++ b/chrome/browser/resources/sync_promo.css @@ -5,6 +5,7 @@ html { font-family: segoe ui, arial, helvetica, sans-serif; + font-size: 13px; height: 100%; } @@ -19,9 +20,10 @@ body { } #sync-setup-login { - margin-left: auto; - margin-right: auto; - width: 800px; + margin: 0 auto; + max-width: 900px; + min-width: 830px; + width: auto; } #sync-setup-configure { @@ -32,14 +34,21 @@ body { } #sync-setup-login-promo-column { - display: block; - float: left; - width: 500px; + margin-right: 385px; +} + +html[dir='rtl'] #sync-setup-login-promo-column { + margin-left: 385px; + margin-right: 0; } #sync-setup-login-content-column { float: right; - width: 275px; + width: 335px; +} + +html[dir='rtl'] #sync-setup-login-content-column { + float: left; } #promo-title { @@ -49,19 +58,8 @@ body { text-align: center; } -h1 { - font-size: 180%; - font-weight: normal; -} - -#promo-message-title { - font-size: 120%; -} - -#promo-message-body { - font-size: 85%; - margin-top: 8px; - margin-bottom: 28px; +#promo-infographic { + margin-top: 14px; } #promo-skip { @@ -71,20 +69,33 @@ h1 { text-align: center; } -#promo-information > h3 { +#promo-advanced-link { font-size: 85%; - margin-bottom: 0; - margin-top: 0; + margin: 0 10px; } -#promo-information > p { - font-size: 85%; - margin-top: 0; +#sync-setup-login h1 { + color: #222; + font-size: 27px; + font-weight: normal; } -#promo-advanced-link { - font-size: 85%; - margin: 0 10px; +#sync-setup-login-promo-column h2 { + color: #222; + font-size: 18px; + font-weight: normal; +} + +#sync-setup-login-promo-column h3 { + color: #222; + font-size: 13px; + line-height: 13px; +} + +#sync-setup-login-promo-column p { + color: #222; + font-size: 13px; + line-height: 20px; } #promo-info-pane { diff --git a/chrome/browser/resources/sync_promo.html b/chrome/browser/resources/sync_promo.html index d91652a..52426d0 100644 --- a/chrome/browser/resources/sync_promo.html +++ b/chrome/browser/resources/sync_promo.html @@ -15,6 +15,7 @@ <script src="options/options_page.js"></script> <script src="sync_setup_overlay.js"></script> <script src="sync_promo.js"></script> +<link rel="stylesheet" href="chrome://resources/css/button.css"> <link rel="stylesheet" href="shared/css/throbber.css"> <link rel="stylesheet" href="sync_setup_overlay.css"> <link rel="stylesheet" href="sync_promo.css"> diff --git a/chrome/browser/resources/sync_setup_overlay.css b/chrome/browser/resources/sync_setup_overlay.css index 42c1da8..4683024 100644 --- a/chrome/browser/resources/sync_setup_overlay.css +++ b/chrome/browser/resources/sync_setup_overlay.css @@ -88,27 +88,16 @@ min-width: 87px; } -.end-aligned { - text-align: end; -} - #sync-setup-overlay * .throbber { margin: 4px 10px; - vertical-align: middle; visibility: hidden; } -#gaia-account-text { - font-weight: bold; -} - #email-readonly { - font-weight: bold; -} - -#sync-setup-overlay * div.errormsg { - color: red; - font-size: smaller; + font-size: 15px; + height: 29px; + line-height: 29px; + margin: 0; } #passphrase-encryption-message { @@ -156,19 +145,23 @@ margin-bottom: 5px; } -div.error-msg-spacer { - min-height: 1em; -} - #gaia-login-form { margin-bottom: 0; } +#captcha-div { + border: 1px solid #e5e5e5; + background: #fff; + margin: 0 0 1.5em; + overflow: hidden; + padding: 1em 1em 0; +} + #captcha-wrapper { background: no-repeat; - background-color: #e8eefa; background-position: center; background-size: 200px 70px; + margin: 0 0 1em; } #captcha-image { @@ -184,57 +177,24 @@ div.error-msg-spacer { margin: 0 10px; } -.bottom-padded-cell { - padding-bottom: 3px; -} - -.no-vertical-padding { - padding-bottom: 0; - padding-top: 0; -} - #cancel-space-no-captcha { height: 22px; } -#top-blurb { - line-height: 1.5em; -} - #top-blurb-error { - background-color: #eeb939; - border-radius: 4px; + -webkit-border-radius: 2px; + background: #f9edbe; + border: 1px solid #f0c36d; display: block; font-weight: bold; - margin-bottom: 10px; - margin-left: auto; - margin-right: auto; - padding: 4px 10px; + line-height: 1.5em; + margin: 10px auto; + padding:0 16px; text-align: center; visibility: hidden; width: 70%; } -#content-table { - background-color: #fff; - border: #c3d9ff 1px solid; - padding: 2px; -} - -.access-code-row > td { - padding-bottom: 1px; - text-align: center; -} - -#access-code-label-row > td { - padding-top: 6px; -} - -#captcha-instructions { - margin-bottom: 5px; - white-space: normal; -} - #password-row { margin-top: 2px; } @@ -243,13 +203,9 @@ div.error-msg-spacer { margin-top: 2px; } -#errormsg-0-access-code { - text-align: center; -} - #sync-setup-configure { line-height: 1.33em; - background: #FFFFFF; + background: #fff; } html[os='mac'] #sync-setup-configure { @@ -323,3 +279,231 @@ html[dir='rtl'] #learn-more-link { #customize-link, #use-default-link { -webkit-transition: opacity .25s; } + + +/* Sign in box. */ + +.sign-in { + margin: 0 auto; + width: 335px; +} + +.signin-box { + background: #f5f5f5; + border: 1px solid #e5e5e5; + padding: 20px 25px 15px; +} + +#signin-header { + position: relative; +} + +#signin-header h2 { + color: #222; + font-size: 16px; + font-weight: normal; + height: 16px; + line-height: 16px; + margin-top: 0; +} + +#signin-header-logo { + background: transparent + url('chrome://resources/images/google-transparent.png') no-repeat; + display: inline-block; + height: 19px; + position: absolute; + right: 0; + top: 1px; + width: 52px; +} + +html[dir='rtl'] #signin-header-logo { + left: 0; + right: auto; +} + +/* Sign in buttons. */ + +.signin-box input[type=submit] { + -webkit-transition: all 0.218s; + -webkit-user-select: none; + background-image: -webkit-linear-gradient(top, #4d90fe, #4787ed); + border: 1px solid #3079ed; + border-radius: 2px; + color: #fff; + display: inline-block; + font-size: 13px; + font-weight: bold; + height: 32px; + line-height: 27px; + margin: 0 0.4em 1.2em 0; + min-width: 54px !important; + padding: 0 8px; +} + +html[dir='rtl'] .signin-box input[type=submit] { + margin: 0 0 1.2em 0.4em; +} + +.signin-box input[type=submit]:hover { + -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.1); + -webkit-transition: all 0.0s; + background-image: -webkit-linear-gradient(top, #4d90fe, #357ae8); + border: 1px solid #2f5bb7; + color: #fff; +} + +.signin-box input[type=submit]:focus { + -webkit-box-shadow: inset 0 0 0 1px #fff; + border: 1px solid #4d90fe; + outline: none; + z-index: 4 !important; +} + +.signin-box input[type=submit]:active, +.signin-box input[type=submit]:focus:active { + -webkit-box-shadow: inset 0px 1px 2px rgba(0, 0, 0, 0.3); +} + +.signin-box input[type=submit]:focus:hover { + -webkit-box-shadow: inset 0 0 0 1px #fff, 0px 1px 1px rgba(0, 0, 0, 0.1); +} + +.signin-box input[type=submit][disabled], +.signin-box input[type=submit][disabled]:hover, +.signin-box input[type=submit][disabled]:active { + -webkit-box-shadow: none; + background-color: #4d90fe; + border: 1px solid #3079ed; + color: #fff; + opacity: 0.5; +} + +/* Sign in text fields. */ + +.signin-box input[type=text], +.signin-box input[type=password] { + -webkit-border-radius: 1px; + -webkit-box-sizing: border-box; + background-color: #fff; + border: 1px solid #d9d9d9; + border-top: 1px solid #c0c0c0; + color: #333; + display: inline-block; + font-size: 15px; + height: 32px; + line-height: 27px; + margin-top: 0.5em; + padding-left: 8px; + vertical-align: top; + width: 100%; +} + +html[dir='rtl'] .signin-box input[type=text], +html[dir='rtl'] .signin-box input[type=password] { + padding-left: 0; + padding-right: 8px; +} + +.signin-box input[type=text]:hover, +.signin-box input[type=password]:hover { + -webkit-box-shadow: inset 0px 1px 2px rgba(0, 0, 0, 0.1); + border: 1px solid #b9b9b9; + border-top: 1px solid #a0a0a0; +} + +.signin-box input[type=text]:focus, +.signin-box input[type=password]:focus { + -webkit-box-shadow: inset 0px 1px 2px rgba(0, 0, 0, 0.3); + border: 1px solid #4d90fe; + outline: none; +} + +.signin-box input[type=text][disabled], +.signin-box input[type=password][disabled] { + -webkit-box-shadow: none; + background: #f5f5f5; + border: 1px solid #e5e5e5; +} + +.signin-box input[type=text][disabled]:hover, +.signin-box input[type=password][disabled]:hover { + -webkit-box-shadow: none; +} + + +/* Sign in links. */ + +.signin-box .account-link { + color: #15c !important; + text-decoration: none; +} + +.signin-box .account-link:visited { + color: #61c !important; + text-decoration: none; +} + +.signin-box .account-link:hover { + text-decoration: underline; +} + +.signin-box .account-link:active { + color: #d14836 !important; + text-decoration: underline; +} + +/* Sign in text. */ + +.signin-box strong { + color: #222; + display: block; +} + +.signin-box label { + display: block; + margin: 0 0 1.5em; +} + +/* Sign in miscellaneous. */ + +.signin-box .throbber { + float: right; +} + +html[dir='rtl'] .signin-box .throbber { + float: left; +} + +#create-account-div { + display: inline-block; +} + +.signin-box .errormsg { + color: #dd4b39 !important; + font-size: 13px !important; + line-height: 17px; + margin: 0.5em 0 1.5em; +} + +.signin-box .help-link { + -webkit-border-radius: 1em; + background: #dd4b39; + color: #fff !important; + display: inline-block; + font-weight: bold; + padding: 0 5px; + position: relative; + text-decoration: none; + top: 0; +} + +.signin-box .help-link:visited { + color: #fff !important; +} + +.signin-box .help-link:hover { + color: #fff !important; + opacity: .7; +} diff --git a/chrome/browser/resources/sync_setup_overlay.html b/chrome/browser/resources/sync_setup_overlay.html index 179409d..e11b665 100644 --- a/chrome/browser/resources/sync_setup_overlay.html +++ b/chrome/browser/resources/sync_setup_overlay.html @@ -1,254 +1,107 @@ <div id="sync-setup-overlay" class="page" hidden> <div id="sync-setup-login" hidden> <h1 id="promo-title" i18n-content="promoTitle" hidden></h1> - <div id="sync-setup-login-promo-column" hidden> - <div id="promo-message-title"> - <span i18n-content="promoMessageTitle"></span> - </div> - <div id="promo-message-body"> - <span i18n-values=".innerHTML:promoMessageBody"></span> - <a id="promo-learn-more-show" i18n-content="promoLearnMoreShow" - href="#"></a> - <a id="promo-learn-more-hide" i18n-content="promoLearnMoreHide" - href="#" hidden> </a> - </div> - <div id="promo-info-pane"> - <img id="promo-infographic" - src="chrome://theme/IRD_SYNC_PROMO_INFO_GRAPHIC"> - <div id="promo-information" i18n-values=".innerHTML:promoInformation" - hidden> - </div> - </div> - </div> - <div id="sync-setup-login-content-column"> <h1 id="sync-setup-overlay-title" - i18n-content="syncSetupOverlayTitle"></h1> - <div class="content-area"> - <div> - <!-- top-blurb-error's reset state is handled differently from most - elements. Instead of being [hidden] it is visibility:hidden so it - still takes up space. But it is also [hidden] when we display the - captcha, so when it is reset, it needs to be shown. --> - <div id="top-blurb-error" - class="reset-shown reset-visibility-hidden"> - <span id="error-signing-in" i18n-content="errorSigningIn"></span> - <span id="error-custom" hidden></span> + i18n-content="syncSetupOverlayTitle"> + </h1> + <!-- top-blurb-error's reset state is handled differently from most + elements. Instead of being [hidden] it is visibility:hidden so it + still takes up space. But it is also [hidden] when we display the + captcha, so when it is reset, it needs to be shown. --> + <div id="top-blurb-error" + class="reset-shown reset-visibility-hidden"> + <span id="error-signing-in" i18n-content="errorSigningIn"></span> + <span id="error-custom" hidden></span> + </div> + <div class="sign-in"> + <div class="signin-box"> + <div id="signin-header"> + <h2 i18n-content="signinHeader"></h2> + <div id="signin-header-logo"></div> </div> <form id="gaia-login-form"> - <div id="gaia-login-box"> - <table id="content-table" cellspacing="0" - cellpadding="5" width="75%" border="0" align="center"> - <tr> - <td valign="top" style="text-align:center" nowrap="nowrap" - bgcolor="#e8eefa"> - <div> - <table id="gaia-table" align="center" border="0" - cellpadding="1" cellspacing="0"> - <tr> - <td colspan="2" align="center"> - <table> - <tr> - <td> - <span id="gaia-account-text-prefix" - i18n-content="signinPrefix"></span> - </td> - <td id="gaia-logo" valign="top"> - <img src="chrome://resources/images/google-transparent.png" alt="Google"> - </td> - <td valign="middle"> - <span id="gaia-account-text" - i18n-content="signinSuffix"></span> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td colspan="2" align="center"> </td> - </tr> - <tr id="email-row" class="reset-shown"> - <td nowrap="nowrap"> - <div class="end-aligned"> - <span i18n-content="emailLabel"> - </span> - </div> - </td> - <td> - <input id="gaia-email" type="text" name="email" - size="18" value="" - class="reset-enabled reset-shown reset-value" - autocomplete="off"> - <span id="email-readonly" class="reset-hidden" - hidden></span> - </td> - </tr> - <tr id="access-code-label-row" - class="access-code-row reset-hidden" hidden> - <td colspan="2"> - <span i18n-content="enterAccessCode"></span> - </td> - </tr> - <tr id="access-code-help-row" - class="access-code-row reset-hidden" hidden> - <td colspan="2"> - <a i18n-values="href:getAccessCodeURL" - i18n-content="getAccessCodeHelp" - target="_blank"> - </a> - </td> - </tr> - <tr> - <td></td> - <td> - <div id="errormsg-0-email" - class="errormsg reset-hidden" - i18n-content="cannotBeBlank" - hidden> - </div> - </td> - </tr> - <tr id="password-row" class="reset-shown"> - <td class="end-aligned"> - <span i18n-content="passwordLabel"></span> - </td> - <td> - <input id="gaia-passwd" type="password" - name="passwd" size="18" - class="reset-enabled reset-value" - autocomplete="off"> - </td> - </tr> - <tr id="access-code-input-row" - class="access-code-row reset-hidden" hidden> - <td colspan="2"> - <input id="access-code" type="password" - name="accessCode" size="18" - class="reset-enabled reset-value"> - </td> - </tr> - <tr> - <td></td> - <td> - <div class="error-msg-spacer"> - <div id="errormsg-0-password" - class="errormsg reset-hidden" - i18n-content="cannotBeBlank" - hidden> - </div> - <div id="errormsg-1-password" - class="errormsg reset-hidden" - hidden> - <span i18n-content="invalidCredentials"></span> - <!-- Brackets are intentional --> - [<a i18n-values="href:invalidPasswordHelpURL" - target="_blank">?</a>] - </div> - <div id="errormsg-fatal" - class="errormsg reset-hidden" - hidden> - <span i18n-content="unrecoverableError"></span> - <a i18n-values="href:unrecoverableErrorHelpURL" - i18n-content="errorLearnMore" - target="_blank"> - </a> - </div> - <div id="errormsg-0-access-code" - class="errormsg reset-hidden" - i18n-content="invalidAccessCode" - hidden> - </div> - <div id="asp-warning-div" - class="errormsg reset-hidden" - hidden> - <span i18n-values=".innerHTML:aspWarningText"> - </span> - </div> - </div> - </td> - </tr> - <tr> - <td colspan="2"> - <div id="captcha-div" class="reset-hidden" hidden> - <div id="captcha-instructions" - i18n-content="captchaInstructions" - class="bottom-padded-cell"> - </div> - <div class="bottom-padded-cell"> - <div id="captcha-wrapper"> - <div id="captcha-image"></div> - </div> - </div> - <div> - <input id="captcha-value" type="text" - name="captchaValue" size="18" value="" - class="reset-disabled"> - </div> - </div> - </td> - </tr> - <tr> - <td colspan="2" align="center"> - <div id="errormsg-0-connection" - class="errormsg reset-hidden" - i18n-content="couldNotConnect" - hidden> - </div> - </td> - </tr> - <tr id="action-area"> - <td colspan="2"> - <table align="center" cellpadding="0" - cellspacing="0"> - <tr> - <td> - <div id="logging-in-throbber" - class="throbber"> - </div> - </td> - <td class="no-vertical-padding"> - <input id="sign-in" type="submit" - i18n-content="signin"> - </button> - </td> - </tr> - </table> - </td> - </tr> - <tr id="ga-fprow"> - <td colspan="2" height="16.0" - align="center" valign="bottom"> - <a id="cannot-access-account-link" - i18n-values="href:cannotAccessAccountURL" - target="_blank" - i18n-content="cannotAccessAccount"> - </a> - </td> - </tr> - <tr> - <td id="create-account-cell" colspan="2" height="16.0" - align="center" valign="bottom"> - <div id="create-account-div"> - <a id="create-account-link" - i18n-values="href:createNewAccountURL" - i18n-content="createAccount" target="_blank"> - </a> - </div> - </td> - </tr> - </table> - </div> - </td> - </tr> - </table> + <div id="email-row" class="reset-shown"> + <label> + <strong class="email-label" i18n-content="emailLabel"></strong> + <input id="gaia-email" type="text" name="email" value="" + class="reset-enabled reset-shown reset-value" + autocomplete="off"> + <div id="email-readonly" class="reset-hidden" hidden></div> + <div id="errormsg-0-email" class="errormsg reset-hidden" + i18n-content="cannotBeBlank" hidden></div> + </label> + </div> + <div id="password-row" class="reset-shown"> + <label> + <strong class="password-label" i18n-content="passwordLabel"> + </strong> + <input id="gaia-passwd" type="password" name="passwd" + class="reset-enabled reset-value" autocomplete="off"> + <div id="errormsg-0-password" class="errormsg reset-hidden" + i18n-content="cannotBeBlank" hidden></div> + <label> + </div> + <div id="access-code-input-row" class="access-code-row reset-hidden" + hidden> + <label> + <strong i18n-content="enterAccessCode"></strong> + <a i18n-values="href:getAccessCodeURL" + i18n-content="getAccessCodeHelp" target="_blank" + class="account-link"></a> + <input id="access-code" type="password" name="accessCode" + class="reset-enabled reset-value"> + </label> + </div> + <div id="errormsg-1-password" class="errormsg reset-hidden" hidden> + <span i18n-content="invalidCredentials"></span> + <a i18n-values="href:invalidPasswordHelpURL" class="help-link" + target="_blank">?</a> + </div> + <div id="errormsg-fatal" class="errormsg reset-hidden" hidden> + <span i18n-content="unrecoverableError"></span> + <a i18n-values="href:unrecoverableErrorHelpURL" + i18n-content="errorLearnMore" target="_blank"></a> + </div> + <div id="errormsg-0-access-code" class="errormsg reset-hidden" + i18n-content="invalidAccessCode" hidden> + </div> + <div id="asp-warning-div" class="errormsg reset-hidden" hidden> + <span i18n-values=".innerHTML:aspWarningText"></span> + </div> + <div id="captcha-div" class="reset-hidden" hidden> + <div id="captcha-wrapper"> + <div id="captcha-image"></div> + </div> + <div> + <label> + <strong i18n-content="captchaInstructions"></strong> + <input id="captcha-value" type="text" name="captchaValue" + value="" class="reset-disabled"> + </label> + </div> + </div> + <div id="errormsg-0-connection" class="errormsg reset-hidden" + i18n-content="couldNotConnect" hidden> + </div> + <div id="action-area"> + <input id="sign-in" type="submit" i18n-content="signin"> + <div id="create-account-div" i18n-values=".innerHTML:createAccountLinkHTML"> + </div> + <div id="logging-in-throbber" class="throbber"></div> + </div> + <div id="ga-fprow"> + <a id="cannot-access-account-link" + i18n-values="href:cannotAccessAccountURL" + target="_blank" + i18n-content="cannotAccessAccount" + class="account-link"> + </a> </div> </form> </div> - <div> - <div id="cancel-space-no-captcha" colspan="2"> - </div> - </div> - </div> + </div> <!-- sign-in --> + <div id="cancel-space-no-captcha"></div> <div class="action-area"> <div class="button-strip"> <button id="sync-setup-cancel" type="reset" i18n-content="cancel"> @@ -256,9 +109,26 @@ </div> </div> </div> + <div id="sync-setup-login-promo-column" hidden> + <h2 id="promo-message-title" i18n-content="promoMessageTitle"></h2> + <p> + <span i18n-values=".innerHTML:promoMessageBody"></span> + <a id="promo-learn-more-show" i18n-content="promoLearnMoreShow" + href="#"></a> + <a id="promo-learn-more-hide" i18n-content="promoLearnMoreHide" + href="#" hidden> </a> + </p> + <div id="promo-info-pane"> + <img id="promo-infographic" + src="chrome://theme/IRD_SYNC_PROMO_INFO_GRAPHIC"> + <div id="promo-information" i18n-values=".innerHTML:promoInformation" + hidden> + </div> + </div> + </div> <div id="promo-skip" hidden> <button id="promo-skip-button" type="reset" - i18n-content="promoSkipButton"> </button> + i18n-content="promoSkipButton"> </button> <button id="promo-advanced" i18n-content="promoAdvanced" class="link-button"></button> </div> diff --git a/chrome/browser/resources/sync_setup_overlay.js b/chrome/browser/resources/sync_setup_overlay.js index fda3058..a60b29b 100644 --- a/chrome/browser/resources/sync_setup_overlay.js +++ b/chrome/browser/resources/sync_setup_overlay.js @@ -41,19 +41,6 @@ cr.define('options', function() { initializePage: function() { OptionsPage.prototype.initializePage.call(this); - var acct_text = $('gaia-account-text'); - var translated_text = acct_text.textContent; - var posGoogle = translated_text.indexOf('Google'); - if (posGoogle != -1) { - var googleIsAtEndOfSentence = posGoogle != 0; - - if (googleIsAtEndOfSentence) { - var logo_td = $('gaia-logo'); - logo_td.parentNode.appendChild(logo_td); - } - acct_text.textContent = translated_text.replace('Google',''); - } - var self = this; $('gaia-login-form').onsubmit = function() { self.sendCredentialsAndClose_(); @@ -577,11 +564,8 @@ cr.define('options', function() { showAccessCodeRequired_: function() { $('password-row').hidden = true; $('email-row').hidden = true; - $('create-account-cell').style.visibility = "hidden"; - $('access-code-label-row').hidden = false; $('access-code-input-row').hidden = false; - $('access-code-help-row').hidden = false; $('access-code').disabled = false; }, @@ -591,7 +575,6 @@ cr.define('options', function() { // The captcha takes up lots of space, so make room. $('top-blurb-error').hidden = true; $('create-account-div').hidden = true; - $('create-account-cell').hidden = true; // It's showtime for the captcha now. $('captcha-div').hidden = false; diff --git a/chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui_unittest.cc b/chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui_unittest.cc index d014ebf..e349bda 100644 --- a/chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui_unittest.cc @@ -23,8 +23,8 @@ TEST(EnterpriseEnrollmentResources, SharedStringsCheck) { TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_LOGIN_SIGNIN_PREFIX); TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_LOGIN_SIGNIN_SUFFIX); TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_CANNOT_BE_BLANK); - TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_LOGIN_EMAIL); - TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_LOGIN_PASSWORD); + TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_LOGIN_EMAIL_SAME_LINE); + TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_LOGIN_PASSWORD_SAME_LINE); TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_INVALID_USER_CREDENTIALS); TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_SIGNIN); TestStringStillOkForEnterpriseEnrollment(IDS_SYNC_LOGIN_COULD_NOT_CONNECT); diff --git a/chrome/browser/ui/webui/chromeos/login/enterprise_enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enterprise_enrollment_screen_handler.cc index a2db109..c1a4b82 100644 --- a/chrome/browser/ui/webui/chromeos/login/enterprise_enrollment_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/enterprise_enrollment_screen_handler.cc @@ -187,10 +187,10 @@ void EnterpriseEnrollmentScreenHandler::GetLocalizedStrings( "signinsuffix", l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_SIGNIN_SUFFIX)); localized_strings->SetString( "cannotbeblank", l10n_util::GetStringUTF16(IDS_SYNC_CANNOT_BE_BLANK)); - localized_strings->SetString("emaillabel", - l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_EMAIL)); - localized_strings->SetString( - "passwordlabel", l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_PASSWORD)); + localized_strings->SetString("emaillabel", l10n_util::GetStringUTF16( + IDS_SYNC_LOGIN_EMAIL_SAME_LINE)); + localized_strings->SetString("passwordlabel", l10n_util::GetStringUTF16( + IDS_SYNC_LOGIN_PASSWORD_SAME_LINE)); localized_strings->SetString( "invalidcredentials", l10n_util::GetStringUTF16(IDS_SYNC_INVALID_USER_CREDENTIALS)); diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index 6b92599..414743b 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -204,9 +204,6 @@ void SyncSetupHandler::GetStaticLocalizedValues( "cannotAccessAccountURL", google_util::StringAppendGoogleLocaleParam(kCanNotAccessAccountUrl)); localized_strings->SetString( - "createNewAccountURL", - google_util::StringAppendGoogleLocaleParam(kCreateNewAccountUrl)); - localized_strings->SetString( "introduction", GetStringFUTF16(IDS_SYNC_LOGIN_INTRODUCTION, GetStringUTF16(IDS_PRODUCT_NAME))); @@ -239,14 +236,21 @@ void SyncSetupHandler::GetStaticLocalizedValues( GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE, GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); + std::string create_account_url = + google_util::StringAppendGoogleLocaleParam(kCreateNewAccountUrl); + string16 create_account = GetStringUTF16(IDS_SYNC_CREATE_ACCOUNT); + create_account= UTF8ToUTF16("<a id='create-account-link' target='_blank' " + "class='account-link' href='" + create_account_url + "'>") + + create_account + UTF8ToUTF16("</a>"); + localized_strings->SetString("createAccountLinkHTML", + GetStringFUTF16(IDS_SYNC_CREATE_ACCOUNT_PREFIX, create_account)); + static OptionsStringResource resources[] = { { "syncSetupOverlayTitle", IDS_SYNC_SETUP_TITLE }, { "syncSetupConfigureTitle", IDS_SYNC_SETUP_CONFIGURE_TITLE }, - { "signinPrefix", IDS_SYNC_LOGIN_SIGNIN_PREFIX }, - { "signinSuffix", IDS_SYNC_LOGIN_SIGNIN_SUFFIX }, { "cannotBeBlank", IDS_SYNC_CANNOT_BE_BLANK }, - { "emailLabel", IDS_SYNC_LOGIN_EMAIL }, - { "passwordLabel", IDS_SYNC_LOGIN_PASSWORD }, + { "emailLabel", IDS_SYNC_LOGIN_EMAIL_NEW_LINE }, + { "passwordLabel", IDS_SYNC_LOGIN_PASSWORD_NEW_LINE }, { "invalidCredentials", IDS_SYNC_INVALID_USER_CREDENTIALS }, { "signin", IDS_SYNC_SIGNIN }, { "couldNotConnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT }, @@ -254,10 +258,10 @@ void SyncSetupHandler::GetStaticLocalizedValues( { "errorLearnMore", IDS_LEARN_MORE }, { "unrecoverableErrorHelpURL", IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL }, { "cannotAccessAccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT }, - { "createAccount", IDS_SYNC_CREATE_ACCOUNT }, { "cancel", IDS_CANCEL }, { "settingUp", IDS_SYNC_LOGIN_SETTING_UP }, { "errorSigningIn", IDS_SYNC_ERROR_SIGNING_IN }, + { "signinHeader", IDS_SYNC_PROMO_SIGNIN_HEADER}, { "captchaInstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS }, { "invalidAccessCode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL }, { "enterAccessCode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL }, |