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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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: Cleanup for review 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/resources/options2/chromeos/internet_detail.css ('K') | « chrome/browser/resources/options2/chromeos/internet_detail.css ('k') | chrome/browser/resources/options2/chromeos/internet_detail.js » ('j') | chrome/browser/resources/options2/chromeos/internet_detail.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options2/chromeos/internet_detail.html
diff --git a/chrome/browser/resources/options2/chromeos/internet_detail.html b/chrome/browser/resources/options2/chromeos/internet_detail.html
index 19a5757ef5f12d7f8b0608a5cb887551fd289b3c..8f17e3bbf932724f9120dfa5d7c61ff64d71c27e 100644
--- a/chrome/browser/resources/options2/chromeos/internet_detail.html
+++ b/chrome/browser/resources/options2/chromeos/internet_detail.html
@@ -116,16 +116,16 @@
<td id="wifi-ip-address" class="option-value"></td>
</tr>
<tr class="wifi-network-setting">
- <td class="option-name" i18n-content="inetSubnetAddress"></td>
- <td id="wifi-subnet-address" class="option-value"></td>
+ <td class="option-name" i18n-content="inetNetmask"></td>
+ <td id="wifi-netmask" class="option-value"></td>
</tr>
<tr class="wifi-network-setting">
<td class="option-name" i18n-content="inetGateway"></td>
<td id="wifi-gateway" class="option-value"></td>
</tr>
<tr class="wifi-network-setting">
- <td class="option-name" i18n-content="inetDns"></td>
- <td id="wifi-dns" class="option-value"></td>
+ <td class="option-name" i18n-content="inetNameServers"></td>
+ <td id="wifi-name-servers" class="option-value"></td>
</tr>
<tr id="wifi-security-entry">
<td class="options-name" i18n-content="inetEncryption"></td>
@@ -405,27 +405,75 @@
</table>
</section>
<section id="ipconfig-section">
+ <div id="ip-automatic-configuration" class="checkbox">
+ <label>
+ <input id="ip-automatic-configuration-checkbox"
+ type="checkbox">
Dan Beam 2012/08/11 01:38:02 nit: I think we tend to encourage non-ASCII indent
Greg Spencer (Chromium) 2012/08/13 19:20:04 Done.
+ <span i18n-content="ipAutomaticConfiguration"></span>
+ </label>
+ <span class="controlled-setting-indicator" data="ipconfigDHCP"
+ for="ip-automatic-configuration"></span>
+ </div>
<div>
- <div id="ip-type-dhcp-div" class="radio">
- <label>
- <input type="radio" name="iptype" id="ip-type-dhcp" value="1">
- <span i18n-content="useDHCP"></span>
- </label>
- <span class="controlled-setting-indicator" data="ipconfigDHCP"
- for="ip-type-dhcp"></span>
- </div>
- <div id="ip-type-static-div" class="radio">
- <label>
- <input type="radio" name="iptype" id="ip-type-static" value="0">
- <span i18n-content="useStaticIP"></span>
- </label>
- <span class="controlled-setting-indicator" data="ipconfigStatic"
- for="ip-type-static"></span>
- </div>
- <div id="ip-config-management" class="settings-list">
- <list id="ip-config-list"></list>
- </div>
+ <table id="ip-address-settings">
+ <tr>
+ <td class="spacer" width="14px"></td>
+ <td class="option-name" i18n-content="inetAddress"></td>
+ <td><div id="ip-address"/></td>
Dan Beam 2012/08/11 01:38:02 can you close these tags? <div></div>
Greg Spencer (Chromium) 2012/08/13 19:20:04 Done.
+ </tr>
+ <tr>
+ <td class="spacer" width="14px"></td>
+ <td class="option-name" id="ip-netmask-label"
+ i18n-content="inetNetmask"></td>
+ <td><div id="ip-netmask"></td>
Dan Beam 2012/08/11 01:38:02 it seem otherwise people might forget to put a /,
Greg Spencer (Chromium) 2012/08/13 19:20:04 Haha! I see your point. :) Fixed, here and below.
+ </tr>
+ <tr>
+ <td class="spacer" width="14px"></td>
+ <td class="option-name" i18n-content="inetGateway"></td>
+ <td><div id="ip-gateway"></td>
+ </tr>
+ </table>
+ </section>
+ <section id="ipconfig-dns-section">
+ <div class="radio">
+ <label>
+ <input id="automatic-dns-radio" type="radio" name="dnstype"
+ value="automatic">
+ <span i18n-content="automaticNameServers"></span>
+ </label>
+ </div>
+ <div id="automatic-dns-display" class="dns-display"></div>
+ <div class="radio">
+ <label>
+ <input id="google-dns-radio" type="radio" name="dnstype"
+ value="google">
+ <span i18n-content="googleNameServers"></span>
+ </label>
</div>
+ <div id="google-dns-display" class="dns-display"></div>
+ <div class="radio">
+ <label>
+ <input id="user-dns-radio" type="radio" name="dnstype"
+ value="user">
+ <span i18n-content="userNameServers"></span>
+ </label>
+ </div>
+ <table id="user-dns-settings">
+ <tr>
+ <td class="spacer" width="14px"></td>
+ <td><div id="ipconfig-dns1" i18n-placeholder-text="userNameServer1"
Dan Beam 2012/08/11 01:38:02 nit: whenever a tag's more than one line, it shoul
Greg Spencer (Chromium) 2012/08/13 19:20:04 Done.
+ allow-empty></td>
+ <td><div id="ipconfig-dns2" i18n-placeholder-text="userNameServer2"
+ allow-empty></td>
+ </tr>
+ <tr>
+ <td class="spacer" width="14px"></td>
+ <td><div id="ipconfig-dns3" i18n-placeholder-text="userNameServer3"
+ allow-empty></td>
+ <td><div id="ipconfig-dns4" i18n-placeholder-text="userNameServer4"
+ allow-empty></td>
+ </tr>
+ </table>
</section>
</div>
<div id="security-tab"
« chrome/browser/resources/options2/chromeos/internet_detail.css ('K') | « chrome/browser/resources/options2/chromeos/internet_detail.css ('k') | chrome/browser/resources/options2/chromeos/internet_detail.js » ('j') | chrome/browser/resources/options2/chromeos/internet_detail.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698