| 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"> |
| 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"> |
| 3 <link rel="import" href="/i18n_setup.html"> | 6 <link rel="import" href="/i18n_setup.html"> |
| 4 <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"> |
| 5 <link rel="import" href="/printing_page/cups_printers_browser_proxy.html"> | 8 <link rel="import" href="/printing_page/cups_printers_browser_proxy.html"> |
| 6 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
| 7 | 10 |
| 8 <dom-module id="add-printer-discovery-dialog"> | 11 <dom-module id="add-printer-discovery-dialog"> |
| 9 <template> | 12 <template> |
| 10 <style include="settings-shared"> | 13 <style include="settings-shared"> |
| 11 add-printer-list { | 14 add-printer-list { |
| 12 max-height: 350px; | 15 max-height: 350px; |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 } | 56 } |
| 54 | 57 |
| 55 .settings-box.two-line { | 58 .settings-box.two-line { |
| 56 min-height: 72px; | 59 min-height: 72px; |
| 57 } | 60 } |
| 58 | 61 |
| 59 .settings-box .start .label { | 62 .settings-box .start .label { |
| 60 color: var(--google-grey-700); | 63 color: var(--google-grey-700); |
| 61 } | 64 } |
| 62 | 65 |
| 63 paper-dropdown-menu, | 66 paper-dropdown-menu-light, |
| 64 paper-input { | 67 paper-input { |
| 65 width: 270px; | 68 --paper-input-container-color: var(--google-grey-500); |
| 66 } | |
| 67 | |
| 68 paper-input { | |
| 69 --paper-input-container-input: { | 69 --paper-input-container-input: { |
| 70 font-size: inherit; | 70 font-size: inherit; |
| 71 }; | 71 }; |
| 72 | 72 width: 270px; |
| 73 --paper-input-container-color: var(--google-grey-500); | |
| 74 } | 73 } |
| 75 | 74 |
| 76 #printerNameInput { | 75 #printerNameInput { |
| 77 width: 450px; | 76 width: 450px; |
| 78 } | 77 } |
| 78 |
| 79 .search-printer-box { |
| 80 margin-top: 18px; |
| 81 } |
| 82 |
| 83 .search-printer-box paper-spinner { |
| 84 --paper-spinner-stroke-width: 2px; |
| 85 height: 15px; |
| 86 margin-left: 20px; |
| 87 margin-right: 3px; |
| 88 width: 15px; |
| 89 } |
| 90 |
| 91 .search-printer-box .spinner-comment { |
| 92 color: var(--google-grey-700); |
| 93 } |
| 94 |
| 95 .printer-not-found { |
| 96 background-color: var(--paper-yellow-100); |
| 97 padding: 10px 20px; |
| 98 } |
| 99 |
| 100 .printer-found { |
| 101 background-color: var(--paper-green-100); |
| 102 padding: 10px 20px; |
| 103 } |
| 79 </style> | 104 </style> |
| 80 <add-printer-dialog> | 105 <add-printer-dialog> |
| 81 <div class="dialog-body"> | 106 <div class="dialog-body"> |
| 82 <div class="settings-box first two-line"> | 107 <div class="settings-box first two-line"> |
| 83 <div class="start"> | 108 <div class="start"> |
| 84 <div class="label">$i18n{printerName}</div> | 109 <div class="label">$i18n{printerName}</div> |
| 85 <div class="secondary"> | 110 <div class="secondary"> |
| 86 <paper-input no-label-float id="printerNameInput" | 111 <paper-input no-label-float id="printerNameInput" |
| 87 value="{{newPrinter.printerName}}"> | 112 value="{{newPrinter.printerName}}"> |
| 88 </paper-input> | 113 </paper-input> |
| 89 </div> | 114 </div> |
| 90 </div> | 115 </div> |
| 91 </div> | 116 </div> |
| 92 <div class="settings-box two-line"> | 117 <div class="settings-box two-line"> |
| 93 <div class="start"> | 118 <div class="start"> |
| 94 <div class="label">$i18n{printerAddress}</div> | 119 <div class="label">$i18n{printerAddress}</div> |
| 95 <div class="secondary"> | 120 <div class="secondary"> |
| 96 <paper-input no-label-float value="{{newPrinter.printerAddress}}"> | 121 <paper-input no-label-float id="printerAddressInput" |
| 122 value="{{newPrinter.printerAddress}}" |
| 123 on-input="onAddressChanged_"> |
| 97 </paper-input> | 124 </paper-input> |
| 98 </div> | 125 </div> |
| 99 </div> | 126 </div> |
| 100 </div> | 127 </div> |
| 101 <div class="settings-box two-line"> | 128 <div class="settings-box two-line"> |
| 102 <div class="start"> | 129 <div class="start"> |
| 103 <div class="label">$i18n{printerProtocol}</div> | 130 <div class="label">$i18n{printerProtocol}</div> |
| 104 <div class="secondary"> | 131 <div class="secondary"> |
| 105 <paper-dropdown-menu no-label-float> | 132 <paper-dropdown-menu-light no-label-float> |
| 106 <paper-listbox class="dropdown-content" | 133 <paper-listbox class="dropdown-content" |
| 107 selected="{{newPrinter.printerProtocol}}" | 134 selected="{{newPrinter.printerProtocol}}" |
| 108 attr-for-selected="value"> | 135 attr-for-selected="value"> |
| 109 <paper-item value="ipp"> | 136 <paper-item value="ipp"> |
| 110 $i18n{printerProtocolIpp} | 137 $i18n{printerProtocolIpp} |
| 111 </paper-item> | 138 </paper-item> |
| 112 <paper-item value="ipps"> | 139 <paper-item value="ipps"> |
| 113 $i18n{printerProtocolIpps} | 140 $i18n{printerProtocolIpps} |
| 114 </paper-item> | 141 </paper-item> |
| 115 <paper-item value="http"> | 142 <paper-item value="http"> |
| 116 $i18n{printerProtocolHttp} | 143 $i18n{printerProtocolHttp} |
| 117 </paper-item> | 144 </paper-item> |
| 118 <paper-item value="https"> | 145 <paper-item value="https"> |
| 119 $i18n{printerProtocolHttps} | 146 $i18n{printerProtocolHttps} |
| 120 </paper-item> | 147 </paper-item> |
| 121 <paper-item value="socket"> | 148 <paper-item value="socket"> |
| 122 $i18n{printerProtocolAppSocket} | 149 $i18n{printerProtocolAppSocket} |
| 123 </paper-item> | 150 </paper-item> |
| 124 <paper-item value="lpd">$i18n{printerProtocolLpd}</paper-item> | 151 <paper-item value="lpd">$i18n{printerProtocolLpd}</paper-item> |
| 125 <paper-item value="usb">$i18n{printerProtocolUsb}</paper-item> | 152 <paper-item value="usb">$i18n{printerProtocolUsb}</paper-item> |
| 126 </paper-listbox> | 153 </paper-listbox> |
| 127 </paper-dropdown-menu> | 154 </paper-dropdown-menu-light> |
| 128 </div> | 155 </div> |
| 129 </div> | 156 </div> |
| 130 </div> | 157 </div> |
| 131 <div class="settings-box two-line"> | 158 <div class="settings-box two-line"> |
| 132 <div class="start"> | 159 <div class="start"> |
| 133 <div class="label">$i18n{printerQueue}</div> | 160 <div class="label">$i18n{printerQueue}</div> |
| 134 <div class="secondary"> | 161 <div class="secondary"> |
| 135 <paper-input no-label-float value="{{newPrinter.printerQueue}}"> | 162 <paper-input no-label-float value="{{newPrinter.printerQueue}}"> |
| 136 </paper-input> | 163 </paper-input> |
| 137 </div> | 164 </div> |
| 138 </div> | 165 </div> |
| 139 </div> | 166 </div> |
| 140 <!-- TODO(xdai): Add paper-spinner --> | 167 <div class="search-printer-box" id="searchInProgress" hidden> |
| 168 <paper-spinner active></paper-spinner> |
| 169 <span class="spinner-comment">$i18n{searchingPrinter}</span> |
| 170 </div> |
| 171 <div class="search-printer-box printer-not-found" |
| 172 id="searchNotFound" hidden> |
| 173 <span>$i18n{printerNotFound}</span> |
| 174 </div> |
| 175 <div class="search-printer-box printer-found" id="searchFound" hidden> |
| 176 <span>$i18n{printerFound}</span> |
| 177 </div> |
| 141 </div> | 178 </div> |
| 142 <div class="dialog-buttons"> | 179 <div class="dialog-buttons"> |
| 143 <paper-button id="discoverPrintersButton" | 180 <paper-button id="discoverPrintersButton" |
| 144 on-tap="switchToDiscoveryDialog_"> | 181 on-tap="switchToDiscoveryDialog_"> |
| 145 $i18n{discoverPrintersButtonText} | 182 $i18n{discoverPrintersButtonText} |
| 146 </paper-button> | 183 </paper-button> |
| 147 <paper-button class="cancel-button" on-tap="onCancelTap_"> | 184 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
| 148 $i18n{cancelButtonText} | 185 $i18n{cancelButtonText} |
| 149 </paper-button> | 186 </paper-button> |
| 150 <paper-button class="action-button" on-tap="switchToConfiguringDialog_"> | 187 <paper-button class="action-button" on-tap="switchToManufacturerDialog_" |
| 188 disabled="[[addPrinterNotAllowed_(newPrinter.printerName, |
| 189 newPrinter.printerAddress)]]"> |
| 151 $i18n{addPrinterButtonText} | 190 $i18n{addPrinterButtonText} |
| 152 </paper-button> | 191 </paper-button> |
| 153 </div> | 192 </div> |
| 193 </add-printer-dialog> |
| 194 </template> |
| 195 </dom-module> |
| 196 |
| 197 <dom-module id="add-printer-manufacturer-model-dialog"> |
| 198 <template> |
| 199 <style include="settings-shared"> |
| 200 .settings-box { |
| 201 border-top: none; |
| 202 margin-bottom: 10px; |
| 203 } |
| 204 |
| 205 .settings-box .start .label { |
| 206 color: var(--google-grey-700); |
| 207 } |
| 208 |
| 209 #manuallyAddPrinterButton { |
| 210 -webkit-margin-end: 210px; |
| 211 } |
| 212 </style> |
| 213 <add-printer-dialog> |
| 214 <div class="dialog-body"> |
| 215 <div class="settings-box first"> |
| 216 $i18n{selectManufacturerModelMessage} |
| 217 </div> |
| 218 <div class="settings-box two-line"> |
| 219 <div class="start"> |
| 220 <div class="label">$i18n{printerManufacturer}</div> |
| 221 <div class="secondary"> |
| 222 <drop-down-search-box items="[[manufacturerList]]" |
| 223 selected-item="{{newPrinter.printerManufacturer}}"> |
| 224 </drop-down-search-box> |
| 225 </div> |
| 226 </div> |
| 227 </div> |
| 228 <div class="settings-box two-line"> |
| 229 <div class="start"> |
| 230 <div class="label">$i18n{printerModel}</div> |
| 231 <div class="secondary"> |
| 232 <drop-down-search-box items="[[modelList]]" |
| 233 selected-item="{{newPrinter.printerModel}}"> |
| 234 </drop-down-search-box> |
| 235 </div> |
| 236 </div> |
| 237 </div> |
| 238 </div> |
| 239 <div class="dialog-buttons"> |
| 240 <paper-button id="manuallyAddPrinterButton" |
| 241 on-tap="switchToManualAddDialog_"> |
| 242 $i18n{manuallyAddPrinterButtonText} |
| 243 </paper-button> |
| 244 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
| 245 $i18n{cancelButtonText} |
| 246 </paper-button> |
| 247 <paper-button class="action-button" id="addPrinterButton" |
| 248 on-tap="switchToConfiguringDialog_"> |
| 249 $i18n{addPrinterButtonText} |
| 250 </paper-button> |
| 251 </div> |
| 154 </add-printer-dialog> | 252 </add-printer-dialog> |
| 155 </template> | 253 </template> |
| 156 </dom-module> | 254 </dom-module> |
| 157 | 255 |
| 158 <dom-module id="add-printer-configuring-dialog"> | 256 <dom-module id="add-printer-configuring-dialog"> |
| 159 <template> | 257 <template> |
| 160 <style include="settings-shared"> | 258 <style include="settings-shared"> |
| 161 .dialog-body { | 259 .dialog-body { |
| 162 padding-top: 140px; | 260 padding-top: 140px; |
| 163 text-align: center; | 261 text-align: center; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 193 </add-printer-maually-dialog> | 291 </add-printer-maually-dialog> |
| 194 </template> | 292 </template> |
| 195 | 293 |
| 196 <!-- Configuring Printer Dialog --> | 294 <!-- Configuring Printer Dialog --> |
| 197 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> | 295 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> |
| 198 <add-printer-configuring-dialog | 296 <add-printer-configuring-dialog |
| 199 printer-name="[[getConfiguringPrinterName_()]]"> | 297 printer-name="[[getConfiguringPrinterName_()]]"> |
| 200 </add-printer-configuring-dialog> | 298 </add-printer-configuring-dialog> |
| 201 </template> | 299 </template> |
| 202 | 300 |
| 203 <!-- TODO(xdai): Implement Manufacturer and Model Dialog --> | 301 <!-- Manufacturer and Model Dialog --> |
| 302 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> |
| 303 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}"> |
| 304 </add-printer-manufacturer-model-dialog> |
| 305 </template> |
| 306 |
| 204 </template> | 307 </template> |
| 205 <script src="cups_add_printer_dialog.js"></script> | 308 <script src="cups_add_printer_dialog.js"></script> |
| 206 </dom-module> | 309 </dom-module> |
| OLD | NEW |