| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
| 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 7 <link rel="import" href="chrome://resources/html/polymer.html"> | 8 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 11 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> | 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
| 12 <link rel="import" href="/prefs/prefs.html"> | 14 <link rel="import" href="/prefs/prefs.html"> |
| 13 <link rel="import" href="/route.html"> | 15 <link rel="import" href="/route.html"> |
| 14 <link rel="import" href="internet_shared_css.html"> | 16 <link rel="import" href="internet_shared_css.html"> |
| 15 <link rel="import" href="network_apnlist.html"> | 17 <link rel="import" href="network_apnlist.html"> |
| 16 <link rel="import" href="network_ip_config.html"> | 18 <link rel="import" href="network_ip_config.html"> |
| 17 <link rel="import" href="network_nameservers.html"> | 19 <link rel="import" href="network_nameservers.html"> |
| 18 <link rel="import" href="network_property_list.html"> | 20 <link rel="import" href="network_property_list.html"> |
| 19 <link rel="import" href="network_proxy.html"> | 21 <link rel="import" href="network_proxy.html"> |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 </paper-button> | 111 </paper-button> |
| 110 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | 112 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
| 111 hidden$="[[!showViewAccount_(networkProperties)]]"> | 113 hidden$="[[!showViewAccount_(networkProperties)]]"> |
| 112 $i18n{networkButtonViewAccount} | 114 $i18n{networkButtonViewAccount} |
| 113 </paper-button> | 115 </paper-button> |
| 114 <paper-button class="secondary-button" on-tap="onActivateTap_" | 116 <paper-button class="secondary-button" on-tap="onActivateTap_" |
| 115 hidden$="[[!showActivate_(networkProperties)]]"> | 117 hidden$="[[!showActivate_(networkProperties)]]"> |
| 116 $i18n{networkButtonActivate} | 118 $i18n{networkButtonActivate} |
| 117 </paper-button> | 119 </paper-button> |
| 118 <paper-button class="secondary-button" on-tap="onConfigureTap_" | 120 <paper-button class="secondary-button" on-tap="onConfigureTap_" |
| 119 hidden$="[[!showConfigure_(networkProperties)]]"> | 121 hidden$="[[!showConfigure_(networkProperties, globalPolicy)]]"> |
| 120 $i18n{networkButtonConfigure} | 122 $i18n{networkButtonConfigure} |
| 121 </paper-button> | 123 </paper-button> |
| 122 </template> | 124 </template> |
| 123 <paper-button class="primary-button" on-tap="onConnectTap_" | 125 <paper-button class="primary-button" on-tap="onConnectTap_" |
| 124 hidden$="[[!showConnect_(networkProperties)]]" | 126 hidden$="[[!showConnect_(networkProperties, globalPolicy)]]" |
| 125 disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]"> | 127 disabled="[[!enableConnect_(networkProperties, defaultNetwork, |
| 128 globalPolicy)]]"> |
| 126 $i18n{networkButtonConnect} | 129 $i18n{networkButtonConnect} |
| 127 </paper-button> | 130 </paper-button> |
| 128 <paper-button class="primary-button" on-tap="onDisconnectTap_" | 131 <paper-button class="primary-button" on-tap="onDisconnectTap_" |
| 129 hidden$="[[!showDisconnect_(networkProperties)]]"> | 132 hidden$="[[!showDisconnect_(networkProperties)]]"> |
| 130 $i18n{networkButtonDisconnect} | 133 $i18n{networkButtonDisconnect} |
| 131 </paper-button> | 134 </paper-button> |
| 132 </div> | 135 </div> |
| 133 </div> | 136 </div> |
| 134 | 137 |
| 135 <!-- Shared. --> | 138 <!-- Disabled by policy / Shared messages. --> |
| 139 <div class="settings-box continuation" |
| 140 hidden$="[[!connectNotAllowed_(networkProperties, globalPolicy)]]"> |
| 141 <iron-icon class="policy" icon="cr:domain"></iron-icon> |
| 142 <div>$i18n{networkConnectNotAllowed}</div> |
| 143 </div> |
| 136 <div class="settings-box continuation" | 144 <div class="settings-box continuation" |
| 137 hidden$="[[!showShared_(networkProperties)]]"> | 145 hidden$="[[!showShared_(networkProperties)]]"> |
| 138 $i18n{networkShared} | 146 $i18n{networkShared} |
| 139 </div> | 147 </div> |
| 140 | 148 |
| 141 <template is="dom-if" if="[[isSecondaryUser_]]"> | 149 <template is="dom-if" if="[[isSecondaryUser_]]"> |
| 142 <!-- Show message for non primary users. --> | 150 <!-- Show message for non primary users. --> |
| 143 <div class="settings-box continuation single-column"> | 151 <div class="settings-box continuation single-column"> |
| 144 <div class="layout horizontal center"> | 152 <div class="layout horizontal center"> |
| 145 <iron-icon tabindex="0" icon="cr:group"> | 153 <iron-icon class="policy" icon="cr:group"></iron-icon> |
| 146 </iron-icon> | |
| 147 <div>[[i18n('networkPrimaryUserControlled', primaryUserEmail_)]]</div> | 154 <div>[[i18n('networkPrimaryUserControlled', primaryUserEmail_)]]</div> |
| 148 </div> | 155 </div> |
| 149 </div> | 156 </div> |
| 150 </template> | 157 </template> |
| 151 <template is="dom-if" if="[[!isSecondaryUser_]]"> | 158 <template is="dom-if" if="[[!isSecondaryUser_]]"> |
| 152 <!-- Top level properties --> | 159 <!-- Top level properties --> |
| 153 <div class="layout vertical"> | 160 <div class="layout vertical"> |
| 154 <!-- Prefer this network. --> | 161 <!-- Prefer this network. --> |
| 155 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> | 162 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> |
| 156 <div class="settings-box"> | 163 <div class="settings-box"> |
| 157 <div class="start">$i18n{networkPrefer}</div> | 164 <div class="start">$i18n{networkPrefer}</div> |
| 158 <cr-policy-network-indicator | 165 <cr-policy-network-indicator |
| 159 property="[[networkProperties.Priority]]"> | 166 property="[[networkProperties.Priority]]"> |
| 160 </cr-policy-network-indicator> | 167 </cr-policy-network-indicator> |
| 161 <paper-toggle-button checked="{{preferNetwork_}}" | 168 <paper-toggle-button checked="{{preferNetwork_}}" |
| 162 disabled="[[isNetworkPolicyEnforced( | 169 disabled="[[isNetworkPolicyEnforced( |
| 163 networkProperties.Priority)]]"> | 170 networkProperties.Priority)]]"> |
| 164 </paper-toggle-button> | 171 </paper-toggle-button> |
| 165 </div> | 172 </div> |
| 166 </template> | 173 </template> |
| 167 <!-- Autoconnect. --> | 174 <!-- Autoconnect. --> |
| 168 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> | 175 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> |
| 169 <div class="settings-box"> | 176 <div class="settings-box"> |
| 170 <div class="start">$i18n{networkAutoConnect}</div> | 177 <div class="start">$i18n{networkAutoConnect}</div> |
| 171 <cr-policy-network-indicator | 178 <cr-policy-network-indicator |
| 172 property="[[getManagedAutoConnect_(networkProperties)]]"> | 179 property="[[getManagedAutoConnect_(networkProperties)]]"> |
| 173 </cr-policy-network-indicator> | 180 </cr-policy-network-indicator> |
| 174 <paper-toggle-button checked="{{autoConnect_}}" | 181 <paper-toggle-button checked="{{autoConnect_}}" |
| 175 disabled="[[isNetworkPolicyEnforced( | 182 disabled="[[!enableAutoConnect_(networkProperties, |
| 176 getManagedAutoConnect_(networkProperties))]]"> | 183 globalPolicy)]]"> |
| 177 </paper-toggle-button> | 184 </paper-toggle-button> |
| 178 </div> | 185 </div> |
| 179 </template> | 186 </template> |
| 180 <!-- SIM Info (Cellular only). --> | 187 <!-- SIM Info (Cellular only). --> |
| 181 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> | 188 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> |
| 182 <div class="settings-box single-column stretch"> | 189 <div class="settings-box single-column stretch"> |
| 183 <network-siminfo | 190 <network-siminfo |
| 184 editable on-siminfo-change="onNetworkPropertyChange_" | 191 editable on-siminfo-change="onNetworkPropertyChange_" |
| 185 network-properties="[[networkProperties]]" | 192 network-properties="[[networkProperties]]" |
| 186 networking-private="[[networkingPrivate]]"> | 193 networking-private="[[networkingPrivate]]"> |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 on-proxy-change="onProxyChange_" | 269 on-proxy-change="onProxyChange_" |
| 263 network-properties="[[networkProperties]]"> | 270 network-properties="[[networkProperties]]"> |
| 264 </network-proxy> | 271 </network-proxy> |
| 265 </template> | 272 </template> |
| 266 </div> | 273 </div> |
| 267 </iron-collapse> | 274 </iron-collapse> |
| 268 </template> | 275 </template> |
| 269 </template> | 276 </template> |
| 270 <script src="internet_detail_page.js"></script> | 277 <script src="internet_detail_page.js"></script> |
| 271 </dom-module> | 278 </dom-module> |
| OLD | NEW |