Commit f46f86c6 authored by dzhioev's avatar dzhioev Committed by Commit bot

Refresh button for FrE and recovery modes added to enrollment screen.

In addition fixed an issue where <- button was shown when it should not.

BUG=472671
TEST=manually,tested FrE and recovery modes, button works as expected.

Review URL: https://codereview.chromium.org/1132043002

Cr-Commit-Position: refs/heads/master@{#329361}
parent 3418083e
...@@ -79,13 +79,23 @@ ...@@ -79,13 +79,23 @@
display: none; display: none;
} }
#oauth-enroll-back-button,
#oauth-enrollment.saml #oauth-enroll-back-button {
display: none;
}
.oauth-enroll-state-signin #oauth-enroll-back-button {
display: inline;
}
.oauth-enroll-state-signin.mode-manual #oauth-enroll-cancel-button, .oauth-enroll-state-signin.mode-manual #oauth-enroll-cancel-button,
.oauth-enroll-state-signin #oauth-enroll-back-button, .oauth-enroll-state-signin.mode-forced #oauth-enroll-refresh-button,
.oauth-enroll-state-signin.mode-recovery #oauth-enroll-refresh-button,
.oauth-enroll-state-working.mode-manual #oauth-enroll-cancel-button, .oauth-enroll-state-working.mode-manual #oauth-enroll-cancel-button,
.oauth-enroll-state-working #oauth-enroll-back-button, .oauth-enroll-state-working.mode-forced #oauth-enroll-refresh-button,
.oauth-enroll-stain-working.mode-recovery #oauth-enroll-refresh-button,
.oauth-enroll-state-error.mode-manual #oauth-enroll-cancel-button, .oauth-enroll-state-error.mode-manual #oauth-enroll-cancel-button,
.oauth-enroll-state-error.mode-manual #oauth-enroll-done-button, .oauth-enroll-state-error.mode-manual #oauth-enroll-done-button,
.oauth-enroll-state-error #oauth-enroll-back-button,
.oauth-enroll-state-success #oauth-enroll-done-button { .oauth-enroll-state-success #oauth-enroll-done-button {
display: inline; display: inline;
} }
...@@ -123,27 +133,34 @@ ...@@ -123,27 +133,34 @@
} }
#oauth-enroll-cancel-button, #oauth-enroll-cancel-button,
#oauth-enroll-back-button { #oauth-enroll-back-button,
#oauth-enroll-refresh-button {
position: absolute; position: absolute;
top: 10px; top: 10px;
z-index: 1;
} }
#oauth-enroll-cancel-button { #oauth-enroll-cancel-button,
#oauth-enroll-refresh-button {
color: rgba(0, 0, 0, .54); color: rgba(0, 0, 0, .54);
right: 10px; right: 10px;
} }
html[dir=rtl] #oauth-enroll-cancel-button { html[dir=rtl] #oauth-enroll-cancel-button,
html[dir=rtl] #oauth-enroll-refresh-button {
left: 10px; left: 10px;
right: auto; right: auto;
} }
#oauth-enrollment.saml #oauth-enroll-cancel-button { #oauth-enrollment.saml #oauth-enroll-cancel-button,
#oauth-enrollment.saml #oauth-enroll-refresh-button {
color: rgba(0, 0, 0, .54); color: rgba(0, 0, 0, .54);
} }
.oauth-enroll-state-signin #oauth-enroll-cancel-button, .oauth-enroll-state-signin #oauth-enroll-cancel-button,
.oauth-enroll-state-working #oauth-enroll-cancel-button { .oauth-enroll-state-working #oauth-enroll-cancel-button,
.oauth-enroll-state-signin #oauth-enroll-refresh-button,
.oauth-enroll-state-working #oauth-enroll-refresh-button {
color: white; color: white;
} }
...@@ -165,3 +182,4 @@ html[dir=rtl] #oauth-enroll-back-button { ...@@ -165,3 +182,4 @@ html[dir=rtl] #oauth-enroll-back-button {
#oauth-enroll-attribute-prompt-message { #oauth-enroll-attribute-prompt-message {
color: black; color: black;
} }
...@@ -68,4 +68,7 @@ ...@@ -68,4 +68,7 @@
<button id="oauth-enroll-cancel-button" is="gaia-icon-button" icon="close" <button id="oauth-enroll-cancel-button" is="gaia-icon-button" icon="close"
class="oauth-enroll-button" i18n-values="aria-label:closeButton" class="oauth-enroll-button" i18n-values="aria-label:closeButton"
tabindex="0"></button> tabindex="0"></button>
<button id="oauth-enroll-refresh-button" is="gaia-icon-button" icon="refresh"
class="oauth-enroll-button" i18n-values="aria-label:closeButton"
tabindex="0"></button>
</div> </div>
...@@ -120,6 +120,8 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() { ...@@ -120,6 +120,8 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
$('oauth-enroll-cancel-button').addEventListener('click', $('oauth-enroll-cancel-button').addEventListener('click',
this.cancel.bind(this)); this.cancel.bind(this));
$('oauth-enroll-refresh-button').addEventListener('click',
this.cancel.bind(this));
$('oauth-enroll-back-button').addEventListener('click', $('oauth-enroll-back-button').addEventListener('click',
(function(e) { (function(e) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment