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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 74 </div> | 74 </div> |
| 75 <div class="footer layout vertical"> | 75 <div class="footer layout vertical"> |
| 76 <template is="dom-if" if="[[enabled]]"> | 76 <template is="dom-if" if="[[enabled]]"> |
| 77 <div id="languageDropdownContainer" | 77 <div id="languageDropdownContainer" |
| 78 class="flex layout horizontal justified language-selection-entry"> | 78 class="flex layout horizontal justified language-selection-entry"> |
| 79 <div class="language-selection-title layout vertical center-justifie d"> | 79 <div class="language-selection-title layout vertical center-justifie d"> |
| 80 $i18n{languageDropdownTitle} | 80 $i18n{languageDropdownTitle} |
| 81 </div> | 81 </div> |
| 82 <oobe-i18n-dropdown id="languageSelect" items="[[languages]]" | 82 <oobe-i18n-dropdown id="languageSelect" items="[[languages]]" |
| 83 on-select-item="onLanguageSelected_" | 83 on-select-item="onLanguageSelected_" |
| 84 label="$i18n{languageDropdownTitle}"> | 84 aria-label="[[formatMessage_(languageDropdownLabel_, currentLang uage)]]" |
|
stevenjb
2017/02/08 20:47:53
Fix wrapping ( you can separate parameters on diff
Alexander Alekseev
2017/02/08 21:43:53
Done.
| |
| 85 > | |
| 85 </oobe-i18n-dropdown> | 86 </oobe-i18n-dropdown> |
| 86 </div> | 87 </div> |
| 87 <div id="keyboardDropdownContainer" | 88 <div id="keyboardDropdownContainer" |
| 88 class="flex layout horizontal justified language-selection-entry"> | 89 class="flex layout horizontal justified language-selection-entry"> |
| 89 <div class="language-selection-title layout vertical center-justifie d"> | 90 <div class="language-selection-title layout vertical center-justifie d"> |
| 90 $i18n{keyboardDropdownTitle} | 91 $i18n{keyboardDropdownTitle} |
| 91 </div> | 92 </div> |
| 92 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]" | 93 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]" |
| 93 on-select-item="onKeyboardSelected_" | 94 on-select-item="onKeyboardSelected_" |
| 94 label="$i18n{keyboardDropdownTitle}"> | 95 aria-label="[[formatMessage_(keyboardDropdownLabel_, currentKeyb oard)]]" |
|
stevenjb
2017/02/08 20:47:53
wrapping
Alexander Alekseev
2017/02/08 21:43:53
Done.
| |
| 96 > | |
| 95 </oobe-i18n-dropdown> | 97 </oobe-i18n-dropdown> |
| 96 </div> | 98 </div> |
| 97 </template> | 99 </template> |
| 98 </div> | 100 </div> |
| 99 <div class="bottom-buttons layout horizontal end-justified"> | 101 <div class="bottom-buttons layout horizontal end-justified"> |
| 100 <oobe-text-button inverse on-tap="closeLanguageSection_"> | 102 <oobe-text-button inverse on-tap="closeLanguageSection_"> |
| 101 <div>$i18n{oobeOKButtonText}</div> | 103 <div>$i18n{oobeOKButtonText}</div> |
| 102 </oobe-text-button> | 104 </oobe-text-button> |
| 103 </div> | 105 </div> |
| 104 </oobe-dialog> | 106 </oobe-dialog> |
| 105 <oobe-dialog id="accessibilityScreen" | 107 <oobe-dialog id="accessibilityScreen" |
| 106 hidden="[[!accessibilityOptionsScreenShown]]" has-buttons> | 108 hidden="[[!accessibilityOptionsScreenShown]]" has-buttons> |
| 107 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon> | 109 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon> |
| 108 <div class="header"> | 110 <div class="header"> |
| 109 <h1 class="title">$i18n{accessibilitySectionTitle}</h1> | 111 <h1 class="title">$i18n{accessibilitySectionTitle}</h1> |
| 110 <div class="subtitle">$i18n{accessibilitySectionHint}</div> | 112 <div class="subtitle">$i18n{accessibilitySectionHint}</div> |
| 111 </div> | 113 </div> |
| 112 <div class="footer layout vertical"> | 114 <div class="footer layout vertical"> |
| 113 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]" | 115 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]" |
| 114 on-change="onA11yOptionChanged_" | 116 on-change="onA11yOptionChanged_" |
| 115 chrome-message="enableSpokenFeedback"> | 117 chrome-message="enableSpokenFeedback" |
| 118 aria-label="$i18n{spokenFeedbackOption}"> | |
| 116 <span class="title">$i18n{spokenFeedbackOption}</span> | 119 <span class="title">$i18n{spokenFeedbackOption}</span> |
| 117 <span class="checked-value">$i18n{spokenFeedbackOptionOn}</span> | 120 <span class="checked-value">$i18n{spokenFeedbackOptionOn}</span> |
| 118 <span class="unchecked-value">$i18n{spokenFeedbackOptionOff}</span> | 121 <span class="unchecked-value">$i18n{spokenFeedbackOptionOff}</span> |
| 119 </oobe-a11y-option> | 122 </oobe-a11y-option> |
| 120 <oobe-a11y-option checked="[[a11yStatus.largeCursorEnabled]]" | 123 <oobe-a11y-option checked="[[a11yStatus.largeCursorEnabled]]" |
| 121 on-change="onA11yOptionChanged_" | 124 on-change="onA11yOptionChanged_" |
| 122 chrome-message="enableLargeCursor"> | 125 chrome-message="enableLargeCursor" |
| 126 aria-label="$i18n{largeCursorOption}"> | |
| 123 <span class="title">$i18n{largeCursorOption}</span> | 127 <span class="title">$i18n{largeCursorOption}</span> |
| 124 <span class="checked-value">$i18n{largeCursorOptionOn}</span> | 128 <span class="checked-value">$i18n{largeCursorOptionOn}</span> |
| 125 <span class="unchecked-value">$i18n{largeCursorOptionOff}</span> | 129 <span class="unchecked-value">$i18n{largeCursorOptionOff}</span> |
| 126 </oobe-a11y-option> | 130 </oobe-a11y-option> |
| 127 <oobe-a11y-option checked="[[a11yStatus.highContrastEnabled]]" | 131 <oobe-a11y-option checked="[[a11yStatus.highContrastEnabled]]" |
| 128 on-change="onA11yOptionChanged_" | 132 on-change="onA11yOptionChanged_" |
| 129 chrome-message="enableHighContrast"> | 133 chrome-message="enableHighContrast" |
| 134 aria-label="$i18n{highContrastOption}"> | |
| 130 <span class="title">$i18n{highContrastOption}</span> | 135 <span class="title">$i18n{highContrastOption}</span> |
| 131 <span class="checked-value">$i18n{highContrastOptionOn}</span> | 136 <span class="checked-value">$i18n{highContrastOptionOn}</span> |
| 132 <span class="unchecked-value">$i18n{highContrastOptionOff}</span> | 137 <span class="unchecked-value">$i18n{highContrastOptionOff}</span> |
| 133 </oobe-a11y-option> | 138 </oobe-a11y-option> |
| 134 <oobe-a11y-option checked="[[a11yStatus.screenMagnifierEnabled]]" | 139 <oobe-a11y-option checked="[[a11yStatus.screenMagnifierEnabled]]" |
| 135 on-change="onA11yOptionChanged_" | 140 on-change="onA11yOptionChanged_" |
| 136 chrome-message="enableScreenMagnifier"> | 141 chrome-message="enableScreenMagnifier" |
| 142 aria-label="$i18n{screenMagnifierOption}"> | |
| 137 <span class="title">$i18n{screenMagnifierOption}</span> | 143 <span class="title">$i18n{screenMagnifierOption}</span> |
| 138 <span class="checked-value">$i18n{screenMagnifierOptionOn}</span> | 144 <span class="checked-value">$i18n{screenMagnifierOptionOn}</span> |
| 139 <span class="unchecked-value">$i18n{screenMagnifierOptionOff}</span> | 145 <span class="unchecked-value">$i18n{screenMagnifierOptionOff}</span> |
| 140 </oobe-a11y-option> | 146 </oobe-a11y-option> |
| 141 <oobe-a11y-option checked="[[a11yStatus.virtualKeyboardEnabled]]" | 147 <oobe-a11y-option checked="[[a11yStatus.virtualKeyboardEnabled]]" |
| 142 on-change="onA11yOptionChanged_" | 148 on-change="onA11yOptionChanged_" |
| 143 chrome-message="enableVirtualKeyboard"> | 149 chrome-message="enableVirtualKeyboard" |
| 150 aria-label="$i18n{virtualKeyboardOption}"> | |
| 144 <span class="title">$i18n{virtualKeyboardOption}</span> | 151 <span class="title">$i18n{virtualKeyboardOption}</span> |
| 145 <span class="checked-value">$i18n{virtualKeyboardOptionOn}</span> | 152 <span class="checked-value">$i18n{virtualKeyboardOptionOn}</span> |
| 146 <span class="unchecked-value">$i18n{virtualKeyboardOptionOff}</span> | 153 <span class="unchecked-value">$i18n{virtualKeyboardOptionOff}</span> |
| 147 </oobe-a11y-option> | 154 </oobe-a11y-option> |
| 148 </div> | 155 </div> |
| 149 <div class="bottom-buttons layout horizontal end-justified"> | 156 <div class="bottom-buttons layout horizontal end-justified"> |
| 150 <oobe-text-button inverse on-tap="closeAccessibilitySection_"> | 157 <oobe-text-button inverse on-tap="closeAccessibilitySection_"> |
| 151 <div>$i18n{oobeOKButtonText}</div> | 158 <div>$i18n{oobeOKButtonText}</div> |
| 152 </oobe-text-button> | 159 </oobe-text-button> |
| 153 </div> | 160 </div> |
| 154 </oobe-dialog> | 161 </oobe-dialog> |
| 155 <oobe-dialog id="timezoneScreen" hidden="[[!timezoneScreenShown]]" | 162 <oobe-dialog id="timezoneScreen" hidden="[[!timezoneScreenShown]]" |
| 156 has-buttons> | 163 has-buttons> |
| 157 <iron-icon icon="oobe-welcome-64:timezone" class="oobe-icon"></iron-icon> | 164 <iron-icon icon="oobe-welcome-64:timezone" class="oobe-icon"></iron-icon> |
| 158 <div class="header"> | 165 <div class="header"> |
| 159 <h1 class="title">$i18n{timezoneSectionTitle}</h1> | 166 <h1 class="title">$i18n{timezoneSectionTitle}</h1> |
| 160 </div> | 167 </div> |
| 161 <div class="footer layout vertical"> | 168 <div class="footer layout vertical"> |
| 162 <div class="flex layout horizontal justified timezone-selection-entry"> | 169 <div class="flex layout horizontal justified timezone-selection-entry"> |
| 163 <div class="timezone-selection-title layout vertical center-justified" > | 170 <div class="timezone-selection-title layout vertical center-justified" > |
| 164 $i18n{timezoneDropdownTitle} | 171 $i18n{timezoneDropdownTitle} |
| 165 </div> | 172 </div> |
| 166 <oobe-i18n-dropdown id="timezoneSelect" items="[[timezones]]" | 173 <oobe-i18n-dropdown id="timezoneSelect" items="[[timezones]]" |
| 167 on-select-item="onTimezoneSelected_" | 174 on-select-item="onTimezoneSelected_" |
| 168 label="$i18n{timezoneDropdownTitle}"> | 175 aria-label="$i18n{timezoneDropdownTitle}"> |
| 169 </oobe-i18n-dropdown> | 176 </oobe-i18n-dropdown> |
| 170 </div> | 177 </div> |
| 171 </div> | 178 </div> |
| 172 <div class="bottom-buttons layout horizontal end-justified"> | 179 <div class="bottom-buttons layout horizontal end-justified"> |
| 173 <oobe-text-button inverse on-tap="closeTimezoneSection_"> | 180 <oobe-text-button inverse on-tap="closeTimezoneSection_"> |
| 174 <div>$i18n{oobeOKButtonText}</div> | 181 <div>$i18n{oobeOKButtonText}</div> |
| 175 </oobe-text-button> | 182 </oobe-text-button> |
| 176 </div> | 183 </div> |
| 177 </oobe-dialog> | 184 </oobe-dialog> |
| 178 <oobe-dialog id="networkSelectionScreen" | 185 <oobe-dialog id="networkSelectionScreen" |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 194 <div class="bottom-buttons layout horizontal justified"> | 201 <div class="bottom-buttons layout horizontal justified"> |
| 195 <oobe-back-button on-tap="onNetworkSelectionBackButtonPressed_"> | 202 <oobe-back-button on-tap="onNetworkSelectionBackButtonPressed_"> |
| 196 </oobe-back-button> | 203 </oobe-back-button> |
| 197 <oobe-next-button disabled="[[!isConnected_]]" | 204 <oobe-next-button disabled="[[!isConnected_]]" |
| 198 on-tap="onSelectedNetworkConnected_"> | 205 on-tap="onSelectedNetworkConnected_"> |
| 199 </oobe-next-button> | 206 </oobe-next-button> |
| 200 </div> | 207 </div> |
| 201 </oobe-dialog> | 208 </oobe-dialog> |
| 202 </template> | 209 </template> |
| 203 </dom-module> | 210 </dom-module> |
| OLD | NEW |