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

Unified Diff: chrome/browser/resources/settings/internet_page/internet_page.html

Issue 2624573002: MD Settings: Internet: UI For global policy (Closed)
Patch Set: . Created 3 years, 11 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
Index: chrome/browser/resources/settings/internet_page/internet_page.html
diff --git a/chrome/browser/resources/settings/internet_page/internet_page.html b/chrome/browser/resources/settings/internet_page/internet_page.html
index 682242bd47cd6f331b9a7a5aadd59a4364ea055c..1ce4dca421f0831f0bb4b1ced8edade52f8d133e 100644
--- a/chrome/browser/resources/settings/internet_page/internet_page.html
+++ b/chrome/browser/resources/settings/internet_page/internet_page.html
@@ -34,43 +34,53 @@
<network-summary on-show-detail="onShowDetail_"
default-network="{{defaultNetwork}}"
on-show-known-networks="onShowKnownNetworks_"
+ global-policy="[[globalPolicy_]]"
networking-private="[[networkingPrivate]]">
</network-summary>
- <div actionable class="settings-box two-line"
- on-tap="onExpandAddConnectionsTap_">
- <div class="start layout horizontal center">
- <iron-icon icon="cr:add"></iron-icon>
- <div>$i18n{internetAddConnection}</div>
- </div>
- <cr-expand-button alt="$i18n{internetAddConnectionExpandA11yLabel}"
- id="expandAddConnections" expanded="{{addConnectionExpanded_}}">
- </cr-expand-button>
- </div>
- <template is="dom-if" if="[[addConnectionExpanded_]]">
- <div actionable class="settings-box continuation center"
- on-tap="onAddWiFiTap_">
- <div class="start add-no-icon">$i18n{internetAddWiFi}</div>
- <button class="icon-external" is="paper-icon-button-light"></button>
- </div>
- <div actionable class="settings-box continuation center"
- on-tap="onAddVPNTap_">
- <div class="start add-no-icon">$i18n{internetAddVPN}</div>
- <button class="icon-external" is="paper-icon-button-light"></button>
+ <template is="dom-if" if="[[allowAddConnection_(globalPolicy_)]]">
+ <div actionable class="settings-box two-line"
+ on-tap="onExpandAddConnectionsTap_">
+ <div class="start layout horizontal center">
+ <iron-icon icon="cr:add"></iron-icon>
+ <div>$i18n{internetAddConnection}</div>
+ </div>
+ <cr-expand-button alt="$i18n{internetAddConnectionExpandA11yLabel}"
+ id="expandAddConnections" expanded="{{addConnectionExpanded_}}">
+ </cr-expand-button>
</div>
- <template is="dom-repeat" items="[[thirdPartyVpnProviders_]]">
+ <template is="dom-if" if="[[addConnectionExpanded_]]">
<div actionable class="settings-box continuation center"
- on-tap="onAddThirdPartyVpnTap_" provider="[[item]]">
- <div class="start add-no-icon">
- [[getAddThirdParrtyVpnLabel_(item)]]
- </div>
+ on-tap="onAddWiFiTap_">
+ <div class="start add-no-icon">$i18n{internetAddWiFi}</div>
+ <button class="icon-external" is="paper-icon-button-light"></button>
emaxx 2017/01/17 22:14:06 nit: This line and line 60 are longer than 80 char
stevenjb 2017/01/17 22:27:40 Done.
</div>
+ <div actionable class="settings-box continuation center"
+ on-tap="onAddVPNTap_">
+ <div class="start add-no-icon">$i18n{internetAddVPN}</div>
+ <button class="icon-external" is="paper-icon-button-light"></button>
+ </div>
+ <template is="dom-repeat" items="[[thirdPartyVpnProviders_]]">
+ <div actionable class="settings-box continuation center"
+ on-tap="onAddThirdPartyVpnTap_" provider="[[item]]">
+ <div class="start add-no-icon">
+ [[getAddThirdParrtyVpnLabel_(item)]]
+ </div>
+ </div>
+ </template>
</template>
</template>
+ <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]">
+ <div class="settings-box">
+ <iron-icon class="policy" icon="cr:domain"></iron-icon>
+ <div>$i18n{internetAddConnectionNotAllowed}</div>
+ </div>
+ </template>
</neon-animatable>
<template is="dom-if" route-path="/networkDetail" no-search>
<settings-subpage page-title="$i18n{internetDetailPageTitle}">
<settings-internet-detail-page prefs="{{prefs}}"
default-network="[[defaultNetwork]]"
+ global-policy="[[globalPolicy_]]"
networking-private="[[networkingPrivate]]">
</settings-internet-detail-page>
</settings-subpage>

Powered by Google App Engine
This is Rietveld 408576698