| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 <div class="center" id="noPrinterMessage" hidden> | 56 <div class="center" id="noPrinterMessage" hidden> |
| 57 $i18n{noPrinterNearbyMessage} | 57 $i18n{noPrinterNearbyMessage} |
| 58 </div> | 58 </div> |
| 59 <div id="searchSpinner" hidden="[[!discovering_]]"> | 59 <div id="searchSpinner" hidden="[[!discovering_]]"> |
| 60 <paper-spinner active="[[discovering_]]"></paper-spinner> | 60 <paper-spinner active="[[discovering_]]"></paper-spinner> |
| 61 <span>$i18n{searchingNearbyPrinters}</span> | 61 <span>$i18n{searchingNearbyPrinters}</span> |
| 62 </div> | 62 </div> |
| 63 </div> | 63 </div> |
| 64 <div class="dialog-buttons"> | 64 <div class="dialog-buttons"> |
| 65 <div> <!-- Left group --> | 65 <div> <!-- Left group --> |
| 66 <paper-button id="manuallyAddPrinterButton" class="secondary-button" | 66 <paper-button id="manuallyAddPrinterButton" |
| 67 on-tap="switchToManualAddDialog_"> | 67 on-tap="switchToManualAddDialog_"> |
| 68 $i18n{manuallyAddPrinterButtonText} | 68 $i18n{manuallyAddPrinterButtonText} |
| 69 </paper-button> | 69 </paper-button> |
| 70 </div> | 70 </div> |
| 71 <div> <!-- Right group --> | 71 <div> <!-- Right group --> |
| 72 <paper-button class="cancel-button secondary-button" | 72 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
| 73 on-tap="onCancelTap_"> | |
| 74 $i18n{cancelButtonText} | 73 $i18n{cancelButtonText} |
| 75 </paper-button> | 74 </paper-button> |
| 76 <paper-button class="action-button" id="addPrinterButton" | 75 <paper-button class="action-button" id="addPrinterButton" |
| 77 disabled="[[!selectedPrinter]]" | 76 disabled="[[!selectedPrinter]]" |
| 78 on-tap="switchToManufacturerDialog_"> | 77 on-tap="switchToManufacturerDialog_"> |
| 79 $i18n{addPrinterButtonText} | 78 $i18n{addPrinterButtonText} |
| 80 </paper-button> | 79 </paper-button> |
| 81 </div> | 80 </div> |
| 82 </div> | 81 </div> |
| 83 </add-printer-dialog> | 82 </add-printer-dialog> |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 </select> | 183 </select> |
| 185 <span class="md-select-underline"></span> | 184 <span class="md-select-underline"></span> |
| 186 </div> | 185 </div> |
| 187 </div> | 186 </div> |
| 188 </div> | 187 </div> |
| 189 </div> | 188 </div> |
| 190 <div class="settings-box two-line"> | 189 <div class="settings-box two-line"> |
| 191 <div class="start"> | 190 <div class="start"> |
| 192 <div class="label">$i18n{printerQueue}</div> | 191 <div class="label">$i18n{printerQueue}</div> |
| 193 <div class="secondary"> | 192 <div class="secondary"> |
| 194 <paper-input no-label-float label="ipp/print" | 193 <paper-input no-label-float label="ipp/print" |
| 195 value="{{newPrinter.printerQueue}}"> | 194 value="{{newPrinter.printerQueue}}"> |
| 196 </paper-input> | 195 </paper-input> |
| 197 </div> | 196 </div> |
| 198 </div> | 197 </div> |
| 199 </div> | 198 </div> |
| 200 <div class="search-printer-box" id="searchInProgress" hidden> | 199 <div class="search-printer-box" id="searchInProgress" hidden> |
| 201 <paper-spinner active></paper-spinner> | 200 <paper-spinner active></paper-spinner> |
| 202 <span class="spinner-comment">$i18n{searchingPrinter}</span> | 201 <span class="spinner-comment">$i18n{searchingPrinter}</span> |
| 203 </div> | 202 </div> |
| 204 <div class="search-printer-box printer-not-found" | 203 <div class="search-printer-box printer-not-found" |
| 205 id="searchNotFound" hidden> | 204 id="searchNotFound" hidden> |
| 206 <span>$i18n{printerNotFound}</span> | 205 <span>$i18n{printerNotFound}</span> |
| 207 </div> | 206 </div> |
| 208 <div class="search-printer-box printer-found" id="searchFound" hidden> | 207 <div class="search-printer-box printer-found" id="searchFound" hidden> |
| 209 <span>$i18n{printerFound}</span> | 208 <span>$i18n{printerFound}</span> |
| 210 </div> | 209 </div> |
| 211 </div> | 210 </div> |
| 212 <div class="dialog-buttons"> | 211 <div class="dialog-buttons"> |
| 213 <paper-button class="cancel-button secondary-button" | 212 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
| 214 on-tap="onCancelTap_"> | |
| 215 $i18n{cancelButtonText} | 213 $i18n{cancelButtonText} |
| 216 </paper-button> | 214 </paper-button> |
| 217 <paper-button class="action-button" on-tap="switchToManufacturerDialog_" | 215 <paper-button class="action-button" on-tap="switchToManufacturerDialog_" |
| 218 disabled="[[!newPrinter.printerName]]"> | 216 disabled="[[!newPrinter.printerName]]"> |
| 219 $i18n{addPrinterButtonText} | 217 $i18n{addPrinterButtonText} |
| 220 </paper-button> | 218 </paper-button> |
| 221 </div> | 219 </div> |
| 222 </add-printer-dialog> | 220 </add-printer-dialog> |
| 223 </template> | 221 </template> |
| 224 </dom-module> | 222 </dom-module> |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 </paper-input> | 304 </paper-input> |
| 307 </div> | 305 </div> |
| 308 </div> | 306 </div> |
| 309 </div> | 307 </div> |
| 310 <div class="error-message" hidden="[[!setupFailed]]"> | 308 <div class="error-message" hidden="[[!setupFailed]]"> |
| 311 Driver not found (exact error message TBD) | 309 Driver not found (exact error message TBD) |
| 312 </div> | 310 </div> |
| 313 </div> | 311 </div> |
| 314 <div class="dialog-buttons"> | 312 <div class="dialog-buttons"> |
| 315 <div> <!-- Left group --> | 313 <div> <!-- Left group --> |
| 316 <paper-button id="manuallyAddPrinterButton" class="secondary-button" | 314 <paper-button id="manuallyAddPrinterButton" |
| 317 on-tap="switchToPreviousDialog_"> | 315 on-tap="switchToPreviousDialog_"> |
| 318 $i18n{back} | 316 $i18n{back} |
| 319 </paper-button> | 317 </paper-button> |
| 320 </div> | 318 </div> |
| 321 <div> <!-- Right group --> | 319 <div> <!-- Right group --> |
| 322 <paper-button class="cancel-button secondary-button" | 320 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
| 323 on-tap="onCancelTap_"> | |
| 324 $i18n{cancelButtonText} | 321 $i18n{cancelButtonText} |
| 325 </paper-button> | 322 </paper-button> |
| 326 <paper-button class="action-button" id="addPrinterButton" | 323 <paper-button class="action-button" id="addPrinterButton" |
| 327 disabled="[[!canAddPrinter_(newPrinter.printerManufacturer, | 324 disabled="[[!canAddPrinter_(newPrinter.printerManufacturer, |
| 328 newPrinter.printerModel, | 325 newPrinter.printerModel, |
| 329 newPrinter.printerPPDPath)]]" | 326 newPrinter.printerPPDPath)]]" |
| 330 on-tap="switchToConfiguringDialog_"> | 327 on-tap="switchToConfiguringDialog_"> |
| 331 $i18n{addPrinterButtonText} | 328 $i18n{addPrinterButtonText} |
| 332 </paper-button> | 329 </paper-button> |
| 333 </div> | 330 </div> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 344 text-align: center; | 341 text-align: center; |
| 345 } | 342 } |
| 346 </style> | 343 </style> |
| 347 <add-printer-dialog> | 344 <add-printer-dialog> |
| 348 <div class="dialog-title">[[dialogTitle]]</div> | 345 <div class="dialog-title">[[dialogTitle]]</div> |
| 349 <div class="dialog-body"> | 346 <div class="dialog-body"> |
| 350 <paper-spinner active></paper-spinner> | 347 <paper-spinner active></paper-spinner> |
| 351 <div id="configuringMessage">$i18n{printerConfiguringMessage}</div> | 348 <div id="configuringMessage">$i18n{printerConfiguringMessage}</div> |
| 352 </div> | 349 </div> |
| 353 <div class="dialog-buttons"> | 350 <div class="dialog-buttons"> |
| 354 <paper-button class="cancel-button secondary-button" | 351 <paper-button class="cancel-button" on-tap="onCancelConfiguringTap_"> |
| 355 on-tap="onCancelConfiguringTap_"> | |
| 356 $i18n{cancelButtonText} | 352 $i18n{cancelButtonText} |
| 357 </paper-button> | 353 </paper-button> |
| 358 </div> | 354 </div> |
| 359 </add-printer-dialog> | 355 </add-printer-dialog> |
| 360 </template> | 356 </template> |
| 361 </dom-module> | 357 </dom-module> |
| 362 | 358 |
| 363 <dom-module id="settings-cups-add-printer-dialog"> | 359 <dom-module id="settings-cups-add-printer-dialog"> |
| 364 <template> | 360 <template> |
| 365 <style include="settings-shared"></style> | 361 <style include="settings-shared"></style> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 387 <!-- Manufacturer and Model Dialog --> | 383 <!-- Manufacturer and Model Dialog --> |
| 388 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> | 384 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> |
| 389 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" | 385 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" |
| 390 previous-dialog="[[previousDialog]]" setup-failed="[[setupFailed]]"> | 386 previous-dialog="[[previousDialog]]" setup-failed="[[setupFailed]]"> |
| 391 </add-printer-manufacturer-model-dialog> | 387 </add-printer-manufacturer-model-dialog> |
| 392 </template> | 388 </template> |
| 393 | 389 |
| 394 </template> | 390 </template> |
| 395 <script src="cups_add_printer_dialog.js"></script> | 391 <script src="cups_add_printer_dialog.js"></script> |
| 396 </dom-module> | 392 </dom-module> |
| OLD | NEW |