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

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

Issue 10073007: Add network settings to Wifi tab. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 28 matching lines...) Expand all
39 <span class="active-tab-label" 39 <span class="active-tab-label"
40 i18n-content="cellularConnTabLabel"></span> 40 i18n-content="cellularConnTabLabel"></span>
41 </span> 41 </span>
42 <span id="cellular-device-nav-tab" class="tab cellular-details" 42 <span id="cellular-device-nav-tab" class="tab cellular-details"
43 tab-contents="cellular-device-tab"> 43 tab-contents="cellular-device-tab">
44 <span class="tab-label" 44 <span class="tab-label"
45 i18n-content="cellularDeviceTabLabel"></span> 45 i18n-content="cellularDeviceTabLabel"></span>
46 <span class="active-tab-label" 46 <span class="active-tab-label"
47 i18n-content="cellularDeviceTabLabel"></span> 47 i18n-content="cellularDeviceTabLabel"></span>
48 </span> 48 </span>
49 <span id="internet-nav-tab" class="tab" tab-contents="internet-tab"> 49 <span id="internet-nav-tab" class="tab network-details"
50 tab-contents="internet-tab">
50 <span class="tab-label" i18n-content="networkTabLabel"></span> 51 <span class="tab-label" i18n-content="networkTabLabel"></span>
51 <span class="active-tab-label" i18n-content="networkTabLabel"></span> 52 <span class="active-tab-label" i18n-content="networkTabLabel"></span>
52 </span> 53 </span>
53 <span id="security-nav-tab" class="tab cellular-details gsm-only" 54 <span id="security-nav-tab" class="tab cellular-details gsm-only"
54 tab-contents="security-tab"> 55 tab-contents="security-tab">
55 <span class="tab-label" i18n-content="securityTabLabel"></span> 56 <span class="tab-label" i18n-content="securityTabLabel"></span>
56 <span class="active-tab-label" i18n-content="securityTabLabel"></span> 57 <span class="active-tab-label" i18n-content="securityTabLabel"></span>
57 </span> 58 </span>
58 <span id="internet-proxy-nav-tab" class="tab proxy-details" 59 <span id="internet-proxy-nav-tab" class="tab proxy-details"
59 tab-contents="network-proxy-tab"> 60 tab-contents="network-proxy-tab">
60 <span class="tab-label" i18n-content="proxyTabLabel"></span> 61 <span class="tab-label" i18n-content="proxyTabLabel"></span>
61 <span class="active-tab-label" i18n-content="proxyTabLabel"></span> 62 <span class="active-tab-label" i18n-content="proxyTabLabel"></span>
62 </span> 63 </span>
63 </div> 64 </div>
64 <div id="wifi-network-tab" class="subpages-tab-contents wifi-details"> 65 <div id="wifi-network-tab" class="subpages-tab-contents wifi-details">
65 <section> 66 <section>
66 <table class="ssid-table">
67 <tr>
68 <td class="option-name" i18n-content="inetSsid"></td>
69 <td id="inet-ssid" class="option-value"></td>
70 </tr>
71 </table>
72 </section>
73 <section>
74 <table class="option-control-table"> 67 <table class="option-control-table">
75 <tr class="prefer-network"> 68 <tr id="prefer-network">
76 <td> 69 <td>
77 <div class="checkbox"> 70 <div class="checkbox">
78 <label> 71 <label>
79 <input id="prefer-network-wifi" type="checkbox"> 72 <input id="prefer-network-wifi" type="checkbox">
80 <span i18n-content="inetPreferredNetwork"></span> 73 <span i18n-content="inetPreferredNetwork"></span>
81 </label> 74 </label>
82 <span class="controlled-setting-indicator" data="preferred" 75 <span class="controlled-setting-indicator" data="preferred"
83 for="prefer-network-wifi"></span> 76 for="prefer-network-wifi"></span>
84 </div> 77 </div>
85 </td> 78 </td>
86 </tr> 79 </tr>
87 <tr class="auto-connect-network"> 80 <tr class="auto-connect-network">
88 <td> 81 <td>
89 <div class="checkbox"> 82 <div class="checkbox">
90 <label> 83 <label>
91 <input id="auto-connect-network-wifi" type="checkbox"> 84 <input id="auto-connect-network-wifi" type="checkbox">
92 <span i18n-content="inetAutoConnectNetwork"></span> 85 <span i18n-content="inetAutoConnectNetwork"></span>
93 </label> 86 </label>
94 <span class="controlled-setting-indicator" data="autoConnect" 87 <span class="controlled-setting-indicator" data="autoConnect"
95 for="auto-connect-network-wifi"></span> 88 for="auto-connect-network-wifi"></span>
96 </div> 89 </div>
97 </td> 90 </td>
98 </tr> 91 </tr>
99 </table> 92 </table>
100 </section> 93 </section>
101 <section id="password-network" class="password-details"> 94 <section>
102 <table class="option-control-table"> 95 <table id="wifi-settings-table">
103 <tr> 96 <tr>
104 <td class="option-name" i18n-content="inetPassProtected"></td> 97 <td class="option-name" i18n-content="connectionState"></td>
98 <td id="wifi-connection-state" class="option-value"></td>
99 <tr>
100 <td class="option-name" i18n-content="inetSsid"></td>
101 <td id="wifi-ssid" class="option-value"></td>
102 </tr>
103 <tr>
104 <td class="option-name" i18n-content="inetAddress"></td>
105 <td id="wifi-ip-address" class="option-value"></td>
106 </tr>
107 <tr>
108 <td class="option-name" i18n-content="inetSubnetAddress"></td>
109 <td id="wifi-subnet-address" class="option-value"></td>
110 </tr>
111 <tr>
112 <td class="option-name" i18n-content="inetGateway"></td>
113 <td id="wifi-gateway" class="option-value"></td>
114 </tr>
115 <tr>
116 <td class="option-name" i18n-content="inetDns"></td>
117 <td id="wifi-dns" class="option-value"></td>
118 </tr>
119 <tr id="wifi-security-entry">
120 <td class="options-name" i18n-content="inetEncryption"></td>
121 <td id="wifi-security" class="option-value"></td>
122 </tr>
123 <tr id="wifi-hardware-address-entry">
124 <td class="option-name" i18n-content="hardwareAddress"></td>
125 <td id="wifi-hardware-address" class="option-value"></td>
105 </tr> 126 </tr>
106 </table> 127 </table>
107 </section> 128 </section>
108 <section id="shared-network" class="shared-network"> 129 <section>
109 <table class="option-control-table"> 130 <table class="option-control-table">
110 <tr> 131 <tr>
111 <td class="option-name" i18n-content="inetNetworkShared"></td> 132 <td id="password-details" class="option-name"
133 i18n-content="inetPassProtected">
134 </td>
135 </tr>
136 <tr>
137 <td id="shared-network" class="option-name"
138 i18n-content="inetNetworkShared">
139 </td>
112 </tr> 140 </tr>
113 </table> 141 </table>
114 </section> 142 </section>
115 </div> 143 </div>
116 <div id="vpn-tab" class="subpages-tab-contents vpn-details"> 144 <div id="vpn-tab" class="subpages-tab-contents vpn-details">
117 <section> 145 <section>
118 <table class="option-control-table"> 146 <table class="option-control-table">
119 <tr> 147 <tr>
120 <td class="option-name" i18n-content="inetServiceName"></td> 148 <td class="option-name" i18n-content="inetServiceName"></td>
121 <td id="inet-service-name" class="option-value"></td> 149 <td id="inet-service-name" class="option-value"></td>
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 </button> 536 </button>
509 <button id="details-internet-disconnect" i18n-content="disconnectButton"> 537 <button id="details-internet-disconnect" i18n-content="disconnectButton">
510 </button> 538 </button>
511 <button id="activate-details" i18n-content="activateButton"></button> 539 <button id="activate-details" i18n-content="activateButton"></button>
512 <button id="buyplan-details" i18n-content="buyplanButton"></button> 540 <button id="buyplan-details" i18n-content="buyplanButton"></button>
513 <button id="view-account-details" i18n-content="viewAccountButton"> 541 <button id="view-account-details" i18n-content="viewAccountButton">
514 </button> 542 </button>
515 </div> 543 </div>
516 </div> 544 </div>
517 </div> 545 </div>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options2/chromeos/internet_detail.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698