diff options
Diffstat (limited to 'chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html')
| -rw-r--r-- | chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html b/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html index c78ca56e50b..2d27c7dc86d 100644 --- a/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html +++ b/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html @@ -8,7 +8,6 @@ <link rel="import" href="chrome://resources/cr_components/chromeos/network/network_siminfo.html"> <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_icon.html"> <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_listener_behavior.html"> -<link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html"> <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html"> @@ -68,10 +67,15 @@ paper-spinner-lite { @apply --cr-icon-height-width; } + .warning { color: var(--cr-secondary-text-color); margin-inline-start: var(--settings-controlled-by-spacing); } + + #mac-address-container { + border-top: none; + } </style> <!-- Title section: Icon + name + connection state. --> <div id="titleDiv" class="settings-box first"> @@ -83,9 +87,9 @@ <div id="networkState" class="title settings-box-text" connected$="[[isConnectedState_(managedProperties_)]]" error$="[[isConnectionErrorState_( - managedProperties_, outOfRange_)]]"> + managedProperties_, outOfRange_, deviceState_)]]"> [[getStateText_(managedProperties_, propertiesReceived_, - outOfRange_)]] + outOfRange_, deviceState_)]] </div> <template is="dom-if" if="[[isPolicySource(managedProperties_.source))]]"> @@ -118,17 +122,18 @@ </cr-button> <!-- Use policy properties from vpn_config_allowed to indicate when that pref disables buttons in this row. --> - <controlled-button id="connect" action-button on-click="onConnectTap_" + <controlled-button id="connect" class="action-button" + on-click="onConnectTap_" hidden$="[[!showConnect_(managedProperties_, globalPolicy, - managedNetworkAvailable)]]" + managedNetworkAvailable, deviceState_)]]" disabled="[[!enableConnect_(managedProperties_, defaultNetwork, propertiesReceived_, outOfRange_, globalPolicy, - managedNetworkAvailable)]]" + managedNetworkAvailable, deviceState_)]]" label="$i18n{networkButtonConnect}" pref="[[getFakeVpnConfigPrefForEnforcement_(managedProperties_, prefs.vpn_config_allowed)]]"> </controlled-button> - <controlled-button id="disconnect" action-button + <controlled-button id="disconnect" class="action-button" on-click="onDisconnectTap_" hidden$="[[!showDisconnect_(managedProperties_)]]" label="$i18n{networkButtonDisconnect}" @@ -324,6 +329,7 @@ <!-- MAC Address. --> <div class="settings-box two-line single-column stretch indented" + id="mac-address-container" hidden$="[[!deviceState_.macAddress]]"> <div>$i18n{OncMacAddress}</div> <div class="secondary">[[deviceState_.macAddress]]</div> |