| Index: chrome/browser/resources/chromeos/login/gaia_password_changed.html
|
| diff --git a/chrome/browser/resources/chromeos/login/gaia_password_changed.html b/chrome/browser/resources/chromeos/login/gaia_password_changed.html
|
| index 12136f2b70a0dc0075f61300c6b26935966de312..d4d2d20e57f4b77e9e523c5810c6f6a918663ebc 100644
|
| --- a/chrome/browser/resources/chromeos/login/gaia_password_changed.html
|
| +++ b/chrome/browser/resources/chromeos/login/gaia_password_changed.html
|
| @@ -1,7 +1,15 @@
|
| -<link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
|
| -<link rel="import" href="chrome://resources/polymer/polymer/layout.html">
|
| -<link rel="import" href="chrome://resources/polymer/core-animated-pages/core-animated-pages.html">
|
| -<link rel="import" href="chrome://resources/polymer/core-animated-pages/transitions/cross-fade.html">
|
| +<!-- Copyright 2015 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. -->
|
| +
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/fade-in-animation.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/animations/fade-out-animation.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animated-pages.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
|
| +<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
|
|
|
| <!--
|
| Password changed UI for the New Gaia flow.
|
| @@ -31,60 +39,63 @@
|
| 'focus' - if current card is the first one it focuses password input.
|
|
|
| -->
|
| -<polymer-element name="gaia-password-changed" vertical layout
|
| - attributes="email">
|
| +<dom-module name="gaia-password-changed">
|
| + <link rel="stylesheet" href="gaia_password_changed.css">
|
| +
|
| <template>
|
| - <link rel="stylesheet" href="gaia_password_changed.css">
|
| - <core-animated-pages id="animatedPages" transitions="cross-fade-all" flex
|
| - on-core-animated-pages-transition-end="{{onTransitionEnd}}">
|
| - <section flex>
|
| - <gaia-card id="oldPasswordCard">
|
| - <gaia-header class="header" email="{{email}}">
|
| + <neon-animated-pages id="animatedPages" class="fit"
|
| + entry-animation="fade-in-animation" exit-animation="fade-out-animation"
|
| + on-neon-animation-finish="onAnimationFinish_" selected="0">
|
| + <neon-animatable class="fit">
|
| + <gaia-card id="oldPasswordCard" class="fit">
|
| + <gaia-header class="header" email="[[email]]">
|
| </gaia-header>
|
| - <div horizontal layout center class="footer gaia-body-text">
|
| + <div class="footer gaia-body-text" class="horizontal layout center">
|
| <p i18n-content="passwordChangedTitle">
|
| </p>
|
| </div>
|
| <gaia-input-form class="footer" id="oldPasswordInputForm"
|
| - i18n-values="buttonText:nextButtonText">
|
| - <gaia-input id="oldPasswordInput" type="password"
|
| + disabled="[[disabled]]" on-submit="onPasswordSubmitted_"
|
| + i18n-values="button-text:nextButtonText">
|
| + <gaia-input id="oldPasswordInput" type="password" required
|
| i18n-values="error:oldPasswordIncorrect;
|
| label:oldPasswordHint">
|
| </gaia-input>
|
| - <gaia-button type="link" on-tap="{{onForgotPasswordClicked}}"
|
| + <gaia-button type="link" on-tap="onForgotPasswordClicked_"
|
| i18n-content="forgotOldPasswordButtonText">
|
| </gaia-button>
|
| </gaia-input-form>
|
| </gaia-card>
|
| - </section>
|
| - <section flex>
|
| - <gaia-card>
|
| - <gaia-header class="header" email="{{email}}">
|
| + </neon-animatable>
|
| + <neon-animatable class="fit">
|
| + <gaia-card class="fit">
|
| + <gaia-header class="header" email="[[email]]">
|
| </gaia-header>
|
| <div class="footer">
|
| - <div horizontal layout center class="gaia-body-text">
|
| - <core-icon icon="warning"></core-icon>
|
| - <p flex i18n-content="passwordChangedProceedAnywayTitle">
|
| + <div class="gaia-body-text horizontal layout center">
|
| + <iron-icon icon="warning"></iron-icon>
|
| + <p i18n-content="passwordChangedProceedAnywayTitle" class="flex">
|
| </p>
|
| </div>
|
| - <div horizontal layout justified center>
|
| - <gaia-button type="link" on-tap="{{onTryAgainClicked}}"
|
| + <div class="horizontal layout justified center">
|
| + <gaia-button type="link" on-tap="onTryAgainClicked_"
|
| i18n-content="passwordChangedTryAgain">
|
| </gaia-button>
|
| - <gaia-button id="proceedAnywayBtn" on-tap="{{onProceedClicked}}"
|
| + <gaia-button id="proceedAnywayBtn" on-tap="onProceedClicked_"
|
| i18n-content="proceedAnywayButton">
|
| </gaia-button>
|
| </div>
|
| </div>
|
| </gaia-card>
|
| - </section>
|
| - <section flex vertical layout center-justified>
|
| - <throbber-notice i18n-values="text:gaiaLoadingNewGaia" self-center>
|
| + </neon-animatable>
|
| + <neon-animatable class="fit">
|
| + <throbber-notice class="fit" i18n-values="text:gaiaLoadingNewGaia">
|
| </throbber-notice>
|
| - </section>
|
| - </core-animated-pages>
|
| - <button id="closeButton" is="gaia-icon-button" icon="close"
|
| - i18n-values="aria-label:closeButton" on-click="{{onClose}}">
|
| - </button>
|
| + </neon-animatable>
|
| + </neon-animated-pages>
|
| + <gaia-icon-button id="closeButton" icon="close" on-tap="onClose_"
|
| + disabled="[[disabled]]" i18n-values="aria-label:closeButton">
|
| + </gaia-icon-button>
|
| </template>
|
| -</polymer-element>
|
| +</dom-module>
|
| +
|
|
|