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"> |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 51 </defs> | 51 </defs> |
| 52 </svg> | 52 </svg> |
| 53 </iron-iconset-svg> | 53 </iron-iconset-svg> |
| 54 | 54 |
| 55 <dom-module name="oobe-welcome-md"> | 55 <dom-module name="oobe-welcome-md"> |
| 56 <template> | 56 <template> |
| 57 <link rel="stylesheet" href="oobe_dialog_host.css"> | 57 <link rel="stylesheet" href="oobe_dialog_host.css"> |
| 58 <link rel="stylesheet" href="oobe_welcome.css"> | 58 <link rel="stylesheet" href="oobe_welcome.css"> |
| 59 <link rel="stylesheet" href="oobe_dialog_parameters.css"> | 59 <link rel="stylesheet" href="oobe_dialog_parameters.css"> |
| 60 <oobe-welcome-dialog id="welcomeScreen" role="dialog" | 60 <oobe-welcome-dialog id="welcomeScreen" role="dialog" |
| 61 aria-label="[[formatMessage_('networkScreenGreeting')]]" | 61 aria-label$="[[formatMessage_('networkScreenGreeting')]]" |
| 62 current-language="[[currentLanguage]]" | 62 current-language="[[currentLanguage]]" |
| 63 on-language-button-clicked="onWelcomeSelectLanguageButtonClicked_" | 63 on-language-button-clicked="onWelcomeSelectLanguageButtonClicked_" |
| 64 on-accessibility-button-clicked="onWelcomeAccessibilityButtonClicked_" | 64 on-accessibility-button-clicked="onWelcomeAccessibilityButtonClicked_" |
| 65 on-timezone-button-clicked="onWelcomeTimezoneButtonClicked_" | 65 on-timezone-button-clicked="onWelcomeTimezoneButtonClicked_" |
| 66 on-next-button-clicked="onWelcomeNextButtonClicked_" | 66 on-next-button-clicked="onWelcomeNextButtonClicked_" |
| 67 timezone-button-visible="[[isTimezoneButtonVisible_(highlightStrength)]] " | 67 timezone-button-visible="[[isTimezoneButtonVisible_(highlightStrength)]] " |
| 68 debugging-link-visible="[[debuggingLinkVisible]]" | 68 debugging-link-visible="[[debuggingLinkVisible]]" |
| 69 > | 69 > |
| 70 </oobe-welcome-dialog> | 70 </oobe-welcome-dialog> |
| 71 <oobe-dialog id="languageScreen" role="dialog" hidden has-buttons | 71 <oobe-dialog id="languageScreen" role="dialog" hidden has-buttons |
| 72 aria-label="[[formatMessage_('languageSectionTitle')]]"> | 72 aria-label$="[[formatMessage_('languageSectionTitle')]]"> |
| 73 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> | 73 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> |
| 74 <div class="header"> | 74 <div class="header"> |
| 75 <h1 class="title" i18n-content="languageSectionTitle"></h1> | 75 <h1 class="title" i18n-content="languageSectionTitle"></h1> |
| 76 </div> | 76 </div> |
| 77 <div class="footer layout vertical"> | 77 <div class="footer layout vertical"> |
| 78 <template is="dom-if" if="[[enabled]]"> | 78 <template is="dom-if" if="[[enabled]]"> |
| 79 <div id="languageDropdownContainer" | 79 <div id="languageDropdownContainer" |
| 80 class="flex layout horizontal justified language-selection-entry"> | 80 class="flex layout horizontal justified language-selection-entry"> |
| 81 <div class="language-selection-title layout vertical center-justifie d" | 81 <div class="language-selection-title layout vertical center-justifie d" |
| 82 i18n-content="languageDropdownTitle"> | 82 i18n-content="languageDropdownTitle"> |
| 83 </div> | 83 </div> |
| 84 <oobe-i18n-dropdown id="languageSelect" items="[[languages]]" | 84 <oobe-i18n-dropdown id="languageSelect" items="[[languages]]" |
| 85 on-select-item="onLanguageSelected_" | 85 on-select-item="onLanguageSelected_" |
| 86 class="focus-on-show"> | 86 class="focus-on-show" |
| 87 label-for-aria="[[formatMessage_('languageDropdownLabel')]]"> | |
|
michaelpg
2017/02/28 10:38:17
no parameter means no need for formatMessage_, jus
Alexander Alekseev
2017/03/01 00:48:34
I don't know how to use i18n-values for polymer at
michaelpg
2017/03/01 20:26:49
It is explained in i18n_template_no_process.js and
Alexander Alekseev
2017/03/01 21:49:09
Done.
| |
| 87 </oobe-i18n-dropdown> | 88 </oobe-i18n-dropdown> |
| 88 </div> | 89 </div> |
| 89 <div id="keyboardDropdownContainer" | 90 <div id="keyboardDropdownContainer" |
| 90 class="flex layout horizontal justified language-selection-entry"> | 91 class="flex layout horizontal justified language-selection-entry"> |
| 91 <div class="language-selection-title layout vertical center-justifie d" | 92 <div class="language-selection-title layout vertical center-justifie d" |
| 92 i18n-content="keyboardDropdownTitle"> | 93 i18n-content="keyboardDropdownTitle"> |
| 93 </div> | 94 </div> |
| 94 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]" | 95 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]" |
| 95 on-select-item="onKeyboardSelected_"> | 96 on-select-item="onKeyboardSelected_" |
| 97 label-for-aria="[[formatMessage_('keyboardDropdownLabel')]]"> | |
| 96 </oobe-i18n-dropdown> | 98 </oobe-i18n-dropdown> |
| 97 </div> | 99 </div> |
| 98 </template> | 100 </template> |
| 99 </div> | 101 </div> |
| 100 <div class="bottom-buttons layout horizontal end-justified"> | 102 <div class="bottom-buttons layout horizontal end-justified"> |
| 101 <oobe-text-button inverse on-tap="closeLanguageSection_"> | 103 <oobe-text-button inverse on-tap="closeLanguageSection_"> |
| 102 <div i18n-content="oobeOKButtonText"></div> | 104 <div i18n-content="oobeOKButtonText"></div> |
| 103 </oobe-text-button> | 105 </oobe-text-button> |
| 104 </div> | 106 </div> |
| 105 </oobe-dialog> | 107 </oobe-dialog> |
| 106 <oobe-dialog id="accessibilityScreen" role="dialog" hidden has-buttons | 108 <oobe-dialog id="accessibilityScreen" role="dialog" hidden has-buttons |
| 107 aria-label="[[formatMessage_('accessibilitySectionTitle')]]"> | 109 aria-label$="[[formatMessage_('accessibilitySectionTitle')]]"> |
| 108 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon> | 110 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon> |
| 109 <div class="header"> | 111 <div class="header"> |
| 110 <h1 class="title" i18n-content="accessibilitySectionTitle"></h1> | 112 <h1 class="title" i18n-content="accessibilitySectionTitle"></h1> |
| 111 <div class="subtitle" i18n-content="accessibilitySectionHint"></div> | 113 <div class="subtitle" i18n-content="accessibilitySectionHint"></div> |
| 112 </div> | 114 </div> |
| 113 <div class="footer layout vertical"> | 115 <div class="footer layout vertical"> |
| 114 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]" | 116 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]" |
| 115 on-change="onA11yOptionChanged_" | 117 on-change="onA11yOptionChanged_" |
| 116 chrome-message="enableSpokenFeedback" | 118 chrome-message="enableSpokenFeedback" |
| 117 label-for-aria="[[formatMessage_('spokenFeedbackOption')]]" | 119 label-for-aria="[[formatMessage_('spokenFeedbackOption')]]" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 </span> | 165 </span> |
| 164 </oobe-a11y-option> | 166 </oobe-a11y-option> |
| 165 </div> | 167 </div> |
| 166 <div class="bottom-buttons layout horizontal end-justified"> | 168 <div class="bottom-buttons layout horizontal end-justified"> |
| 167 <oobe-text-button inverse on-tap="closeAccessibilitySection_"> | 169 <oobe-text-button inverse on-tap="closeAccessibilitySection_"> |
| 168 <div i18n-content="oobeOKButtonText"></div> | 170 <div i18n-content="oobeOKButtonText"></div> |
| 169 </oobe-text-button> | 171 </oobe-text-button> |
| 170 </div> | 172 </div> |
| 171 </oobe-dialog> | 173 </oobe-dialog> |
| 172 <oobe-dialog id="timezoneScreen" role="dialog" hidden has-buttons | 174 <oobe-dialog id="timezoneScreen" role="dialog" hidden has-buttons |
| 173 aria-label="[[formatMessage_('timezoneSectionTitle')]]"> | 175 aria-label$="[[formatMessage_('timezoneSectionTitle')]]"> |
| 174 <iron-icon icon="oobe-welcome-64:timezone" class="oobe-icon"></iron-icon> | 176 <iron-icon icon="oobe-welcome-64:timezone" class="oobe-icon"></iron-icon> |
| 175 <div class="header"> | 177 <div class="header"> |
| 176 <h1 class="title" i18n-content="timezoneSectionTitle"></h1> | 178 <h1 class="title" i18n-content="timezoneSectionTitle"></h1> |
| 177 </div> | 179 </div> |
| 178 <div class="footer layout vertical"> | 180 <div class="footer layout vertical"> |
| 179 <div class="flex layout horizontal justified timezone-selection-entry"> | 181 <div class="flex layout horizontal justified timezone-selection-entry"> |
| 180 <div class="timezone-selection-title layout vertical center-justified" | 182 <div class="timezone-selection-title layout vertical center-justified" |
| 181 i18n-content="timezoneDropdownTitle"> | 183 i18n-content="timezoneDropdownTitle"> |
| 182 </div> | 184 </div> |
| 183 <oobe-i18n-dropdown id="timezoneSelect" items="[[timezones]]" | 185 <oobe-i18n-dropdown id="timezoneSelect" items="[[timezones]]" |
| 184 on-select-item="onTimezoneSelected_" | 186 on-select-item="onTimezoneSelected_" |
| 185 label-for-aria="[[formatMessage_('timezoneDropdownTitle')]]" | 187 label-for-aria="[[formatMessage_('timezoneDropdownTitle')]]" |
| 186 class="focus-on-show"> | 188 class="focus-on-show"> |
| 187 </oobe-i18n-dropdown> | 189 </oobe-i18n-dropdown> |
| 188 </div> | 190 </div> |
| 189 </div> | 191 </div> |
| 190 <div class="bottom-buttons layout horizontal end-justified"> | 192 <div class="bottom-buttons layout horizontal end-justified"> |
| 191 <oobe-text-button inverse on-tap="closeTimezoneSection_"> | 193 <oobe-text-button inverse on-tap="closeTimezoneSection_"> |
| 192 <div i18n-content="oobeOKButtonText"></div> | 194 <div i18n-content="oobeOKButtonText"></div> |
| 193 </oobe-text-button> | 195 </oobe-text-button> |
| 194 </div> | 196 </div> |
| 195 </oobe-dialog> | 197 </oobe-dialog> |
| 196 <oobe-dialog id="networkSelectionScreen" role="dialog" hidden has-buttons | 198 <oobe-dialog id="networkSelectionScreen" role="dialog" hidden has-buttons |
| 197 aria-label="[[formatMessage_('networkSectionTitle')]]" | 199 aria-label$="[[formatMessage_('networkSectionTitle')]]" |
| 198 on-show-dialog="onNetworkSelectionScreenShown_"> | 200 on-show-dialog="onNetworkSelectionScreenShown_"> |
| 199 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> | 201 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> |
| 200 <div class="header"> | 202 <div class="header"> |
| 201 <h1 class="title" i18n-content="networkSectionTitle"></h1> | 203 <h1 class="title" i18n-content="networkSectionTitle"></h1> |
| 202 <div class="subtitle" i18n-content="networkSectionHint"></div> | 204 <div class="subtitle" i18n-content="networkSectionHint"></div> |
| 203 </div> | 205 </div> |
| 204 <div class="footer layout vertical"> | 206 <div class="footer layout vertical"> |
| 205 <cr-network-select id="networkSelect" | 207 <cr-network-select id="networkSelect" |
| 206 on-default-network-changed="onDefaultNetworkChanged_" | 208 on-default-network-changed="onDefaultNetworkChanged_" |
| 207 on-network-item-selected="onNetworkListNetworkItemSelected_" | 209 on-network-item-selected="onNetworkListNetworkItemSelected_" |
| 208 on-custom-item-selected="onNetworkListCustomItemSelected_" | 210 on-custom-item-selected="onNetworkListCustomItemSelected_" |
| 209 custom-items="[[getNetworkCustomItems_()]]" | 211 custom-items="[[getNetworkCustomItems_()]]" |
| 210 no-bottom-scroll-border | 212 no-bottom-scroll-border |
| 211 class="focus-on-show"> | 213 class="focus-on-show"> |
| 212 </cr-network-select> | 214 </cr-network-select> |
| 213 </div> | 215 </div> |
| 214 <div class="bottom-buttons layout horizontal justified"> | 216 <div class="bottom-buttons layout horizontal justified"> |
| 215 <oobe-back-button on-tap="onNetworkSelectionBackButtonPressed_"> | 217 <oobe-back-button on-tap="onNetworkSelectionBackButtonPressed_"> |
| 216 </oobe-back-button> | 218 </oobe-back-button> |
| 217 <oobe-next-button disabled="[[!isConnected_]]" | 219 <oobe-next-button disabled="[[!isConnected_]]" |
| 218 on-tap="onSelectedNetworkConnected_"> | 220 on-tap="onSelectedNetworkConnected_"> |
| 219 </oobe-next-button> | 221 </oobe-next-button> |
| 220 </div> | 222 </div> |
| 221 </oobe-dialog> | 223 </oobe-dialog> |
| 222 </template> | 224 </template> |
| 223 </dom-module> | 225 </dom-module> |
| OLD | NEW |