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