diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 18:25:05 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 18:25:05 +0000 |
| commit | eb0ea65427fdfb71bee0200e23a099efe60f3911 (patch) | |
| tree | d2c113b69175776e4194bb29b03d6f3954eef6d5 | |
| parent | 8b169b4ba6ed7198d4ea43697a7b58f93b80389d (diff) | |
| download | chromium_src-eb0ea65427fdfb71bee0200e23a099efe60f3911.zip chromium_src-eb0ea65427fdfb71bee0200e23a099efe60f3911.tar.gz chromium_src-eb0ea65427fdfb71bee0200e23a099efe60f3911.tar.bz2 | |
Adding a "Learn more" link to the Google DNS selection
on the static IP configuration page in network settings.
Also, adjust the size of the dialog so that custom DNS fields don't
cause scrolling.
BUG=chromium:172634
Review URL: https://chromiumcodereview.appspot.com/12502012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190053 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 6 insertions, 3 deletions
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp index c242edb..6d43240 100644 --- a/chrome/app/chromeos_strings.grdp +++ b/chrome/app/chromeos_strings.grdp @@ -1208,7 +1208,7 @@ Press any key to continue exploring. Automatic name servers </message> <message name="IDS_OPTIONS_SETTINGS_INTERNET_GOOGLE_NAME_SERVERS" desc="In the name server type radio for static ip configuration, labels the Google DNS selection."> - Google name servers + Google name servers - <ph name="BEGIN_LINK"><a href="https://developers.google.com/speed/public-dns" target="_blank"></ph>Learn more<ph name="END_LINK"></a></ph> </message> <message name="IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVERS" desc="In the name server type radio for static ip configuration, labels the user DNS selection."> Custom name servers diff --git a/chrome/browser/resources/options/chromeos/internet_detail.css b/chrome/browser/resources/options/chromeos/internet_detail.css index 3fef184..7954f6e 100644 --- a/chrome/browser/resources/options/chromeos/internet_detail.css +++ b/chrome/browser/resources/options/chromeos/internet_detail.css @@ -31,7 +31,7 @@ -webkit-box-flex: 1; -webkit-box-sizing: border-box; -webkit-padding-end: 10px; - height: 380px; + height: 390px; min-width: 480px; overflow-y: auto; } diff --git a/chrome/browser/resources/options/chromeos/internet_detail.html b/chrome/browser/resources/options/chromeos/internet_detail.html index 8c90aba..f157400 100644 --- a/chrome/browser/resources/options/chromeos/internet_detail.html +++ b/chrome/browser/resources/options/chromeos/internet_detail.html @@ -466,7 +466,7 @@ <label> <input id="google-dns-radio" type="radio" name="dnstype" value="google"> - <span i18n-content="googleNameServers"></span> + <span id="google-dns-label"></span> </label> </div> <div id="google-dns-display" class="dns-display"></div> diff --git a/chrome/browser/resources/options/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js index 7a1de94..84262c9 100644 --- a/chrome/browser/resources/options/chromeos/internet_detail.js +++ b/chrome/browser/resources/options/chromeos/internet_detail.js @@ -275,6 +275,9 @@ cr.define('options.internet', function() { this.handleNameServerTypeChange_); $('user-dns-radio').addEventListener('click', this.handleNameServerTypeChange_); + + $('google-dns-label').innerHTML = + loadTimeData.getString('googleNameServers'); }, /** |