Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 1 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 5 <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-input/paper-input .html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 7 <link rel="import" href="../i18n_setup.html"> | 7 <link rel="import" href="../i18n_setup.html"> |
| 8 <link rel="import" href="cups_add_printer_dialog_util.html"> | 8 <link rel="import" href="cups_add_printer_dialog_util.html"> |
| 9 <link rel="import" href="cups_printers_browser_proxy.html"> | 9 <link rel="import" href="cups_printers_browser_proxy.html"> |
| 10 <link rel="import" href="../settings_shared_css.html"> | 10 <link rel="import" href="../settings_shared_css.html"> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 } | 42 } |
| 43 | 43 |
| 44 #manuallyAddPrinterButton { | 44 #manuallyAddPrinterButton { |
| 45 -webkit-margin-end: 210px; | 45 -webkit-margin-end: 210px; |
| 46 } | 46 } |
| 47 </style> | 47 </style> |
| 48 <add-printer-dialog> | 48 <add-printer-dialog> |
| 49 <div class="dialog-title">$i18n{addPrintersNearbyTitle}</div> | 49 <div class="dialog-title">$i18n{addPrintersNearbyTitle}</div> |
| 50 <div class="dialog-body"> | 50 <div class="dialog-body"> |
| 51 <add-printer-list printers="[[discoveredPrinters]]" | 51 <add-printer-list printers="[[discoveredPrinters]]" |
| 52 selected-printer="{{selectedPrinter}}"> | 52 new-printer="{{newPrinter}}"> |
|
stevenjb
2017/04/10 19:49:55
previous indent was correct
Carlson
2017/04/10 22:16:42
Removed from this changelist
| |
| 53 </add-printer-list> | 53 </add-printer-list> |
| 54 <div class="center" id="noPrinterMessage" hidden> | 54 <div class="center" id="noPrinterMessage" hidden> |
| 55 $i18n{noPrinterNearbyMessage} | 55 $i18n{noPrinterNearbyMessage} |
| 56 </div> | 56 </div> |
| 57 <div id="searchSpinner" hidden="[[!discovering_]]"> | 57 <div id="searchSpinner" hidden="[[!discovering_]]"> |
| 58 <paper-spinner active="[[discovering_]]"></paper-spinner> | 58 <paper-spinner active="[[discovering_]]"></paper-spinner> |
| 59 <span>$i18n{searchingNearbyPrinters}</span> | 59 <span>$i18n{searchingNearbyPrinters}</span> |
| 60 </div> | 60 </div> |
| 61 </div> | 61 </div> |
| 62 <div class="dialog-buttons"> | 62 <div class="dialog-buttons"> |
| 63 <paper-button id="manuallyAddPrinterButton" | 63 <paper-button id="manuallyAddPrinterButton" |
| 64 on-tap="switchToManualAddDialog_"> | 64 on-tap="switchToManualAddDialog_"> |
| 65 $i18n{manuallyAddPrinterButtonText} | 65 $i18n{manuallyAddPrinterButtonText} |
| 66 </paper-button> | 66 </paper-button> |
| 67 <paper-button class="cancel-button" on-tap="onCancelTap_"> | 67 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
| 68 $i18n{cancelButtonText} | 68 $i18n{cancelButtonText} |
| 69 </paper-button> | 69 </paper-button> |
| 70 <paper-button class="action-button" id="addPrinterButton" | 70 <paper-button class="action-button" id="addPrinterButton" |
| 71 disabled="[[!selectedPrinter]]" on-tap="switchToConfiguringDialog_"> | 71 disabled="[[!newPrinter]]" on-tap="switchToManufacturerDialog_"> |
| 72 $i18n{addPrinterButtonText} | 72 $i18n{addPrinterButtonText} |
| 73 </paper-button> | 73 </paper-button> |
| 74 </div> | 74 </div> |
| 75 </add-printer-dialog> | 75 </add-printer-dialog> |
| 76 </template> | 76 </template> |
| 77 </dom-module> | 77 </dom-module> |
| 78 | 78 |
| 79 <dom-module id="add-printer-manually-dialog"> | 79 <dom-module id="add-printer-manually-dialog"> |
| 80 <template> | 80 <template> |
| 81 <style include="settings-shared md-select"> | 81 <style include="settings-shared md-select"> |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 297 </paper-input> | 297 </paper-input> |
| 298 </div> | 298 </div> |
| 299 </div> | 299 </div> |
| 300 </div> | 300 </div> |
| 301 <div class="error-message" hidden="[[!setupFailed]]"> | 301 <div class="error-message" hidden="[[!setupFailed]]"> |
| 302 Driver not found (exact error message TBD) | 302 Driver not found (exact error message TBD) |
| 303 </div> | 303 </div> |
| 304 </div> | 304 </div> |
| 305 <div class="dialog-buttons"> | 305 <div class="dialog-buttons"> |
| 306 <paper-button id="manuallyAddPrinterButton" | 306 <paper-button id="manuallyAddPrinterButton" |
| 307 on-tap="switchToManualAddDialog_"> | 307 on-tap="switchToManualAddDialog_"> |
|
xdai1
2017/03/31 23:33:52
If you want to remove selectedPrinter variable, yo
| |
| 308 $i18n{manuallyAddPrinterButtonText} | 308 $i18n{manuallyAddPrinterButtonText} |
| 309 </paper-button> | 309 </paper-button> |
| 310 <paper-button class="cancel-button" on-tap="onCancelTap_"> | 310 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
| 311 $i18n{cancelButtonText} | 311 $i18n{cancelButtonText} |
| 312 </paper-button> | 312 </paper-button> |
| 313 <paper-button class="action-button" id="addPrinterButton" | 313 <paper-button class="action-button" id="addPrinterButton" |
| 314 on-tap="switchToConfiguringDialog_"> | 314 on-tap="switchToConfiguringDialog_"> |
| 315 $i18n{addPrinterButtonText} | 315 $i18n{addPrinterButtonText} |
| 316 </paper-button> | 316 </paper-button> |
| 317 </div> | 317 </div> |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 341 </add-printer-dialog> | 341 </add-printer-dialog> |
| 342 </template> | 342 </template> |
| 343 </dom-module> | 343 </dom-module> |
| 344 | 344 |
| 345 <dom-module id="settings-cups-add-printer-dialog"> | 345 <dom-module id="settings-cups-add-printer-dialog"> |
| 346 <template> | 346 <template> |
| 347 <style include="settings-shared"></style> | 347 <style include="settings-shared"></style> |
| 348 | 348 |
| 349 <!-- Printer Discovery Dialog --> | 349 <!-- Printer Discovery Dialog --> |
| 350 <template is="dom-if" if="[[showDiscoveryDialog_]]" restamp> | 350 <template is="dom-if" if="[[showDiscoveryDialog_]]" restamp> |
| 351 <add-printer-discovery-dialog selected-printer="{{selectedPrinter}}"> | 351 <add-printer-discovery-dialog new-printer="{{newPrinter}}"> |
| 352 </add-printer-discovery-dialog> | 352 </add-printer-discovery-dialog> |
| 353 </template> | 353 </template> |
| 354 | 354 |
| 355 <!-- Manually Add Printer Dialog --> | 355 <!-- Manually Add Printer Dialog --> |
| 356 <template is="dom-if" if="[[showManuallyAddDialog_]]" restamp> | 356 <template is="dom-if" if="[[showManuallyAddDialog_]]" restamp> |
| 357 <add-printer-manually-dialog new-printer="{{newPrinter}}"> | 357 <add-printer-manually-dialog new-printer="{{newPrinter}}"> |
| 358 </add-printer-manually-dialog> | 358 </add-printer-manually-dialog> |
| 359 </template> | 359 </template> |
| 360 | 360 |
| 361 <!-- Configuring Printer Dialog --> | 361 <!-- Configuring Printer Dialog --> |
| 362 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> | 362 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> |
| 363 <add-printer-configuring-dialog | 363 <add-printer-configuring-dialog |
| 364 printer-name="[[getConfiguringPrinterName_()]]" | 364 printer-name="[[getConfiguringPrinterName_()]]" |
| 365 dialog-title="[[configuringDialogTitle]]"> | 365 dialog-title="[[configuringDialogTitle]]"> |
| 366 </add-printer-configuring-dialog> | 366 </add-printer-configuring-dialog> |
| 367 </template> | 367 </template> |
| 368 | 368 |
| 369 <!-- Manufacturer and Model Dialog --> | 369 <!-- Manufacturer and Model Dialog --> |
| 370 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> | 370 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> |
| 371 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" | 371 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" |
| 372 setup-failed="[[setupFailed]]"> | 372 setup-failed="[[setupFailed]]"> |
| 373 </add-printer-manufacturer-model-dialog> | 373 </add-printer-manufacturer-model-dialog> |
| 374 </template> | 374 </template> |
| 375 | 375 |
| 376 </template> | 376 </template> |
| 377 <script src="cups_add_printer_dialog.js"></script> | 377 <script src="cups_add_printer_dialog.js"></script> |
| 378 </dom-module> | 378 </dom-module> |
| OLD | NEW |