Chromium Code Reviews| 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 id="langugeButton" class="buttonbox layout vertical" |
|
michaelpg
2016/07/29 06:26:50
languageButton
stevenjb
2016/07/29 16:11:52
Is this id needed?
Alexander Alekseev
2016/08/01 22:21:43
Done.
| |
| 34 <iron-icon icon="icons:language" class="bottom-button self-center">< /iron-icon> | 36 on-click="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 id="languageSection" class="fit" |
|
stevenjb
2016/07/29 16:11:52
id needed?
Alexander Alekseev
2016/08/01 22:21:43
Done.
| |
| 51 hidden="[[!languageSelectionScreenShown]]" has-buttons> | |
| 52 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> | |
| 53 <div class="header flex vertical layout end-justified start"> | |
|
stevenjb
2016/07/29 16:11:52
nit: 'layout vertical'
Alexander Alekseev
2016/08/01 22:21:43
Done.
| |
| 54 <h1 class="welcome-message" i18n-content="languageSectionTitle"></h1> | |
| 55 </h1> | |
|
michaelpg
2016/07/29 06:26:50
remove
Alexander Alekseev
2016/08/01 22:21:43
Done.
| |
| 56 </div> | |
| 57 <div class="footer vertical layout"> | |
|
stevenjb
2016/07/29 16:11:52
nit: 'layout vertical' (and below; use consistent
Alexander Alekseev
2016/08/01 22:21:43
Done.
| |
| 58 <div id="languageDropdownContainer" | |
| 59 class="flex horizontal layout justified language-selection-entry"> | |
| 60 <div id="languageDropdownTitle" i18n-content="languageDropdownTitle"> | |
| 61 </div> | |
| 62 <oobe-i18n-dropdown id="languageSelect" items="[[oobeLanguages]]" | |
| 63 on-select-item="onLanguageSelected_"> | |
| 64 </oobe-i18n-dropdown> | |
| 65 </div> | |
| 66 <div id="keyboardDropdownContainer" | |
| 67 class="flex horizontal layout justified language-selection-entry"> | |
| 68 <div id="keyboardDropdownTitle" i18n-content="keyboardDropdownTitle"> | |
| 69 </div> | |
| 70 <oobe-i18n-dropdown id="keyboardSelect" items="[[oobeKeyboards]]" | |
| 71 on-select-item="onKeyboardSelected_"> | |
| 72 </oobe-i18n-dropdown> | |
| 73 </div> | |
| 74 </div> | |
| 75 <div class="bottom-buttons layout horizontal"> | |
| 76 <oobe-text-button label="[[getText_('OobeOKButtonText')]]" | |
| 77 inverse on-tap="closeLanguageSection_"> | |
| 78 </oobe-text-button> | |
| 79 </div> | |
| 80 </oobe-dialog> | |
| 81 <oobe-dialog id="networkSection" class="fit" | |
| 82 hidden="[[!networkSelectionScreenShown]]"> | |
| 45 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> | 83 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> |
| 46 <div class="header flex vertical layout end-justified start"> | 84 <div class="header flex vertical layout end-justified start"> |
| 47 <h1 class="welcome-message" i18n-content="networkSectionTitle"></h1> | 85 <h1 class="welcome-message" i18n-content="networkSectionTitle"></h1> |
| 48 <h1 class="welcome-message-hint" i18n-content="networkSectionHint"></h1> | 86 <h1 class="welcome-message-hint" i18n-content="networkSectionHint"></h1> |
| 49 </div> | 87 </div> |
| 50 <div class="footer flex vertical layout justified"> | 88 <div class="footer flex vertical layout justified"> |
| 51 <cr-network-select id="networkSelect" | 89 <cr-network-select id="networkSelect" |
| 52 on-network-connected="onNetworkConnected_" | 90 on-network-connected="onNetworkConnected_" |
| 53 on-network-item-selected="onNetworkListNetworkItemSelected_" | 91 on-network-item-selected="onNetworkListNetworkItemSelected_" |
| 54 on-custom-item-selected="onNetworkListCustomItemSelected_" | 92 on-custom-item-selected="onNetworkListCustomItemSelected_" |
| 55 custom-items="[[_getNetworkCustomItems()]]" | 93 custom-items="[[_getNetworkCustomItems()]]" |
| 56 max-height="280"> | 94 max-height="280"> |
| 57 </cr-network-select> | 95 </cr-network-select> |
| 58 </div> | 96 </div> |
| 59 </oobe-dialog> | 97 </oobe-dialog> |
| 60 </template> | 98 </template> |
| 61 </dom-module> | 99 </dom-module> |
| 62 | 100 |
| OLD | NEW |