Fixing some small string issues, and adding a title to the details page.

BUG=chromium-os:7091
TEST=verify on device
Review URL: http://codereview.chromium.org/3462019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60787 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 7 deletions

diff --git a/chrome/browser/resources/options/chromeos_internet_detail.html b/chrome/browser/resources/options/chromeos_internet_detail.html
index 4801e4f..7b1ae6a 100644
--- a/chrome/browser/resources/options/chromeos_internet_detail.html
+++ b/chrome/browser/resources/options/chromeos_internet_detail.html
@@ -1,4 +1,5 @@
 <div class="page hidden" id="detailsInternetPage">
+  <h1 id="inetTitle"></h1>
   <section id="wirelessOptions">
     <table class="option-control-table">
       <tr>
@@ -6,9 +7,9 @@
         <td id="inetSsid" class="option-value"></td>
       </tr>
       <tr>
-        <td><label><span i18n-content="inetRememberNetwork"></span></td>
         <td><input id="rememberNetwork"
                    type="checkbox"></label></td>
+        <td><label><span i18n-content="inetRememberNetwork"></span></td>
       </tr>
     </table>
   </section>
diff --git a/chrome/browser/resources/options/chromeos_internet_network_element.js b/chrome/browser/resources/options/chromeos_internet_network_element.js
index 92e552b..e90e319 100644
--- a/chrome/browser/resources/options/chromeos_internet_network_element.js
+++ b/chrome/browser/resources/options/chromeos_internet_network_element.js
@@ -180,12 +180,14 @@ cr.define('options.internet', function() {
       passwordDiv.className = 'network-password';
       var passInput = this.ownerDocument.createElement('input');
       passwordDiv.appendChild(passInput);
-      passInput.placeholder = localStrings.getString('inetpassprompt');
+      passInput.placeholder = localStrings.getString('inetPassPrompt');
       passInput.type = 'password';
       var buttonEl = this.ownerDocument.createElement('button');
-      buttonEl.textContent = localStrings.getString('inetlogin');
+      buttonEl.textContent = localStrings.getString('inetLogin');
       buttonEl.addEventListener('click', this.handleLogin_);
       buttonEl.servicePath = this.data.servicePath;
+      buttonEl.style.right = '0';
+      buttonEl.style.position = 'absolute';
       buttonEl.style.visibility = 'visible';
 
       var togglePassLabel = this.ownerDocument.createElement('label');
@@ -196,7 +198,7 @@ cr.define('options.internet', function() {
       togglePassCheckbox.checked = false;
       togglePassCheckbox.target = passInput;
       togglePassCheckbox.addEventListener('change', this.handleShowPass_);
-      togglePassSpan.textContent = localStrings.getString('inetshowpass');
+      togglePassSpan.textContent = localStrings.getString('inetShowPass');
       togglePassLabel.appendChild(togglePassSpan);
       passwordDiv.appendChild(togglePassCheckbox);
       passwordDiv.appendChild(togglePassLabel);
@@ -231,13 +233,13 @@ cr.define('options.internet', function() {
       var passwordDiv = this.ownerDocument.createElement('div');
       passwordDiv.className = 'other-network';
       var ssidInput = this.ownerDocument.createElement('input');
-      ssidInput.placeholder = localStrings.getString('inetssidprompt');
+      ssidInput.placeholder = localStrings.getString('inetSsidPrompt');
       passwordDiv.appendChild(ssidInput);
       var passInput = this.ownerDocument.createElement('input');
-      passInput.placeholder = localStrings.getString('inetpassprompt');
+      passInput.placeholder = localStrings.getString('inetPassPrompt');
       passwordDiv.appendChild(passInput);
       var buttonEl = this.ownerDocument.createElement('button');
-      buttonEl.textContent = localStrings.getString('inetlogin');
+      buttonEl.textContent = localStrings.getString('inetLogin');
       buttonEl.buttonType = true;
       buttonEl.addEventListener('click', this.handleOtherLogin_);
       buttonEl.style.visibility = 'visible';
diff --git a/chrome/browser/resources/options/chromeos_internet_options.js b/chrome/browser/resources/options/chromeos_internet_options.js
index 9826ff4..5982c53 100644
--- a/chrome/browser/resources/options/chromeos_internet_options.js
+++ b/chrome/browser/resources/options/chromeos_internet_options.js
@@ -110,6 +110,11 @@ cr.define('options', function() {
 
   InternetOptions.showDetailedInfo = function (data) {
     var page = $('detailsInternetPage');
+    if (data.connected) {
+      $('inetTitle').textContent = localStrings.getString('inetStatus');
+    } else {
+      $('inetTitle').textContent = localStrings.getString('inetConnect');
+    }
     if (data.connecting) {
       page.setAttribute('connecting', data.connecting);
     } else {