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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 </g> | 50 </g> |
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" hidden="[[!welcomeScreenShown]]" | 60 <oobe-welcome-dialog id="welcomeScreen" role="dialog" |
| 61 aria-label="$i18n{networkScreenGreeting}" |
61 current-language="[[currentLanguage]]" | 62 current-language="[[currentLanguage]]" |
62 on-language-button-clicked="onWelcomeSelectLanguageButtonClicked_" | 63 on-language-button-clicked="onWelcomeSelectLanguageButtonClicked_" |
63 on-accessibility-button-clicked="onWelcomeAccessibilityButtonClicked_" | 64 on-accessibility-button-clicked="onWelcomeAccessibilityButtonClicked_" |
64 on-timezone-button-clicked="onWelcomeTimezoneButtonClicked_" | 65 on-timezone-button-clicked="onWelcomeTimezoneButtonClicked_" |
65 on-next-button-clicked="onWelcomeNextButtonClicked_" | 66 on-next-button-clicked="onWelcomeNextButtonClicked_" |
66 timezone-button-visible="[[isTimezoneButtonVisible_(highlightStrength)]]
" | 67 timezone-button-visible="[[isTimezoneButtonVisible_(highlightStrength)]]
" |
67 > | 68 > |
68 </oobe-welcome-dialog> | 69 </oobe-welcome-dialog> |
69 <oobe-dialog id="languageScreen" hidden="[[!languageSelectionScreenShown]]" | 70 <oobe-dialog id="languageScreen" role="dialog" hidden has-buttons |
70 has-buttons> | 71 aria-label="$i18n{languageSectionTitle}"> |
71 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> | 72 <iron-icon icon="icons:language" class="oobe-icon"></iron-icon> |
72 <div class="header"> | 73 <div class="header"> |
73 <h1 class="title">$i18n{languageSectionTitle}</h1> | 74 <h1 class="title">$i18n{languageSectionTitle}</h1> |
74 </div> | 75 </div> |
75 <div class="footer layout vertical"> | 76 <div class="footer layout vertical"> |
76 <template is="dom-if" if="[[enabled]]"> | 77 <template is="dom-if" if="[[enabled]]"> |
77 <div id="languageDropdownContainer" | 78 <div id="languageDropdownContainer" |
78 class="flex layout horizontal justified language-selection-entry"> | 79 class="flex layout horizontal justified language-selection-entry"> |
79 <div class="language-selection-title layout vertical center-justifie
d"> | 80 <div class="language-selection-title layout vertical center-justifie
d"> |
80 $i18n{languageDropdownTitle} | 81 $i18n{languageDropdownTitle} |
81 </div> | 82 </div> |
82 <oobe-i18n-dropdown id="languageSelect" items="[[languages]]" | 83 <oobe-i18n-dropdown id="languageSelect" items="[[languages]]" |
83 on-select-item="onLanguageSelected_" | 84 on-select-item="onLanguageSelected_" |
84 aria-label="[[formatMessage_('languageDropdownLabel', | 85 class="focus-on-show"> |
85 currentLanguage)]]"> | |
86 </oobe-i18n-dropdown> | 86 </oobe-i18n-dropdown> |
87 </div> | 87 </div> |
88 <div id="keyboardDropdownContainer" | 88 <div id="keyboardDropdownContainer" |
89 class="flex layout horizontal justified language-selection-entry"> | 89 class="flex layout horizontal justified language-selection-entry"> |
90 <div class="language-selection-title layout vertical center-justifie
d"> | 90 <div class="language-selection-title layout vertical center-justifie
d"> |
91 $i18n{keyboardDropdownTitle} | 91 $i18n{keyboardDropdownTitle} |
92 </div> | 92 </div> |
93 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]" | 93 <oobe-i18n-dropdown id="keyboardSelect" items="[[keyboards]]" |
94 on-select-item="onKeyboardSelected_" | 94 on-select-item="onKeyboardSelected_"> |
95 aria-label="[[formatMessage_('keyboardDropdownLabel', | |
96 currentKeyboard)]]"> | |
97 </oobe-i18n-dropdown> | 95 </oobe-i18n-dropdown> |
98 </div> | 96 </div> |
99 </template> | 97 </template> |
100 </div> | 98 </div> |
101 <div class="bottom-buttons layout horizontal end-justified"> | 99 <div class="bottom-buttons layout horizontal end-justified"> |
102 <oobe-text-button inverse on-tap="closeLanguageSection_"> | 100 <oobe-text-button inverse on-tap="closeLanguageSection_"> |
103 <div>$i18n{oobeOKButtonText}</div> | 101 <div>$i18n{oobeOKButtonText}</div> |
104 </oobe-text-button> | 102 </oobe-text-button> |
105 </div> | 103 </div> |
106 </oobe-dialog> | 104 </oobe-dialog> |
107 <oobe-dialog id="accessibilityScreen" | 105 <oobe-dialog id="accessibilityScreen" role="dialog" hidden has-buttons |
108 hidden="[[!accessibilityOptionsScreenShown]]" has-buttons> | 106 aria-label="$i18n{accessibilitySectionTitle}"> |
109 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon> | 107 <iron-icon icon="icons:accessibility" class="oobe-icon"></iron-icon> |
110 <div class="header"> | 108 <div class="header"> |
111 <h1 class="title">$i18n{accessibilitySectionTitle}</h1> | 109 <h1 class="title">$i18n{accessibilitySectionTitle}</h1> |
112 <div class="subtitle">$i18n{accessibilitySectionHint}</div> | 110 <div class="subtitle">$i18n{accessibilitySectionHint}</div> |
113 </div> | 111 </div> |
114 <div class="footer layout vertical"> | 112 <div class="footer layout vertical"> |
115 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]" | 113 <oobe-a11y-option checked="[[a11yStatus.spokenFeedbackEnabled]]" |
116 on-change="onA11yOptionChanged_" | 114 on-change="onA11yOptionChanged_" |
117 chrome-message="enableSpokenFeedback" | 115 chrome-message="enableSpokenFeedback" |
118 aria-label="$i18n{spokenFeedbackOption}"> | 116 label-for-aria="$i18n{spokenFeedbackOption}" |
| 117 class="focus-on-show"> |
119 <span class="title">$i18n{spokenFeedbackOption}</span> | 118 <span class="title">$i18n{spokenFeedbackOption}</span> |
120 <span class="checked-value">$i18n{spokenFeedbackOptionOn}</span> | 119 <span class="checked-value">$i18n{spokenFeedbackOptionOn}</span> |
121 <span class="unchecked-value">$i18n{spokenFeedbackOptionOff}</span> | 120 <span class="unchecked-value">$i18n{spokenFeedbackOptionOff}</span> |
122 </oobe-a11y-option> | 121 </oobe-a11y-option> |
123 <oobe-a11y-option checked="[[a11yStatus.largeCursorEnabled]]" | 122 <oobe-a11y-option checked="[[a11yStatus.largeCursorEnabled]]" |
124 on-change="onA11yOptionChanged_" | 123 on-change="onA11yOptionChanged_" |
125 chrome-message="enableLargeCursor" | 124 chrome-message="enableLargeCursor" |
126 aria-label="$i18n{largeCursorOption}"> | 125 label-for-aria="$i18n{largeCursorOption}"> |
127 <span class="title">$i18n{largeCursorOption}</span> | 126 <span class="title">$i18n{largeCursorOption}</span> |
128 <span class="checked-value">$i18n{largeCursorOptionOn}</span> | 127 <span class="checked-value">$i18n{largeCursorOptionOn}</span> |
129 <span class="unchecked-value">$i18n{largeCursorOptionOff}</span> | 128 <span class="unchecked-value">$i18n{largeCursorOptionOff}</span> |
130 </oobe-a11y-option> | 129 </oobe-a11y-option> |
131 <oobe-a11y-option checked="[[a11yStatus.highContrastEnabled]]" | 130 <oobe-a11y-option checked="[[a11yStatus.highContrastEnabled]]" |
132 on-change="onA11yOptionChanged_" | 131 on-change="onA11yOptionChanged_" |
133 chrome-message="enableHighContrast" | 132 chrome-message="enableHighContrast" |
134 aria-label="$i18n{highContrastOption}"> | 133 label-for-aria="$i18n{highContrastOption}"> |
135 <span class="title">$i18n{highContrastOption}</span> | 134 <span class="title">$i18n{highContrastOption}</span> |
136 <span class="checked-value">$i18n{highContrastOptionOn}</span> | 135 <span class="checked-value">$i18n{highContrastOptionOn}</span> |
137 <span class="unchecked-value">$i18n{highContrastOptionOff}</span> | 136 <span class="unchecked-value">$i18n{highContrastOptionOff}</span> |
138 </oobe-a11y-option> | 137 </oobe-a11y-option> |
139 <oobe-a11y-option checked="[[a11yStatus.screenMagnifierEnabled]]" | 138 <oobe-a11y-option checked="[[a11yStatus.screenMagnifierEnabled]]" |
140 on-change="onA11yOptionChanged_" | 139 on-change="onA11yOptionChanged_" |
141 chrome-message="enableScreenMagnifier" | 140 chrome-message="enableScreenMagnifier" |
142 aria-label="$i18n{screenMagnifierOption}"> | 141 label-for-aria="$i18n{screenMagnifierOption}"> |
143 <span class="title">$i18n{screenMagnifierOption}</span> | 142 <span class="title">$i18n{screenMagnifierOption}</span> |
144 <span class="checked-value">$i18n{screenMagnifierOptionOn}</span> | 143 <span class="checked-value">$i18n{screenMagnifierOptionOn}</span> |
145 <span class="unchecked-value">$i18n{screenMagnifierOptionOff}</span> | 144 <span class="unchecked-value">$i18n{screenMagnifierOptionOff}</span> |
146 </oobe-a11y-option> | 145 </oobe-a11y-option> |
147 <oobe-a11y-option checked="[[a11yStatus.virtualKeyboardEnabled]]" | 146 <oobe-a11y-option checked="[[a11yStatus.virtualKeyboardEnabled]]" |
148 on-change="onA11yOptionChanged_" | 147 on-change="onA11yOptionChanged_" |
149 chrome-message="enableVirtualKeyboard" | 148 chrome-message="enableVirtualKeyboard" |
150 aria-label="$i18n{virtualKeyboardOption}"> | 149 label-for-aria="$i18n{virtualKeyboardOption}"> |
151 <span class="title">$i18n{virtualKeyboardOption}</span> | 150 <span class="title">$i18n{virtualKeyboardOption}</span> |
152 <span class="checked-value">$i18n{virtualKeyboardOptionOn}</span> | 151 <span class="checked-value">$i18n{virtualKeyboardOptionOn}</span> |
153 <span class="unchecked-value">$i18n{virtualKeyboardOptionOff}</span> | 152 <span class="unchecked-value">$i18n{virtualKeyboardOptionOff}</span> |
154 </oobe-a11y-option> | 153 </oobe-a11y-option> |
155 </div> | 154 </div> |
156 <div class="bottom-buttons layout horizontal end-justified"> | 155 <div class="bottom-buttons layout horizontal end-justified"> |
157 <oobe-text-button inverse on-tap="closeAccessibilitySection_"> | 156 <oobe-text-button inverse on-tap="closeAccessibilitySection_"> |
158 <div>$i18n{oobeOKButtonText}</div> | 157 <div>$i18n{oobeOKButtonText}</div> |
159 </oobe-text-button> | 158 </oobe-text-button> |
160 </div> | 159 </div> |
161 </oobe-dialog> | 160 </oobe-dialog> |
162 <oobe-dialog id="timezoneScreen" hidden="[[!timezoneScreenShown]]" | 161 <oobe-dialog id="timezoneScreen" role="dialog" hidden has-buttons |
163 has-buttons> | 162 aria-label="$i18n{timezoneSectionTitle}"> |
164 <iron-icon icon="oobe-welcome-64:timezone" class="oobe-icon"></iron-icon> | 163 <iron-icon icon="oobe-welcome-64:timezone" class="oobe-icon"></iron-icon> |
165 <div class="header"> | 164 <div class="header"> |
166 <h1 class="title">$i18n{timezoneSectionTitle}</h1> | 165 <h1 class="title">$i18n{timezoneSectionTitle}</h1> |
167 </div> | 166 </div> |
168 <div class="footer layout vertical"> | 167 <div class="footer layout vertical"> |
169 <div class="flex layout horizontal justified timezone-selection-entry"> | 168 <div class="flex layout horizontal justified timezone-selection-entry"> |
170 <div class="timezone-selection-title layout vertical center-justified"
> | 169 <div class="timezone-selection-title layout vertical center-justified"
> |
171 $i18n{timezoneDropdownTitle} | 170 $i18n{timezoneDropdownTitle} |
172 </div> | 171 </div> |
173 <oobe-i18n-dropdown id="timezoneSelect" items="[[timezones]]" | 172 <oobe-i18n-dropdown id="timezoneSelect" items="[[timezones]]" |
174 on-select-item="onTimezoneSelected_" | 173 on-select-item="onTimezoneSelected_" |
175 aria-label="$i18n{timezoneDropdownTitle}"> | 174 label-for-aria="$i18n{timezoneDropdownTitle}" |
| 175 class="focus-on-show"> |
176 </oobe-i18n-dropdown> | 176 </oobe-i18n-dropdown> |
177 </div> | 177 </div> |
178 </div> | 178 </div> |
179 <div class="bottom-buttons layout horizontal end-justified"> | 179 <div class="bottom-buttons layout horizontal end-justified"> |
180 <oobe-text-button inverse on-tap="closeTimezoneSection_"> | 180 <oobe-text-button inverse on-tap="closeTimezoneSection_"> |
181 <div>$i18n{oobeOKButtonText}</div> | 181 <div>$i18n{oobeOKButtonText}</div> |
182 </oobe-text-button> | 182 </oobe-text-button> |
183 </div> | 183 </div> |
184 </oobe-dialog> | 184 </oobe-dialog> |
185 <oobe-dialog id="networkSelectionScreen" | 185 <oobe-dialog id="networkSelectionScreen" role="dialog" hidden has-buttons |
186 hidden="[[!networkSelectionScreenShown]]" has-buttons> | 186 aria-label="$i18n{networkSectionTitle}" |
| 187 on-show-dialog="onNetworkSelectionScreenShown_"> |
187 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> | 188 <iron-icon icon="oobe-welcome:wifi" class="oobe-icon"></iron-icon> |
188 <div class="header"> | 189 <div class="header"> |
189 <h1 class="title">$i18n{networkSectionTitle}</h1> | 190 <h1 class="title">$i18n{networkSectionTitle}</h1> |
190 <div class="subtitle">$i18n{networkSectionHint}</div> | 191 <div class="subtitle">$i18n{networkSectionHint}</div> |
191 </div> | 192 </div> |
192 <div class="footer layout vertical"> | 193 <div class="footer layout vertical"> |
193 <cr-network-select id="networkSelect" | 194 <cr-network-select id="networkSelect" |
194 on-default-network-changed="onDefaultNetworkChanged_" | 195 on-default-network-changed="onDefaultNetworkChanged_" |
195 on-network-item-selected="onNetworkListNetworkItemSelected_" | 196 on-network-item-selected="onNetworkListNetworkItemSelected_" |
196 on-custom-item-selected="onNetworkListCustomItemSelected_" | 197 on-custom-item-selected="onNetworkListCustomItemSelected_" |
197 custom-items="[[_getNetworkCustomItems()]]" | 198 custom-items="[[getNetworkCustomItems_()]]" |
198 no-bottom-scroll-border> | 199 no-bottom-scroll-border |
| 200 class="focus-on-show"> |
199 </cr-network-select> | 201 </cr-network-select> |
200 </div> | 202 </div> |
201 <div class="bottom-buttons layout horizontal justified"> | 203 <div class="bottom-buttons layout horizontal justified"> |
202 <oobe-back-button on-tap="onNetworkSelectionBackButtonPressed_"> | 204 <oobe-back-button on-tap="onNetworkSelectionBackButtonPressed_"> |
203 </oobe-back-button> | 205 </oobe-back-button> |
204 <oobe-next-button disabled="[[!isConnected_]]" | 206 <oobe-next-button disabled="[[!isConnected_]]" |
205 on-tap="onSelectedNetworkConnected_"> | 207 on-tap="onSelectedNetworkConnected_"> |
206 </oobe-next-button> | 208 </oobe-next-button> |
207 </div> | 209 </div> |
208 </oobe-dialog> | 210 </oobe-dialog> |
209 </template> | 211 </template> |
210 </dom-module> | 212 </dom-module> |
OLD | NEW |