| OLD | NEW |
| 1 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 1 <!-- Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 Use of this source code is governed by a BSD-style license that can be | 2 Use of this source code is governed by a BSD-style license that can be |
| 3 found in the LICENSE file. --> | 3 found in the LICENSE file. --> |
| 4 | 4 |
| 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> | 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> |
| 6 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_selec
t.html"> | 6 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_selec
t.html"> |
| 7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i
conset-svg.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-i
conset-svg.html"> |
| 11 | 11 |
| 12 <iron-iconset-svg name="oobe-welcome" size="24"> | 12 <iron-iconset-svg name="oobe-welcome" size="24"> |
| 13 <svg> | 13 <svg> |
| 14 <defs> | 14 <defs> |
| 15 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g> | 15 <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></g> |
| 16 <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7.
08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76
10 0l2-2C15.14 9.14 8.87 9.14 5 13z"></path></g> | 16 <g id="wifi"><path d="M1 9l2 2c4.97-4.97 13.03-4.97 18 0l2-2C16.93 2.93 7.
08 2.93 1 9zm8 8l3 3 3-3c-1.65-1.66-4.34-1.66-6 0zm-4-4l2 2c2.76-2.76 7.24-2.76
10 0l2-2C15.14 9.14 8.87 9.14 5 13z"></path></g> |
| 17 </defs> | 17 </defs> |
| 18 </svg> | 18 </svg> |
| 19 </iron-iconset-svg> | 19 </iron-iconset-svg> |
| 20 | 20 |
| 21 <dom-module name="oobe-welcome-md"> | 21 <dom-module name="oobe-welcome-md"> |
| 22 <link rel="stylesheet" href="oobe_welcome.css"> | 22 <link rel="stylesheet" href="oobe_welcome.css"> |
| 23 <template> | 23 <template> |
| 24 <oobe-card id="welcomeSection" class="fit" hidden="[[networkSelectionScreenS
hown]]"> | 24 <oobe-card id="welcomeSection" class="fit" hidden="[[!welcomeScreenShown]]"> |
| 25 <div class="header flex vertical layout end-justified start"> | 25 <div class="header flex vertical layout end-justified start"> |
| 26 <h1 class="welcome-message" i18n-content="networkScreenGreeting"></h1> | 26 <h1 class="welcome-message" i18n-content="networkScreenGreeting"></h1> |
| 27 </div> | 27 </div> |
| 28 <div class="footer flex vertical layout justified"> | 28 <div class="footer flex vertical layout justified"> |
| 29 <div class="welcome-next flex vertical layout center"> | 29 <div class="welcome-next flex vertical layout center"> |
| 30 <oobe-next-button id="welcomeNextButton" on-tap="onWelcomeNextButtonCl
icked_"></oobe-next-button> | 30 <oobe-next-button id="welcomeNextButton" |
| 31 on-tap="onWelcomeNextButtonClicked_"> |
| 32 </oobe-next-button> |
| 31 </div> | 33 </div> |
| 32 <div class="flex horizontal layout justified"> | 34 <div class="flex horizontal layout justified"> |
| 33 <div class="buttonbox layout vertical"> | 35 <div class="buttonbox layout vertical" |
| 34 <iron-icon icon="icons:language" class="bottom-button self-center"><
/iron-icon> | 36 on-tap="onWelcomeSelectLanguageButtonClicked_"> |
| 37 <iron-icon icon="icons:language" class="bottom-button self-center"> |
| 38 </iron-icon> |
| 35 <div id="currentLanguage">[[currentLanguage]]</div> | 39 <div id="currentLanguage">[[currentLanguage]]</div> |
| 36 </div> | 40 </div> |
| 37 <div class="buttonbox layout vertical"> | 41 <div class="buttonbox layout vertical"> |
| 38 <iron-icon icon="icons:accessibility" class="bottom-button self-cent
er"></iron-icon> | 42 <iron-icon icon="icons:accessibility" |
| 43 class="bottom-button self-center"> |
| 44 </iron-icon> |
| 39 <div id="accessibilityLabel" i18n-content="accessibilityLink"></div> | 45 <div id="accessibilityLabel" i18n-content="accessibilityLink"></div> |
| 40 </div> | 46 </div> |
| 41 </div> | 47 </div> |
| 42 </div> | 48 </div> |
| 43 </oobe-card> | 49 </oobe-card> |
| 44 <oobe-dialog id="networkSection" class="fit" hidden="[[!networkSelectionScre
enShown]]"> | 50 <oobe-dialog class="fit" hidden="[[!languageSelectionScreenShown]]" |
| 51 has-buttons> |
| 52 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> |
| 53 <div class="header flex layout vertical end-justified start"> |
| 54 <h1 class="welcome-message" i18n-content="languageSectionTitle"></h1> |
| 55 </div> |
| 56 <div class="footer layout vertical"> |
| 57 <template is="dom-if" if="[[enabled]]"> |
| 58 <div id="languageDropdownContainer" |
| 59 class="flex layout horizontal justified language-selection-entry"> |
| 60 <div class="layout vertical center-justified" |
| 61 i18n-content="languageDropdownTitle"> |
| 62 </div> |
| 63 <oobe-i18n-dropdown id="languageSelect" items="[[languages]]" |
| 64 on-select-item="onLanguageSelected_" |
| 65 label="$i18n{languageDropdownTitle}"> |
| 66 </oobe-i18n-dropdown> |
| 67 </div> |
| 68 <div id="keyboardDropdownContainer" |
| 69 class="flex layout horizontal justified language-selection-entry"> |
| 70 <div class="layout vertical center-justified" |
| 71 i18n-content="keyboardDropdownTitle"> |
| 72 </div> |
| 73 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]" |
| 74 on-select-item="onKeyboardSelected_" |
| 75 label="$i18n{keyboardDropdownTitle}"> |
| 76 </oobe-i18n-dropdown> |
| 77 </div> |
| 78 </template> |
| 79 </div> |
| 80 <div class="bottom-buttons layout horizontal"> |
| 81 <oobe-text-button inverse on-tap="closeLanguageSection_" |
| 82 i18n-content="oobeOKButtonText"> |
| 83 </oobe-text-button> |
| 84 </div> |
| 85 </oobe-dialog> |
| 86 <oobe-dialog id="networkSection" class="fit" |
| 87 hidden="[[!networkSelectionScreenShown]]"> |
| 45 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> | 88 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> |
| 46 <div class="header flex vertical layout end-justified start"> | 89 <div class="header flex layout vertical end-justified start"> |
| 47 <h1 class="welcome-message" i18n-content="networkSectionTitle"></h1> | 90 <h1 class="welcome-message" i18n-content="networkSectionTitle"></h1> |
| 48 <h1 class="welcome-message-hint" i18n-content="networkSectionHint"></h1> | 91 <h1 class="welcome-message-hint" i18n-content="networkSectionHint"></h1> |
| 49 </div> | 92 </div> |
| 50 <div class="footer flex vertical layout justified"> | 93 <div class="footer flex layout vertical justified"> |
| 51 <cr-network-select id="networkSelect" | 94 <cr-network-select id="networkSelect" |
| 52 on-network-connected="onNetworkConnected_" | 95 on-network-connected="onNetworkConnected_" |
| 53 on-network-item-selected="onNetworkListNetworkItemSelected_" | 96 on-network-item-selected="onNetworkListNetworkItemSelected_" |
| 54 on-custom-item-selected="onNetworkListCustomItemSelected_" | 97 on-custom-item-selected="onNetworkListCustomItemSelected_" |
| 55 custom-items="[[_getNetworkCustomItems()]]" | 98 custom-items="[[_getNetworkCustomItems()]]" |
| 56 max-height="280"> | 99 max-height="280"> |
| 57 </cr-network-select> | 100 </cr-network-select> |
| 58 </div> | 101 </div> |
| 59 </oobe-dialog> | 102 </oobe-dialog> |
| 60 </template> | 103 </template> |
| 61 </dom-module> | 104 </dom-module> |
| 62 | 105 |
| OLD | NEW |