Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Side by Side Diff: chrome/browser/resources/options/chromeos/internet_detail.html

Issue 646753003: Correctly set controlled-setting-indicators in internet_detail.html (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="details-internet-page" class="page" hidden> 1 <div id="details-internet-page" class="page" hidden>
2 <div class="close-button"></div> 2 <div class="close-button"></div>
3 <!-- Network header --> 3 <!-- Network header -->
4 <div id="network-details-header"> 4 <div id="network-details-header">
5 <div id="network-details-title"></div> 5 <div id="network-details-title"></div>
6 <div id="network-details-subtitle"> 6 <div id="network-details-subtitle">
7 <span id="network-details-subtitle-status"></span> 7 <span id="network-details-subtitle-status"></span>
8 <span id="network-details-subtitle-separator"> - </span> 8 <span id="network-details-subtitle-separator"> - </span>
9 <span id="network-details-subtitle-type"></span> 9 <span id="network-details-subtitle-type"></span>
10 </div> 10 </div>
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 <div id="wifi-network-tab" class="subpages-tab-contents wifi-details"> 65 <div id="wifi-network-tab" class="subpages-tab-contents wifi-details">
66 <section> 66 <section>
67 <table class="option-control-table"> 67 <table class="option-control-table">
68 <tr id="prefer-network"> 68 <tr id="prefer-network">
69 <td> 69 <td>
70 <div class="checkbox controlled-setting-with-label"> 70 <div class="checkbox controlled-setting-with-label">
71 <label> 71 <label>
72 <input id="prefer-network-wifi" type="checkbox"> 72 <input id="prefer-network-wifi" type="checkbox">
73 <span> 73 <span>
74 <span i18n-content="inetPreferredNetwork"> 74 <span i18n-content="inetPreferredNetwork">
75 <span class="controlled-setting-indicator"></span> 75 <span class="controlled-setting-indicator"
76 managed="Priority"></span>
76 </span> 77 </span>
77 </label> 78 </label>
78 </div> 79 </div>
79 </td> 80 </td>
80 </tr> 81 </tr>
81 <tr class="auto-connect-network"> 82 <tr class="auto-connect-network">
82 <td> 83 <td>
83 <div class="checkbox controlled-setting-with-label"> 84 <div class="checkbox controlled-setting-with-label">
84 <label> 85 <label>
85 <input id="auto-connect-network-wifi" type="checkbox"> 86 <input id="auto-connect-network-wifi" type="checkbox">
86 <span> 87 <span>
87 <span i18n-content="inetAutoConnectNetwork"> 88 <span i18n-content="inetAutoConnectNetwork">
88 <span class="controlled-setting-indicator" 89 <span class="controlled-setting-indicator"
89 managed="AutoConnect"></span> 90 managed="AutoConnect"></span>
90 </span> 91 </span>
91 </label> 92 </label>
92 </div> 93 </div>
93 </td> 94 </td>
94 </tr> 95 </tr>
95 </table> 96 </table>
96 </section> 97 </section>
97 <section> 98 <section>
98 <table id="wifi-settings-table"> 99 <table id="wifi-settings-table">
99 <tr> 100 <tr>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 <section> 150 <section>
150 <table class="option-control-table"> 151 <table class="option-control-table">
151 <tr class="auto-connect-network"> 152 <tr class="auto-connect-network">
152 <td> 153 <td>
153 <div class="checkbox controlled-setting-with-label"> 154 <div class="checkbox controlled-setting-with-label">
154 <label> 155 <label>
155 <input id="auto-connect-network-wimax" type="checkbox"> 156 <input id="auto-connect-network-wimax" type="checkbox">
156 <span> 157 <span>
157 <span i18n-content="inetAutoConnectNetwork"></span> 158 <span i18n-content="inetAutoConnectNetwork"></span>
158 <span class="controlled-setting-indicator" 159 <span class="controlled-setting-indicator"
159 managed="AutoConnect"></span> 160 managed="AutoConnect"></span>
160 </span> 161 </span>
161 </label> 162 </label>
162 </div> 163 </div>
163 </td> 164 </td>
164 </tr> 165 </tr>
165 </table> 166 </table>
166 </section> 167 </section>
167 <section> 168 <section>
168 <table id="wimax-settings-table"> 169 <table id="wimax-settings-table">
169 <tr> 170 <tr>
(...skipping 28 matching lines...) Expand all
198 <section> 199 <section>
199 <table class="option-control-table"> 200 <table class="option-control-table">
200 <tr class="auto-connect-network"> 201 <tr class="auto-connect-network">
201 <td> 202 <td>
202 <div class="checkbox controlled-setting-with-label"> 203 <div class="checkbox controlled-setting-with-label">
203 <label> 204 <label>
204 <input id="auto-connect-network-vpn" type="checkbox"> 205 <input id="auto-connect-network-vpn" type="checkbox">
205 <span> 206 <span>
206 <span i18n-content="inetAutoConnectNetwork"></span> 207 <span i18n-content="inetAutoConnectNetwork"></span>
207 <span class="controlled-setting-indicator" 208 <span class="controlled-setting-indicator"
208 managed="AutoConnect"></span> 209 managed="AutoConnect"></span>
209 </span> 210 </span>
210 </label> 211 </label>
211 </div> 212 </div>
212 </td> 213 </td>
213 </tr> 214 </tr>
214 <tr> 215 <tr>
215 <td class="option-name" i18n-content="inetServiceName"></td> 216 <td class="option-name" i18n-content="inetServiceName"></td>
216 <td id="inet-service-name" class="option-value"></td> 217 <td id="inet-service-name" class="option-value"></td>
217 </tr> 218 </tr>
218 <tr> 219 <tr>
219 <td class="option-name" i18n-content="inetServerHostname"></td> 220 <td class="option-name" i18n-content="inetServerHostname"></td>
220 <td> 221 <td>
221 <input class="option-value" id="inet-server-hostname"></input> 222 <input class="option-value" id="inet-server-hostname"></input>
222 <span class="controlled-setting-indicator" managed="VPN.Host"> 223 <span class="controlled-setting-indicator"
223 </span> 224 managed="VPN.Host"></span>
224 </td> 225 </td>
225 </tr> 226 </tr>
226 <tr> 227 <tr>
227 <td class="option-name" i18n-content="inetProviderType"></td> 228 <td class="option-name" i18n-content="inetProviderType"></td>
228 <td id="inet-provider-type" class="option-value"></td> 229 <td id="inet-provider-type" class="option-value"></td>
229 </tr> 230 </tr>
230 <tr> 231 <tr>
231 <td class="option-name" i18n-content="inetUsername"></td> 232 <td class="option-name" i18n-content="inetUsername"></td>
232 <td id="inet-username" class="option-value"></td> 233 <td id="inet-username" class="option-value"></td>
233 </tr> 234 </tr>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 <td class="option-name" i18n-content="errorState"></td> 275 <td class="option-name" i18n-content="errorState"></td>
275 <td id="error-state" class="option-value"></td> 276 <td id="error-state" class="option-value"></td>
276 </tr> 277 </tr>
277 <tr class="gsm-only apn-list-view"> 278 <tr class="gsm-only apn-list-view">
278 <td class="option-name" i18n-content="cellularApnLabel"></td> 279 <td class="option-name" i18n-content="cellularApnLabel"></td>
279 <td id="cellular-apn-label" class="option-value"> 280 <td id="cellular-apn-label" class="option-value">
280 <select id="select-apn"> 281 <select id="select-apn">
281 <option value="-1" i18n-content="cellularApnOther"> 282 <option value="-1" i18n-content="cellularApnOther">
282 </option> 283 </option>
283 </select> 284 </select>
284 <span class="controlled-setting-indicator" data="providerApnList"> 285 <span class="controlled-setting-indicator"
285 </span> 286 managed="Cellular.APN"></span>
286 </td> 287 </td>
287 </tr> 288 </tr>
288 <tr class="gsm-only apn-details-view"> 289 <tr class="gsm-only apn-details-view">
289 <td class="option-name" i18n-content="cellularApnLabel"></td> 290 <td class="option-name" i18n-content="cellularApnLabel"></td>
290 <td id="cellular-apn-label" class="option-value"> 291 <td id="cellular-apn-label" class="option-value">
291 <input id="cellular-apn" type="text"> 292 <input id="cellular-apn" type="text">
292 </td> 293 </td>
293 </tr> 294 </tr>
294 <tr class="gsm-only apn-details-view"> 295 <tr class="gsm-only apn-details-view">
295 <td class="option-name" i18n-content="cellularApnUsername"></td> 296 <td class="option-name" i18n-content="cellularApnUsername"></td>
(...skipping 19 matching lines...) Expand all
315 </td> 316 </td>
316 </tr> 317 </tr>
317 <tr> 318 <tr>
318 <td colspan="2"> 319 <td colspan="2">
319 <div class="checkbox controlled-setting-with-label"> 320 <div class="checkbox controlled-setting-with-label">
320 <label> 321 <label>
321 <input id="auto-connect-network-cellular" type="checkbox"> 322 <input id="auto-connect-network-cellular" type="checkbox">
322 <span> 323 <span>
323 <span i18n-content="inetAutoConnectNetwork"></span> 324 <span i18n-content="inetAutoConnectNetwork"></span>
324 <span class="controlled-setting-indicator" 325 <span class="controlled-setting-indicator"
325 managed="AutoConnect"></span> 326 managed="AutoConnect"></span>
326 </span> 327 </span>
327 </label> 328 </label>
328 </div> 329 </div>
329 </td> 330 </td>
330 </tr> 331 </tr>
331 </table> 332 </table>
332 </section> 333 </section>
333 </div> 334 </div>
334 <div id="cellular-device-tab" class="subpages-tab-contents 335 <div id="cellular-device-tab" class="subpages-tab-contents
335 cellular-details"> 336 cellular-details">
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 </table> 401 </table>
401 </section> 402 </section>
402 <section id="ipconfig-section"> 403 <section id="ipconfig-section">
403 <div id="ip-automatic-configuration" 404 <div id="ip-automatic-configuration"
404 class="checkbox controlled-setting-with-label"> 405 class="checkbox controlled-setting-with-label">
405 <label> 406 <label>
406 <input id="ip-automatic-configuration-checkbox" 407 <input id="ip-automatic-configuration-checkbox"
407 type="checkbox"> 408 type="checkbox">
408 <span> 409 <span>
409 <span i18n-content="ipAutomaticConfiguration"></span> 410 <span i18n-content="ipAutomaticConfiguration"></span>
410 <span class="controlled-setting-indicator" data="ipconfigDHCP"> 411 <span class="controlled-setting-indicator"
411 </span> 412 managed="StaticIPConfig.IPAddress"></span>
412 </span> 413 </span>
413 </label> 414 </label>
414 </div> 415 </div>
415 <div> 416 <div>
416 <table id="ip-address-settings"> 417 <table id="ip-address-settings">
417 <tr> 418 <tr>
418 <td class="spacer" width="14px"></td> 419 <td class="spacer" width="14px"></td>
419 <td class="option-name" i18n-content="inetAddress"></td> 420 <td class="option-name" i18n-content="inetAddress"></td>
420 <td><div id="ip-address"></div></td> 421 <td><div id="ip-address"></div></td>
421 </tr> 422 </tr>
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 </div> 489 </div>
489 <div id="security-tab" 490 <div id="security-tab"
490 class="subpages-tab-contents cellular-details gsm-only"> 491 class="subpages-tab-contents cellular-details gsm-only">
491 <div id="cellular-security-options"> 492 <div id="cellular-security-options">
492 <section> 493 <section>
493 <div id="sim-pin-lock" class="checkbox controlled-setting-with-label"> 494 <div id="sim-pin-lock" class="checkbox controlled-setting-with-label">
494 <label> 495 <label>
495 <input id="sim-card-lock-enabled" type="checkbox"> 496 <input id="sim-card-lock-enabled" type="checkbox">
496 <span> 497 <span>
497 <span i18n-content="lockSimCard"></span> 498 <span i18n-content="lockSimCard"></span>
498 <span class="controlled-setting-indicator"></span> 499 <span class="controlled-setting-indicator"
500 mabaged="Cellular.SIMLockStatus.LockEnabled"></span>
pneubeck (no reviews) 2014/10/20 20:20:02 typo: mabaged -> managed
stevenjb 2014/10/20 21:32:05 Done.
499 </span> 501 </span>
500 </label> 502 </label>
501 </div> 503 </div>
502 </section> 504 </section>
503 <section> 505 <section>
504 <div id="change-pin-area"> 506 <div id="change-pin-area">
505 <button id="change-pin" i18n-content="changePinButton"></button> 507 <button id="change-pin" i18n-content="changePinButton"></button>
506 <span class="controlled-setting-indicator" 508 <span class="controlled-setting-indicator"
507 data="simCardLockEnabled"></span> 509 managed="Cellular.SIMLockStatus.LockType"></span>
508 </div> 510 </div>
509 </section> 511 </section>
510 </div> 512 </div>
511 </div> 513 </div>
512 <div id="network-proxy-tab" class="subpages-tab-contents"> 514 <div id="network-proxy-tab" class="subpages-tab-contents">
513 <section> 515 <section>
514 <div id="network-proxy-info-banner" hidden> 516 <div id="network-proxy-info-banner" hidden>
515 <span id="banner-text" class="page-banner-text"></span> 517 <span id="banner-text" class="page-banner-text"></span>
516 </div> 518 </div>
517 <div class="radio"> 519 <div class="radio">
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 <button id="details-internet-disconnect" i18n-content="disconnectButton"> 672 <button id="details-internet-disconnect" i18n-content="disconnectButton">
671 </button> 673 </button>
672 <button id="details-internet-configure" i18n-content="configureButton"> 674 <button id="details-internet-configure" i18n-content="configureButton">
673 </button> 675 </button>
674 <button id="activate-details" i18n-content="activateButton"></button> 676 <button id="activate-details" i18n-content="activateButton"></button>
675 <button id="view-account-details" i18n-content="viewAccountButton"> 677 <button id="view-account-details" i18n-content="viewAccountButton">
676 </button> 678 </button>
677 </div> 679 </div>
678 </div> 680 </div>
679 </div> 681 </div>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698