| Index: chrome/browser/sync/resources/gaia_login.html
|
| diff --git a/chrome/browser/sync/resources/gaia_login.html b/chrome/browser/sync/resources/gaia_login.html
|
| index 7473ef3b9bd9d7af47abe2ebd4285612c8e36ccf..a9d8417d6ea29995805dc91a9d0a9ff5dc6f5b46 100644
|
| --- a/chrome/browser/sync/resources/gaia_login.html
|
| +++ b/chrome/browser/sync/resources/gaia_login.html
|
| @@ -1,84 +1,89 @@
|
| <html i18n-values="dir:textdirection;">
|
| - <head>
|
| -<style type="text/css"><!--
|
| +<head>
|
| +<style type="text/css">
|
| body,td,div,p,a,font,span {font-family: arial,sans-serif;}
|
| body { background-color:#ffffff }
|
| A:link {color:#0000cc; }
|
| A:visited { color:#551a8b; }
|
| A:active { color:#ff0000; }
|
| .form-noindent {background-color: #ffffff; border: #C3D9FF 1px solid}
|
| ---></style>
|
| - <style type="text/css"><!--
|
| - .body { margin-left: 3em;
|
| - margin-right: 5em;
|
| - font-family: arial,sans-serif; }
|
| - .endaligned {
|
| - text-align: right;
|
| - }
|
| - html[dir='rtl'] .endaligned {
|
| - text-align: left;
|
| - }
|
| - #gaia_account_text { font-weight: bold; }
|
| - div.errorbox-good {}
|
| - div.errorbox-bad {}
|
| - div.errormsg { color: red; font-size: smaller;
|
| - font-family: arial,sans-serif;
|
| - display: none;}
|
| - font.errormsg { color: red; font-size: smaller;
|
| - font-family: arial,sans-serif;}
|
| - div.errormsgspacer { min-height: 1em;}
|
| - font.errormsgspacer { font-size: smaller;
|
| - font-family: arial,sans-serif;}
|
| + .body { margin-left: 3em;
|
| + margin-right: 5em;
|
| + font-family: arial,sans-serif; }
|
| + .endaligned {
|
| + text-align: right;
|
| + }
|
| + html[dir='rtl'] .endaligned {
|
| + text-align: left;
|
| + }
|
| + #gaia_account_text { font-weight: bold; }
|
| + div.errorbox-good {}
|
| + div.errorbox-bad {}
|
| + div.errormsg { color: red; font-size: smaller;
|
| + font-family: arial,sans-serif;
|
| + display: none;}
|
| + font.errormsg { color: red; font-size: smaller;
|
| + font-family: arial,sans-serif;}
|
| + div.errormsgspacer { min-height: 1em;}
|
| + font.errormsgspacer { font-size: smaller;
|
| + font-family: arial,sans-serif;}
|
|
|
| - hr {
|
| - border: 0;
|
| - background-color:#DDDDDD;
|
| - height: 1px;
|
| - width: 100%;
|
| - text-align: left;
|
| - margin: 5px;
|
| - }
|
| - #gaia_loginform {
|
| - margin-bottom: 0;
|
| - }
|
| + hr {
|
| + border: 0;
|
| + background-color:#DDDDDD;
|
| + height: 1px;
|
| + width: 100%;
|
| + text-align: left;
|
| + margin: 5px;
|
| + }
|
| + #gaia_loginform {
|
| + margin-bottom: 0;
|
| + }
|
|
|
| - #captcha_wrapper {
|
| - background-size: 200px 70px;
|
| - background: no-repeat;
|
| - background-position: center;
|
| - background-color: #e8eefa;
|
| - display: block;
|
| - }
|
| - .captcha_image {
|
| - display: block;
|
| - width: 200px;
|
| - height: 70px;
|
| - }
|
| - .toppageverticalspace {
|
| - height: 15px;
|
| - }
|
| - .bottompaddedcell {
|
| - padding-bottom: 3px;
|
| - }
|
| - .noverticalpadding {
|
| - padding-top: 0;
|
| - padding-bottom: 0;
|
| - }
|
| - .cancelspacenocaptcha {
|
| - height: 22px;
|
| - }
|
| - .cancelspaceforcaptcha {
|
| - height: 5px;
|
| - }
|
| - #top_blurb {
|
| - text-align: justify;
|
| - }
|
| - -->
|
| - </style>
|
| - </head>
|
| - <body bgcolor="#ffffff" vlink="#666666"
|
| - i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"
|
| - style="margin-bottom: 6px; margin-top: 6px;" onload="initForm();">
|
| + #captcha_wrapper {
|
| + background-size: 200px 70px;
|
| + background: no-repeat;
|
| + background-position: center;
|
| + background-color: #e8eefa;
|
| + display: block;
|
| + }
|
| + .captcha_image {
|
| + display: block;
|
| + width: 200px;
|
| + height: 70px;
|
| + }
|
| + .toppageverticalspace {
|
| + height: 15px;
|
| + }
|
| + .bottompaddedcell {
|
| + padding-bottom: 3px;
|
| + }
|
| + .noverticalpadding {
|
| + padding-top: 0;
|
| + padding-bottom: 0;
|
| + }
|
| + .cancelspacenocaptcha {
|
| + height: 22px;
|
| + }
|
| + .cancelspaceforcaptcha {
|
| + height: 5px;
|
| + }
|
| + #top_blurb {
|
| + text-align: justify;
|
| + }
|
| + input[type='button'] {
|
| + min-width: 87px;
|
| + min-height: 26px;
|
| + }
|
| + input[type='submit'] {
|
| + min-width: 87px;
|
| + min-height: 26px;
|
| + }
|
| +</style>
|
| +</head>
|
| +<body bgcolor="#ffffff" vlink="#666666"
|
| + i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"
|
| + style="margin-bottom: 6px; margin-top: 6px;" onload="initGaiaLoginForm();">
|
| <table width="100%" height="100%" align="center" cellpadding="1" cellspacing="1">
|
| <tr>
|
| <td valign="top"> <!-- LOGIN BOX -->
|
| @@ -149,10 +154,6 @@
|
| }
|
| document.getElementById("signIn").disabled = false;
|
| document.getElementById("signIn").value = templateData['signin'];
|
| - if (args.showCustomize) {
|
| - document.getElementById("customize").disabled = false;
|
| - document.getElementById("customize").style.visibility = "visible";
|
| - }
|
| gaia_setFocus();
|
| }
|
|
|
| @@ -181,14 +182,9 @@
|
| }
|
|
|
| function CloseDialog() {
|
| - chrome.send("ClickCustomizeCancel", [""]);
|
| chrome.send("DialogClose", [""]);
|
| }
|
|
|
| - function showCustomize() {
|
| - chrome.send("ShowCustomize", [""]);
|
| - }
|
| -
|
| function showGaiaSuccessAndClose() {
|
| document.getElementById("signIn").value = templateData['success'];
|
| setTimeout(CloseDialog, 1600);
|
| @@ -198,7 +194,8 @@
|
| document.getElementById("signIn").value = templateData['settingup'];
|
| }
|
|
|
| - function initForm() {
|
| + // Called once, when this html/js is loaded.
|
| + function initGaiaLoginForm() {
|
| var acct_text = document.getElementById("gaia_account_text");
|
| var translated_text = acct_text.textContent;
|
| var posGoogle = translated_text.indexOf('Google');
|
| @@ -220,16 +217,13 @@
|
|
|
| function sendCredentialsAndClose() {
|
|
|
| - chrome.send("ClickCustomizeOk", [""]);
|
| if (!setErrorVisibility())
|
| return false;
|
|
|
| document.getElementById('Email').disabled = true;
|
| document.getElementById('Passwd').disabled = true;
|
| document.getElementById('CaptchaValue').disabled = true;
|
| - if (document.getElementById('customize')) {
|
| - document.getElementById('customize').disabled = true;
|
| - }
|
| +
|
| var throbber = document.getElementById('throbber_container');
|
| throbber.style.display = "inline";
|
| var f = document.getElementById("gaia_loginform");
|
| @@ -278,30 +272,30 @@
|
| return true;
|
| }
|
| </script>
|
| -<style type="text/css"><!--
|
| - div.errormsg { color: red; font-size: smaller; font-family:arial,sans-serif; }
|
| - font.errormsg { color: red; font-size: smaller; font-family:arial,sans-serif;}
|
| ---></style>
|
| -<style type="text/css"><!--
|
| -.gaia.le.lbl { font-family: Arial, Helvetica, sans-serif; font-size: smaller; }
|
| -.gaia.le.fpwd { font-family: Arial, Helvetica, sans-serif; font-size: 70%; }
|
| -.gaia.le.chusr { font-family: Arial, Helvetica, sans-serif; font-size: 70%; }
|
| -.gaia.le.val { font-family: Arial, Helvetica, sans-serif; font-size: smaller; }
|
| -.gaia.le.button { font-family: Arial, Helvetica, sans-serif; }
|
| -.gaia.le.rem { font-family: Arial, Helvetica, sans-serif; font-size: smaller; }
|
| -.gaia.captchahtml.desc { font-family: arial, sans-serif; font-size: smaller; }
|
| -.gaia.captchahtml.cmt { font-family: arial, sans-serif; font-size: smaller;
|
| - font-style: italic; }
|
| ---></style>
|
| -<div id="top_blurb">
|
| - <p><font size="-1"><span i18n-content="introduction"></span></font></p>
|
| -</div>
|
| -<div id="top_blurb_error" style="display:none">
|
| - <p><font size="-1">
|
| - <span i18n-content="settingupsync"></span><br/><br/>
|
| - <b><span i18n-content="errorsigningin"></span></b>
|
| - </font></p>
|
| -</div>
|
| + <style type="text/css">
|
| + div.errormsg { color: red; font-size: smaller; font-family:arial,sans-serif; }
|
| + font.errormsg { color: red; font-size: smaller; font-family:arial,sans-serif;}
|
| + </style>
|
| + <style type="text/css">
|
| + .gaia.le.lbl { font-family: Arial, Helvetica, sans-serif; font-size: smaller; }
|
| + .gaia.le.fpwd { font-family: Arial, Helvetica, sans-serif; font-size: 70%; }
|
| + .gaia.le.chusr { font-family: Arial, Helvetica, sans-serif; font-size: 70%; }
|
| + .gaia.le.val { font-family: Arial, Helvetica, sans-serif; font-size: smaller; }
|
| + .gaia.le.button { font-family: Arial, Helvetica, sans-serif; }
|
| + .gaia.le.rem { font-family: Arial, Helvetica, sans-serif; font-size: smaller; }
|
| + .gaia.captchahtml.desc { font-family: arial, sans-serif; font-size: smaller; }
|
| + .gaia.captchahtml.cmt { font-family: arial, sans-serif; font-size: smaller;
|
| + font-style: italic; }
|
| + </style>
|
| + <div id="top_blurb">
|
| + <p><font size="-1"><span i18n-content="introduction"></span></font></p>
|
| + </div>
|
| + <div id="top_blurb_error" style="display:none">
|
| + <p><font size="-1">
|
| + <span i18n-content="settingupsync"></span><br/><br/>
|
| + <b><span i18n-content="errorsigningin"></span></b>
|
| + </font></p>
|
| + </div>
|
| <form id="gaia_loginform" onsubmit="sendCredentialsAndClose(); return false;">
|
| <div id="gaia_loginbox">
|
| <table id="content_table" class="form-noindent" cellspacing="0" cellpadding="5"
|
| @@ -331,7 +325,7 @@
|
| </table>
|
| </td>
|
| </tr>
|
| - <script type="text/javascript"><!--
|
| + <script type="text/javascript">
|
| function onPreCreateAccount() {
|
| return true;
|
| }
|
| @@ -342,7 +336,7 @@
|
| return true;
|
| }
|
| }
|
| - --></script>
|
| + </script>
|
| <tr>
|
| <td colspan="2" align="center"> </td>
|
| </tr>
|
| @@ -491,9 +485,6 @@
|
| </tr>
|
| <tr>
|
| <td class="endaligned noverticalpadding" colspan="2" style="vertical-align: bottom">
|
| - <input id="customize" type="button" name="customize"
|
| - i18n-values="value:customize" onclick="showCustomize();"
|
| - style="visibility:hidden" disabled="disabled">
|
| <input type="button" name="cancel" i18n-values="value:cancel"
|
| onclick="CloseDialog();" style="width:85">
|
| </td>
|
|
|