OLD | NEW |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap
er-dropdown-menu-light.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap
er-dropdown-menu-light.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi
nner.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi
nner.html"> |
6 <link rel="import" href="/i18n_setup.html"> | 6 <link rel="import" href="/i18n_setup.html"> |
7 <link rel="import" href="/printing_page/cups_add_printer_dialog_util.html"> | 7 <link rel="import" href="/printing_page/cups_add_printer_dialog_util.html"> |
8 <link rel="import" href="/printing_page/cups_printers_browser_proxy.html"> | 8 <link rel="import" href="/printing_page/cups_printers_browser_proxy.html"> |
9 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
10 | 10 |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 </div> | 177 </div> |
178 </div> | 178 </div> |
179 <div class="dialog-buttons"> | 179 <div class="dialog-buttons"> |
180 <paper-button id="discoverPrintersButton" | 180 <paper-button id="discoverPrintersButton" |
181 on-tap="switchToDiscoveryDialog_"> | 181 on-tap="switchToDiscoveryDialog_"> |
182 $i18n{discoverPrintersButtonText} | 182 $i18n{discoverPrintersButtonText} |
183 </paper-button> | 183 </paper-button> |
184 <paper-button class="cancel-button" on-tap="onCancelTap_"> | 184 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
185 $i18n{cancelButtonText} | 185 $i18n{cancelButtonText} |
186 </paper-button> | 186 </paper-button> |
187 <paper-button class="action-button" on-tap="switchToManufacturerDialog_" | 187 <paper-button class="action-button" on-tap="switchToConfiguringDialog_" |
188 disabled="[[addPrinterNotAllowed_(newPrinter.printerName, | 188 disabled="[[!newPrinter.printerName]]"> |
189 newPrinter.printerAddress)]]"> | |
190 $i18n{addPrinterButtonText} | 189 $i18n{addPrinterButtonText} |
191 </paper-button> | 190 </paper-button> |
192 </div> | 191 </div> |
193 </add-printer-dialog> | 192 </add-printer-dialog> |
194 </template> | 193 </template> |
195 </dom-module> | 194 </dom-module> |
196 | 195 |
197 <dom-module id="add-printer-manufacturer-model-dialog"> | 196 <dom-module id="add-printer-manufacturer-model-dialog"> |
198 <template> | 197 <template> |
199 <style include="settings-shared"> | 198 <style include="settings-shared"> |
200 .settings-box { | 199 .settings-box { |
201 border-top: none; | 200 border-top: none; |
202 margin-bottom: 10px; | 201 margin-bottom: 10px; |
203 } | 202 } |
204 | 203 |
205 .settings-box .start .label { | 204 .settings-box .start .label { |
206 color: var(--google-grey-700); | 205 color: var(--google-grey-700); |
207 } | 206 } |
208 | 207 |
| 208 .error-message { |
| 209 background-color: var(--google-red-100); |
| 210 color: red; |
| 211 margin-top: 10px; |
| 212 padding: 10px 20px; |
| 213 } |
| 214 |
209 #manuallyAddPrinterButton { | 215 #manuallyAddPrinterButton { |
210 -webkit-margin-end: 210px; | 216 -webkit-margin-end: 210px; |
211 } | 217 } |
212 </style> | 218 </style> |
213 <add-printer-dialog> | 219 <add-printer-dialog> |
214 <div class="dialog-body"> | 220 <div class="dialog-body"> |
215 <div class="settings-box first"> | 221 <div class="settings-box first"> |
216 $i18n{selectManufacturerModelMessage} | 222 $i18n{selectManufacturerModelMessage} |
217 </div> | 223 </div> |
218 <div class="settings-box two-line"> | 224 <div class="settings-box two-line"> |
219 <div class="start"> | 225 <div class="start"> |
220 <div class="label">$i18n{printerManufacturer}</div> | 226 <div class="label">$i18n{printerManufacturer}</div> |
221 <div class="secondary"> | 227 <div class="secondary"> |
222 <drop-down-search-box items="[[manufacturerList]]" | 228 <drop-down-search-box items="[[manufacturerList]]" |
223 selected-item="{{newPrinter.printerManufacturer}}"> | 229 selected-item="{{newPrinter.printerManufacturer}}"> |
224 </drop-down-search-box> | 230 </drop-down-search-box> |
225 </div> | 231 </div> |
226 </div> | 232 </div> |
227 </div> | 233 </div> |
228 <div class="settings-box two-line"> | 234 <div class="settings-box two-line"> |
229 <div class="start"> | 235 <div class="start"> |
230 <div class="label">$i18n{printerModel}</div> | 236 <div class="label">$i18n{printerModel}</div> |
231 <div class="secondary"> | 237 <div class="secondary"> |
232 <drop-down-search-box items="[[modelList]]" | 238 <drop-down-search-box items="[[modelList]]" |
233 selected-item="{{newPrinter.printerModel}}"> | 239 selected-item="{{newPrinter.printerModel}}"> |
234 </drop-down-search-box> | 240 </drop-down-search-box> |
235 </div> | 241 </div> |
236 </div> | 242 </div> |
237 </div> | 243 </div> |
| 244 <div class="error-message" hidden="[[!setupFailed]]"> |
| 245 Driver not found (exact error message TBD) |
| 246 </div> |
238 </div> | 247 </div> |
239 <div class="dialog-buttons"> | 248 <div class="dialog-buttons"> |
240 <paper-button id="manuallyAddPrinterButton" | 249 <paper-button id="manuallyAddPrinterButton" |
241 on-tap="switchToManualAddDialog_"> | 250 on-tap="switchToManualAddDialog_"> |
242 $i18n{manuallyAddPrinterButtonText} | 251 $i18n{manuallyAddPrinterButtonText} |
243 </paper-button> | 252 </paper-button> |
244 <paper-button class="cancel-button" on-tap="onCancelTap_"> | 253 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
245 $i18n{cancelButtonText} | 254 $i18n{cancelButtonText} |
246 </paper-button> | 255 </paper-button> |
247 <paper-button class="action-button" id="addPrinterButton" | 256 <paper-button class="action-button" id="addPrinterButton" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 | 302 |
294 <!-- Configuring Printer Dialog --> | 303 <!-- Configuring Printer Dialog --> |
295 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> | 304 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> |
296 <add-printer-configuring-dialog | 305 <add-printer-configuring-dialog |
297 printer-name="[[getConfiguringPrinterName_()]]"> | 306 printer-name="[[getConfiguringPrinterName_()]]"> |
298 </add-printer-configuring-dialog> | 307 </add-printer-configuring-dialog> |
299 </template> | 308 </template> |
300 | 309 |
301 <!-- Manufacturer and Model Dialog --> | 310 <!-- Manufacturer and Model Dialog --> |
302 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> | 311 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> |
303 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}"> | 312 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" |
| 313 setup-failed="[[setupFailed]]"> |
304 </add-printer-manufacturer-model-dialog> | 314 </add-printer-manufacturer-model-dialog> |
305 </template> | 315 </template> |
306 | 316 |
307 </template> | 317 </template> |
308 <script src="cups_add_printer_dialog.js"></script> | 318 <script src="cups_add_printer_dialog.js"></script> |
309 </dom-module> | 319 </dom-module> |
OLD | NEW |