Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <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="/printing_page/cups_add_printer_dialog_util.html"> | |
| 4 <link rel="import" href="/printing_page/cups_printers_browser_proxy.html"> | |
| 4 <link rel="import" href="/settings_shared_css.html"> | 5 <link rel="import" href="/settings_shared_css.html"> |
| 5 | 6 |
| 7 <dom-module id="add-printer-discovery-dialog"> | |
| 8 <template> | |
| 9 <style include="settings-shared"></style> | |
|
michaelpg
2016/08/29 17:10:32
You can merge this with the <style> below, you don
xdai1
2016/08/29 18:45:45
Done. Also modified all the other pages in the set
| |
| 10 <style> | |
| 11 add-printer-list { | |
| 12 max-height: 350px; | |
| 13 overflow-y: auto; | |
| 14 } | |
| 15 | |
| 16 #manuallyAddPrinterButton { | |
| 17 -webkit-margin-end: 210px; | |
| 18 } | |
| 19 </style> | |
| 20 <add-printer-dialog-template> | |
| 21 <add-printer-list printers="[[discoveredPrinters]]" | |
| 22 selected-printer="{{selectedPrinter}}"> | |
| 23 </add-printer-list> | |
| 24 <!-- TODO(xdai): Add the paper-spinner --> | |
| 25 <paper-button id="manuallyAddPrinterButton" | |
| 26 on-tap="switchToManualAddDialog_"> | |
| 27 $i18n{manuallyAddPrinterButtonText} | |
| 28 </paper-button> | |
| 29 <paper-button class="cancel-button" on-tap="onCancelTap_"> | |
| 30 $i18n{cancelButtonText} | |
| 31 </paper-button> | |
| 32 <paper-button class="action-button" id="addPrinterButton" | |
| 33 disabled="[[!selectedPrinter]]" on-tap="switchToConfiguringDialog_"> | |
| 34 $i18n{addPrinterButtonText} | |
| 35 </paper-button> | |
| 36 </add-printer-dialog-template> | |
| 37 </template> | |
| 38 </dom-module> | |
| 39 | |
| 40 <dom-module id="add-printer-maually-dialog"> | |
| 41 <template> | |
| 42 <style include="settings-shared"></style> | |
| 43 <style> | |
| 44 #discoverPrintersButton { | |
| 45 -webkit-margin-end: 153px; | |
| 46 } | |
| 47 | |
| 48 .settings-box { | |
| 49 border-top: none; | |
| 50 } | |
| 51 | |
| 52 .settings-box.two-line { | |
| 53 min-height: 72px; | |
| 54 } | |
| 55 | |
| 56 .settings-box .start .label { | |
| 57 color: rgb(85, 85, 85); | |
| 58 } | |
| 59 | |
| 60 paper-dropdown-menu, | |
| 61 paper-input { | |
| 62 width: 270px; | |
| 63 } | |
| 64 | |
| 65 paper-input { | |
| 66 --paper-input-container-input: { | |
| 67 font-size: inherit; | |
| 68 }; | |
| 69 | |
| 70 --paper-input-container-color: rgb(192, 199, 205); | |
| 71 } | |
| 72 | |
| 73 #printerNameInput { | |
| 74 width: 450px; | |
| 75 } | |
| 76 </style> | |
| 77 <add-printer-dialog-template> | |
| 78 <div class="settings-box first two-line"> | |
| 79 <div class="start"> | |
| 80 <div class="label">$i18n{printerName}</div> | |
| 81 <div class="secondary"> | |
| 82 <paper-input no-label-float id="printerNameInput" | |
| 83 value="{{newPrinter.printerName}}"> | |
| 84 </paper-input> | |
| 85 </div> | |
| 86 </div> | |
| 87 </div> | |
| 88 <div class="settings-box two-line"> | |
| 89 <div class="start"> | |
| 90 <div class="label">$i18n{printerAddress}</div> | |
| 91 <div class="secondary"> | |
| 92 <paper-input no-label-float value="{{newPrinter.printerAddress}}"> | |
| 93 </paper-input> | |
| 94 </div> | |
| 95 </div> | |
| 96 </div> | |
| 97 <div class="settings-box two-line"> | |
| 98 <div class="start"> | |
| 99 <div class="label">$i18n{printerProtocol}</div> | |
| 100 <div class="secondary"> | |
| 101 <paper-dropdown-menu no-label-float> | |
| 102 <paper-listbox class="dropdown-content" | |
| 103 selected="{{newPrinter.printerProtocol}}" | |
| 104 attr-for-selected="value"> | |
| 105 <paper-item value="ipp">$i18n{printerProtocolIpp}</paper-item> | |
| 106 <paper-item value="ipps">$i18n{printerProtocolIpps}</paper-item> | |
| 107 <paper-item value="http">$i18n{printerProtocolHttp}</paper-item> | |
| 108 <paper-item value="https"> | |
| 109 $i18n{printerProtocolHttps} | |
| 110 </paper-item> | |
| 111 <paper-item value="socket"> | |
| 112 $i18n{printerProtocolAppSocket} | |
| 113 </paper-item> | |
| 114 <paper-item value="lpd">$i18n{printerProtocolLpd}</paper-item> | |
| 115 <paper-item value="usb">$i18n{printerProtocolUsb}</paper-item> | |
| 116 </paper-listbox> | |
| 117 </paper-dropdown-menu> | |
| 118 </div> | |
| 119 </div> | |
| 120 </div> | |
| 121 <div class="settings-box two-line"> | |
| 122 <div class="start"> | |
| 123 <div class="label">$i18n{printerQueue}</div> | |
| 124 <div class="secondary"> | |
| 125 <paper-input no-label-float value="{{newPrinter.printerQueue}}"> | |
| 126 </paper-input> | |
| 127 </div> | |
| 128 </div> | |
| 129 </div> | |
| 130 <!-- TODO(xdai): Add paper-spinner --> | |
| 131 <paper-button id="discoverPrintersButton" | |
| 132 on-tap="switchToDiscoveryDialog_"> | |
| 133 $i18n{discoverPrintersButtonText} | |
| 134 </paper-button> | |
| 135 <paper-button class="cancel-button" on-tap="onCancelTap_"> | |
| 136 $i18n{cancelButtonText} | |
| 137 </paper-button> | |
| 138 <paper-button class="action-button" on-tap="switchToConfiguringDialog_"> | |
| 139 $i18n{addPrinterButtonText} | |
| 140 </paper-button> | |
| 141 </add-printer-dialog-template> | |
| 142 </template> | |
| 143 </dom-module> | |
| 144 | |
| 145 <dom-module id="add-printer-configuring-dialog"> | |
| 146 <template> | |
| 147 <style include="settings-shared"></style> | |
| 148 <style> | |
| 149 .configuring-spinner { | |
| 150 padding-top: 140px; | |
| 151 text-align: center; | |
| 152 } | |
| 153 </style> | |
| 154 <add-printer-dialog-template> | |
| 155 <div class="configuring-spinner"> | |
| 156 <paper-spinner active></paper-spinner> | |
| 157 <div id="configuringMessage">$i18n{printerConfiguringMessage}</div> | |
| 158 </div> | |
| 159 <paper-button class="cancel-button" on-tap="onCancelConfiguringTap_"> | |
| 160 $i18n{cancelButtonText} | |
| 161 </paper-button> | |
| 162 </add-printer-dialog-template> | |
| 163 </template> | |
| 164 </dom-module> | |
| 165 | |
| 6 <dom-module id="settings-cups-add-printer-dialog"> | 166 <dom-module id="settings-cups-add-printer-dialog"> |
| 7 <template> | 167 <template> |
| 8 <style include="settings-shared"></style> | 168 <style include="settings-shared"></style> |
| 9 <style> | 169 |
| 10 #dialog .body { | 170 <!-- Printer Discovery Dialog --> |
| 11 height: 350px; | 171 <template is="dom-if" if="[[showDiscoveryDialog_]]" restamp> |
| 12 } | 172 <add-printer-discovery-dialog selected-printer="{{selectedPrinter}}"> |
| 13 | 173 </add-printer-discovery-dialog> |
| 14 #dialog .button-container { | 174 </template> |
| 15 border-top: 1px solid rgba(0, 0, 0, 0.14); | 175 |
| 16 font-size: 15px; | 176 <!-- Manually Add Printer Dialog --> |
| 17 font-weight: bold; | 177 <template is="dom-if" if="[[showManuallyAddDialog_]]" restamp> |
| 18 margin-top: 0; | 178 <add-printer-maually-dialog new-printer="{{newPrinter}}"> |
| 19 padding-top: 10px; | 179 </add-printer-dialog-template> |
| 20 } | 180 </template> |
| 21 </style> | 181 |
| 22 <dialog is="cr-dialog" id="dialog"> | 182 <!-- Configuring Printer Dialog --> |
| 23 <div class="title">$i18n{addPrinterTitle}</div> | 183 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> |
| 24 <div class="body"> | 184 <add-printer-configuring-dialog |
| 25 <!--TODO(xdai): Add printer settings go here. --> | 185 printer-name="[[getConfiguringPrinterName_()]]"> |
| 26 (coming soon) Add printer settings go here. | 186 </add-printer-configuring-dialog> |
| 27 </div> | 187 </template> |
| 28 <div class="button-container"> | 188 |
| 29 <paper-button on-tap="onCancelTap_"> | 189 <!-- TODO(xdai): Implement Manufacture and Model Dialog --> |
| 30 $i18n{cancelButtonText} | |
| 31 </paper-button> | |
| 32 <paper-button disabled> | |
| 33 $i18n{addPrinterButtonText} | |
| 34 </paper-button> | |
| 35 </div> | |
| 36 </dialog> | |
| 37 </template> | 190 </template> |
| 38 <script src="cups_add_printer_dialog.js"></script> | 191 <script src="cups_add_printer_dialog.js"></script> |
| 39 </dom-module> | 192 </dom-module> |
| OLD | NEW |