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