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

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

Issue 10827283: This updates the StaticIP configuration UI to match new mocks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 8 years, 4 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 | Annotate | Revision Log
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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 </tr> 109 </tr>
110 <tr id="wifi-bssid-entry"> 110 <tr id="wifi-bssid-entry">
111 <td class="option-name" i18n-content="inetBssid"></td> 111 <td class="option-name" i18n-content="inetBssid"></td>
112 <td id="wifi-bssid" class="option-value"></td> 112 <td id="wifi-bssid" class="option-value"></td>
113 </tr> 113 </tr>
114 <tr class="wifi-network-setting"> 114 <tr class="wifi-network-setting">
115 <td class="option-name" i18n-content="inetAddress"></td> 115 <td class="option-name" i18n-content="inetAddress"></td>
116 <td id="wifi-ip-address" class="option-value"></td> 116 <td id="wifi-ip-address" class="option-value"></td>
117 </tr> 117 </tr>
118 <tr class="wifi-network-setting"> 118 <tr class="wifi-network-setting">
119 <td class="option-name" i18n-content="inetSubnetAddress"></td> 119 <td class="option-name" i18n-content="inetNetmask"></td>
120 <td id="wifi-subnet-address" class="option-value"></td> 120 <td id="wifi-netmask" class="option-value"></td>
121 </tr> 121 </tr>
122 <tr class="wifi-network-setting"> 122 <tr class="wifi-network-setting">
123 <td class="option-name" i18n-content="inetGateway"></td> 123 <td class="option-name" i18n-content="inetGateway"></td>
124 <td id="wifi-gateway" class="option-value"></td> 124 <td id="wifi-gateway" class="option-value"></td>
125 </tr> 125 </tr>
126 <tr class="wifi-network-setting"> 126 <tr class="wifi-network-setting">
127 <td class="option-name" i18n-content="inetDns"></td> 127 <td class="option-name" i18n-content="inetNameServers"></td>
128 <td id="wifi-dns" class="option-value"></td> 128 <td id="wifi-name-servers" class="option-value"></td>
129 </tr> 129 </tr>
130 <tr id="wifi-security-entry"> 130 <tr id="wifi-security-entry">
131 <td class="options-name" i18n-content="inetEncryption"></td> 131 <td class="options-name" i18n-content="inetEncryption"></td>
132 <td id="wifi-security" class="option-value"></td> 132 <td id="wifi-security" class="option-value"></td>
133 </tr> 133 </tr>
134 <tr> 134 <tr>
135 <td class="options-name" i18n-content="inetFrequency"></td> 135 <td class="options-name" i18n-content="inetFrequency"></td>
136 <td id="wifi-frequency" class="option-value"></td> 136 <td id="wifi-frequency" class="option-value"></td>
137 </tr> 137 </tr>
138 <tr> 138 <tr>
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 <td class="option-name" i18n-content="connectionState"></td> 398 <td class="option-name" i18n-content="connectionState"></td>
399 <td id="connection-state" class="option-value"></td> 399 <td id="connection-state" class="option-value"></td>
400 </tr> 400 </tr>
401 <tr id="hardware-address-row"> 401 <tr id="hardware-address-row">
402 <td class="option-name" i18n-content="hardwareAddress"></td> 402 <td class="option-name" i18n-content="hardwareAddress"></td>
403 <td id="hardware-address" class="option-value"></td> 403 <td id="hardware-address" class="option-value"></td>
404 </tr> 404 </tr>
405 </table> 405 </table>
406 </section> 406 </section>
407 <section id="ipconfig-section"> 407 <section id="ipconfig-section">
408 <div id="ip-automatic-configuration" class="checkbox">
409 <label>
410 <input id="ip-automatic-configuration-checkbox"
411 type="checkbox">
412 <span i18n-content="ipAutomaticConfiguration"></span>
413 </label>
414 <span class="controlled-setting-indicator" data="ipconfigDHCP"
415 for="ip-automatic-configuration"></span>
416 </div>
408 <div> 417 <div>
409 <div id="ip-type-dhcp-div" class="radio"> 418 <table id="ip-address-settings">
410 <label> 419 <tr>
411 <input type="radio" name="iptype" id="ip-type-dhcp" value="1"> 420 <td class="spacer" width="14px"></td>
412 <span i18n-content="useDHCP"></span> 421 <td class="option-name" i18n-content="inetAddress"></td>
413 </label> 422 <td><div id="ip-address"></div></td>
414 <span class="controlled-setting-indicator" data="ipconfigDHCP" 423 </tr>
415 for="ip-type-dhcp"></span> 424 <tr>
416 </div> 425 <td class="spacer" width="14px"></td>
417 <div id="ip-type-static-div" class="radio"> 426 <td class="option-name" id="ip-netmask-label"
418 <label> 427 i18n-content="inetNetmask"></td>
419 <input type="radio" name="iptype" id="ip-type-static" value="0"> 428 <td><div id="ip-netmask"></div></td>
420 <span i18n-content="useStaticIP"></span> 429 </tr>
421 </label> 430 <tr>
422 <span class="controlled-setting-indicator" data="ipconfigStatic" 431 <td class="spacer" width="14px"></td>
423 for="ip-type-static"></span> 432 <td class="option-name" i18n-content="inetGateway"></td>
424 </div> 433 <td><div id="ip-gateway"></div></td>
425 <div id="ip-config-management" class="settings-list"> 434 </tr>
426 <list id="ip-config-list"></list> 435 </table>
427 </div> 436 </section>
437 <section id="ipconfig-dns-section">
438 <div class="radio">
439 <label>
440 <input id="automatic-dns-radio" type="radio" name="dnstype"
441 value="automatic">
442 <span i18n-content="automaticNameServers"></span>
443 </label>
428 </div> 444 </div>
445 <div id="automatic-dns-display" class="dns-display"></div>
446 <div class="radio">
447 <label>
448 <input id="google-dns-radio" type="radio" name="dnstype"
449 value="google">
450 <span i18n-content="googleNameServers"></span>
451 </label>
452 </div>
453 <div id="google-dns-display" class="dns-display"></div>
454 <div class="radio">
455 <label>
456 <input id="user-dns-radio" type="radio" name="dnstype"
457 value="user">
458 <span i18n-content="userNameServers"></span>
459 </label>
460 </div>
461 <table id="user-dns-settings">
462 <tr>
463 <td class="spacer" width="14px"></td>
464 <td>
465 <div id="ipconfig-dns1" i18n-placeholder-text="userNameServer1"
466 allow-empty>
467 </div>
468 </td>
469 <td>
470 <div id="ipconfig-dns2" i18n-placeholder-text="userNameServer2"
471 allow-empty>
472 </div>
473 </td>
474 </tr>
475 <tr>
476 <td class="spacer" width="14px"></td>
477 <td>
478 <div id="ipconfig-dns3" i18n-placeholder-text="userNameServer3"
479 allow-empty>
480 </div>
481 </td>
482 <td>
483 <div id="ipconfig-dns4" i18n-placeholder-text="userNameServer4"
484 allow-empty>
485 </div>
486 </td>
487 </tr>
488 </table>
429 </section> 489 </section>
430 </div> 490 </div>
431 <div id="security-tab" 491 <div id="security-tab"
432 class="subpages-tab-contents cellular-details gsm-only"> 492 class="subpages-tab-contents cellular-details gsm-only">
433 <div id="cellular-security-options"> 493 <div id="cellular-security-options">
434 <section> 494 <section>
435 <div id="sim-pin-lock" class="checkbox"> 495 <div id="sim-pin-lock" class="checkbox">
436 <label> 496 <label>
437 <input id="sim-card-lock-enabled" type="checkbox"> 497 <input id="sim-card-lock-enabled" type="checkbox">
438 <span i18n-content="lockSimCard"></span> 498 <span i18n-content="lockSimCard"></span>
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 </button> 658 </button>
599 <button id="details-internet-disconnect" i18n-content="disconnectButton"> 659 <button id="details-internet-disconnect" i18n-content="disconnectButton">
600 </button> 660 </button>
601 <button id="activate-details" i18n-content="activateButton"></button> 661 <button id="activate-details" i18n-content="activateButton"></button>
602 <button id="buyplan-details" i18n-content="buyplanButton"></button> 662 <button id="buyplan-details" i18n-content="buyplanButton"></button>
603 <button id="view-account-details" i18n-content="viewAccountButton"> 663 <button id="view-account-details" i18n-content="viewAccountButton">
604 </button> 664 </button>
605 </div> 665 </div>
606 </div> 666 </div>
607 </div> 667 </div>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698