Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / options / chromeos / internet_detail.html

diff --git a/src/chrome/browser/resources/options/chromeos/internet_detail.html b/src/chrome/browser/resources/options/chromeos/internet_detail.html
index ec541b2..4314486 100644 (file)
--- a/src/chrome/browser/resources/options/chromeos/internet_detail.html
+++ b/src/chrome/browser/resources/options/chromeos/internet_detail.html
@@ -67,35 +67,28 @@
         <table class="option-control-table">
           <tr id="prefer-network">
             <td>
-              <div class="checkbox">
-                <span class="controlled-setting-with-label">
+              <div class="checkbox controlled-setting-with-label">
+                <label>
                   <input id="prefer-network-wifi" type="checkbox">
                   <span>
-                    <label for="prefer-network-wifi"
-                        i18n-content="inetPreferredNetwork">
-                    </label>
-                    <span class="controlled-setting-indicator" data="preferred"
-                        for="prefer-network-wifi">
-                    </span>
+                    <span i18n-content="inetPreferredNetwork">
+                    <span class="controlled-setting-indicator"></span>
                   </span>
-                </span>
+                </label>
               </div>
             </td>
           </tr>
           <tr class="auto-connect-network">
             <td>
-              <div class="checkbox">
-                <span class="controlled-setting-with-label">
+              <div class="checkbox controlled-setting-with-label">
+                <label>
                   <input id="auto-connect-network-wifi" type="checkbox">
                   <span>
-                    <label for="auto-connect-network-wifi"
-                        i18n-content="inetAutoConnectNetwork">
-                    </label>
+                    <span i18n-content="inetAutoConnectNetwork">
                     <span class="controlled-setting-indicator"
-                        managed="AutoConnect" for="auto-connect-network-wifi">
-                    </span>
+                        managed="AutoConnect"></span>
                   </span>
-                </span>
+                </label>
               </div>
             </td>
           </tr>
@@ -106,6 +99,11 @@
           <tr>
             <td class="option-name" i18n-content="connectionState"></td>
             <td id="wifi-connection-state" class="option-value"></td>
+          </tr>
+          <tr>
+            <td class="option-name" i18n-content="restrictedConnectivity"></td>
+            <td id="wifi-restricted-connectivity" class="option-value"></td>
+          </tr>
           <tr>
             <td class="option-name" i18n-content="inetSsid"></td>
             <td id="wifi-ssid" class="option-value"></td>
@@ -152,18 +150,15 @@
         <table class="option-control-table">
           <tr class="auto-connect-network">
             <td>
-              <div class="checkbox">
-                <span class="controlled-setting-with-label">
+              <div class="checkbox controlled-setting-with-label">
+                <label>
                   <input id="auto-connect-network-wimax" type="checkbox">
                   <span>
-                    <label for="auto-connect-network-wimax"
-                        i18n-content="inetAutoConnectNetwork">
-                    </label>
+                    <span i18n-content="inetAutoConnectNetwork"></span>
                     <span class="controlled-setting-indicator"
-                        managed="AutoConnect" for="auto-connect-network-wimax">
-                    </span>
+                        managed="AutoConnect"></span>
                   </span>
-                </span>
+                </label>
               </div>
             </td>
           </tr>
@@ -175,6 +170,10 @@
             <td class="option-name" i18n-content="connectionState"></td>
             <td id="wimax-connection-state" class="option-value"></td>
           </tr>
+          <tr>
+            <td class="option-name" i18n-content="restrictedConnectivity"></td>
+            <td id="wimax-restricted-connectivity" class="option-value"></td>
+          </tr>
           <tr id="wimax-eap-identity-entry">
             <td class="option-name" i18n-content="inetUsername"></td>
             <td id="wimax-eap-identity" class="option-value"></td>
@@ -200,18 +199,15 @@
         <table class="option-control-table">
           <tr class="auto-connect-network">
             <td>
-              <div class="checkbox">
-                <span class="controlled-setting-with-label">
+              <div class="checkbox controlled-setting-with-label">
+                <label>
                   <input id="auto-connect-network-vpn" type="checkbox">
                   <span>
-                    <label for="auto-connect-network-vpn"
-                        i18n-content="inetAutoConnectNetwork">
-                    </label>
+                    <span i18n-content="inetAutoConnectNetwork"></span>
                     <span class="controlled-setting-indicator"
-                        managed="AutoConnect" for="auto-connect-network-vpn">
-                    </span>
+                        managed="AutoConnect"></span>
                   </span>
-                </span>
+                </label>
               </div>
             </td>
           </tr>
@@ -223,8 +219,8 @@
             <td class="option-name" i18n-content="inetServerHostname"></td>
             <td>
               <input class="option-value" id="inet-server-hostname"></input>
-              <span class="controlled-setting-indicator"
-                  data="serverHostname" for="inet-server-hostname"></span>
+              <span class="controlled-setting-indicator" managed="VPN.Host">
+              </span>
             </td>
           </tr>
           <tr>
@@ -263,8 +259,8 @@
             <td id="roaming-state" class="option-value"></td>
           </tr>
           <tr>
-            <td class="option-name" i18n-content="restrictedPool"></td>
-            <td id="restricted-pool" class="option-value"></td>
+            <td class="option-name" i18n-content="restrictedConnectivity"></td>
+            <td id="cellular-restricted-connectivity" class="option-value"></td>
           </tr>
           <tr>
             <td class="option-name" i18n-content="operatorName"></td>
@@ -285,8 +281,8 @@
                 <option value="-1" i18n-content="cellularApnOther">
                 </option>
               </select>
-              <span class="controlled-setting-indicator" data="providerApnList"
-                  for="select-apn"></span>
+              <span class="controlled-setting-indicator" data="providerApnList">
+              </span>
             </td>
           </tr>
           <tr class="gsm-only apn-details-view">
@@ -320,19 +316,15 @@
           </tr>
           <tr>
             <td colspan="2">
-              <div class="checkbox">
-                <span class="controlled-setting-with-label">
+              <div class="checkbox controlled-setting-with-label">
+                <label>
                   <input id="auto-connect-network-cellular" type="checkbox">
                   <span>
-                    <label for="auto-connect-network-cellular"
-                        i18n-content="inetAutoConnectNetwork">
-                    </label>
+                    <span i18n-content="inetAutoConnectNetwork"></span>
                     <span class="controlled-setting-indicator"
-                        managed="AutoConnect"
-                        for="auto-connect-network-cellular">
-                    </span>
+                        managed="AutoConnect"></span>
                   </span>
-                </span>
+                </label>
               </div>
             </td>
           </tr>
@@ -408,19 +400,17 @@
         </table>
       </section>
       <section id="ipconfig-section">
-        <div id="ip-automatic-configuration" class="checkbox">
-          <span class="controlled-setting-with-label">
+        <div id="ip-automatic-configuration"
+            class="checkbox controlled-setting-with-label">
+          <label>
             <input id="ip-automatic-configuration-checkbox"
                 type="checkbox">
             <span>
-              <label for="ip-automatic-configuration-checkbox"
-                  i18n-content="ipAutomaticConfiguration">
-              </label>
-              <span class="controlled-setting-indicator" data="ipconfigDHCP"
-                  for="ip-automatic-configuration">
+              <span i18n-content="ipAutomaticConfiguration"></span>
+              <span class="controlled-setting-indicator" data="ipconfigDHCP">
               </span>
             </span>
-          </span>
+          </label>
         </div>
         <div>
         <table id="ip-address-settings">
@@ -500,24 +490,21 @@
          class="subpages-tab-contents cellular-details gsm-only">
       <div id="cellular-security-options">
         <section>
-          <div id="sim-pin-lock" class="checkbox">
-            <span class="controlled-setting-with-label">
+          <div id="sim-pin-lock" class="checkbox controlled-setting-with-label">
+            <label>
               <input id="sim-card-lock-enabled" type="checkbox">
               <span>
-                <label for="sim-card-lock-enabled" i18n-content="lockSimCard">
-                </label>
-                <span class="controlled-setting-indicator"
-                    data="simCardLockEnabled" for="sim-card-lock-enabled">
-                </span>
+                <span i18n-content="lockSimCard"></span>
+                <span class="controlled-setting-indicator"></span>
               </span>
-            </span>
+            </label>
           </div>
         </section>
         <section>
           <div id="change-pin-area">
             <button id="change-pin" i18n-content="changePinButton"></button>
-            <span class="controlled-setting-indicator" data="simCardLockEnabled"
-                for="change-pin"></span>
+            <span class="controlled-setting-indicator"
+                data="simCardLockEnabled"></span>
           </div>
         </section>
       </div>
@@ -685,7 +672,6 @@
       <button id="details-internet-configure" i18n-content="configureButton">
       </button>
       <button id="activate-details" i18n-content="activateButton"></button>
-      <button id="buyplan-details" i18n-content="buyplanButton"></button>
       <button id="view-account-details" i18n-content="viewAccountButton">
       </button>
     </div>