| 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/icons.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_network_icon.
html"> |
| 4 <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"> |
| 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
_behavior.html"> |
| 6 <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"> |
| 7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 8 <link rel="import" href="chrome://resources/html/polymer.html"> | 8 <link rel="import" href="chrome://resources/html/polymer.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-collapse/iron-coll
apse.html"> |
| 10 <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"> |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 </div> | 112 </div> |
| 113 </div> | 113 </div> |
| 114 <!-- Shared. --> | 114 <!-- Shared. --> |
| 115 <div class="settings-box embedded" | 115 <div class="settings-box embedded" |
| 116 hidden$="[[!showShared_(networkProperties)]]"> | 116 hidden$="[[!showShared_(networkProperties)]]"> |
| 117 $i18n{networkShared} | 117 $i18n{networkShared} |
| 118 </div> | 118 </div> |
| 119 <!-- Prefer this network. --> | 119 <!-- Prefer this network. --> |
| 120 <div class="settings-box embedded" | 120 <div class="settings-box embedded" |
| 121 hidden$="[[!showPreferNetwork_(networkProperties)]]"> | 121 hidden$="[[!showPreferNetwork_(networkProperties)]]"> |
| 122 <paper-checkbox checked="{{preferNetwork}}" | 122 <paper-checkbox checked="{{preferNetwork_}}" |
| 123 disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]"> | 123 disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]"> |
| 124 $i18n{networkPrefer} | 124 $i18n{networkPrefer} |
| 125 </paper-checkbox> | 125 </paper-checkbox> |
| 126 <cr-policy-network-indicator property="[[networkProperties.Priority]]"> | 126 <cr-policy-network-indicator property="[[networkProperties.Priority]]"> |
| 127 </cr-policy-network-indicator> | 127 </cr-policy-network-indicator> |
| 128 </div> | 128 </div> |
| 129 <!-- Autoconnect. --> | 129 <!-- Autoconnect. --> |
| 130 <div class="settings-box embedded" | 130 <div class="settings-box embedded" |
| 131 hidden$="[[!showAutoConnect_(networkProperties)]]"> | 131 hidden$="[[!showAutoConnect_(networkProperties)]]"> |
| 132 <paper-checkbox checked="{{autoConnect}}"> | 132 <paper-checkbox checked="{{autoConnect_}}"> |
| 133 $i18n{networkAutoConnect} | 133 $i18n{networkAutoConnect} |
| 134 </paper-checkbox> | 134 </paper-checkbox> |
| 135 <cr-policy-network-indicator | 135 <cr-policy-network-indicator |
| 136 property="[[getManagedAutoConnect_(networkProperties)]]"> | 136 property="[[getManagedAutoConnect_(networkProperties)]]"> |
| 137 </cr-policy-network-indicator> | 137 </cr-policy-network-indicator> |
| 138 </div> | 138 </div> |
| 139 </div> | 139 </div> |
| 140 | 140 |
| 141 <!-- SIM Info (Cellular only). --> | 141 <!-- SIM Info (Cellular only). --> |
| 142 <network-siminfo | 142 <network-siminfo |
| 143 editable on-siminfo-change="onNetworkPropertyChange_" | 143 editable on-siminfo-change="onNetworkPropertyChange_" |
| 144 hidden$="[[!showCellularSim_(networkProperties)]]" | 144 hidden$="[[!showCellularSim_(networkProperties)]]" |
| 145 network-properties="[[networkProperties]]" | 145 network-properties="[[networkProperties]]" |
| 146 networking-private="[[networkingPrivate]]"> | 146 networking-private="[[networkingPrivate]]"> |
| 147 </network-siminfo> | 147 </network-siminfo> |
| 148 | 148 |
| 149 <!-- IP Address. --> | 149 <!-- IP Address. --> |
| 150 <div class="settings-box two-line single-column" hidden$="[[!IPAddress]]"> | 150 <div class="settings-box two-line single-column" hidden$="[[!IPAddress_]]"> |
| 151 <div>$i18n{networkIPAddress}</div> | 151 <div>$i18n{networkIPAddress}</div> |
| 152 <div class="secondary">[[IPAddress]]</div> | 152 <div class="secondary">[[IPAddress_]]</div> |
| 153 </div> | 153 </div> |
| 154 | 154 |
| 155 <!-- Properties to always show if present. --> | 155 <!-- Properties to always show if present. --> |
| 156 <network-property-list hidden$="[[!hasInfoFields_(networkProperties)]]" | 156 <network-property-list hidden$="[[!hasInfoFields_(networkProperties)]]" |
| 157 fields="[[getInfoFields_(networkProperties)]]" | 157 fields="[[getInfoFields_(networkProperties)]]" |
| 158 property-dict="[[networkProperties]]"> | 158 property-dict="[[networkProperties]]"> |
| 159 </network-property-list> | 159 </network-property-list> |
| 160 | 160 |
| 161 <!-- Advanced toggle. --> | 161 <!-- Advanced toggle. --> |
| 162 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" | 162 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" |
| 163 hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]"> | 163 hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]"> |
| 164 <div class="start">$i18n{networkSectionAdvanced}</div> | 164 <div class="start">$i18n{networkSectionAdvanced}</div> |
| 165 <cr-expand-button id="expandButton" expanded="{{advancedExpanded}}"> | 165 <cr-expand-button id="expandButton" expanded="{{advancedExpanded_}}"> |
| 166 </cr-expand-button> | 166 </cr-expand-button> |
| 167 </div> | 167 </div> |
| 168 | 168 |
| 169 <!-- Advanced section --> | 169 <!-- Advanced section --> |
| 170 <iron-collapse opened="[[advancedExpanded]]"> | 170 <iron-collapse opened="[[advancedExpanded_]]"> |
| 171 <div class="layout vertical indented"> | 171 <div class="layout vertical indented"> |
| 172 <!-- Advanced properties --> | 172 <!-- Advanced properties --> |
| 173 <network-property-list | 173 <network-property-list |
| 174 hidden$="[[!hasAdvancedFields_(networkProperties)]]" | 174 hidden$="[[!hasAdvancedFields_(networkProperties)]]" |
| 175 fields="[[getAdvancedFields_(networkProperties)]]" | 175 fields="[[getAdvancedFields_(networkProperties)]]" |
| 176 property-dict="[[networkProperties]]"> | 176 property-dict="[[networkProperties]]"> |
| 177 </network-property-list> | 177 </network-property-list> |
| 178 | 178 |
| 179 <!-- Device properties --> | 179 <!-- Device properties --> |
| 180 <network-property-list | 180 <network-property-list |
| 181 hidden$="[[!hasDeviceFields_(networkProperties)]]" | 181 hidden$="[[!hasDeviceFields_(networkProperties)]]" |
| 182 fields="[[getDeviceFields_(networkProperties)]]" | 182 fields="[[getDeviceFields_(networkProperties)]]" |
| 183 property-dict="[[networkProperties]]"> | 183 property-dict="[[networkProperties]]"> |
| 184 </network-property-list> | 184 </network-property-list> |
| 185 | 185 |
| 186 <!-- network --> | 186 <!-- network --> |
| 187 <div class="layout vertical" | 187 <div class="layout vertical" |
| 188 hidden$="[[!hasNetworkSection_(networkProperties)]]"> | 188 hidden$="[[!hasNetworkSection_(networkProperties)]]"> |
| 189 | 189 |
| 190 <div class="subtitle">$i18n{networkSectionNetwork}</div> | 190 <div class="subtitle">$i18n{networkSectionNetwork}</div> |
| 191 <!-- APN --> | 191 <!-- APN --> |
| 192 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" | 192 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" |
| 193 hidden$="[[!isType_(NetworkType.CELLULAR, networkProperties)]]" | 193 hidden$="[[!isType_(NetworkType_.CELLULAR, networkProperties)]]" |
| 194 network-properties="[[networkProperties]]"> | 194 network-properties="[[networkProperties]]"> |
| 195 </network-apnlist> | 195 </network-apnlist> |
| 196 <!-- IP Config --> | 196 <!-- IP Config --> |
| 197 <network-ip-config editable on-ip-change="onIPConfigChange_" | 197 <network-ip-config editable on-ip-change="onIPConfigChange_" |
| 198 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" | 198 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" |
| 199 network-properties="[[networkProperties]]"> | 199 network-properties="[[networkProperties]]"> |
| 200 </network-ip-config> | 200 </network-ip-config> |
| 201 | 201 |
| 202 <!-- Nameservers --> | 202 <!-- Nameservers --> |
| 203 <network-nameservers editable | 203 <network-nameservers editable |
| 204 on-nameservers-change="onIPConfigChange_" | 204 on-nameservers-change="onIPConfigChange_" |
| 205 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" | 205 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" |
| 206 network-properties="[[networkProperties]]"> | 206 network-properties="[[networkProperties]]"> |
| 207 </network-nameservers> | 207 </network-nameservers> |
| 208 </div> | 208 </div> |
| 209 | 209 |
| 210 <!-- Proxy --> | 210 <!-- Proxy --> |
| 211 <div hidden$="[[!isRememberedOrConnected_(networkProperties)]]"> | 211 <div hidden$="[[!isRememberedOrConnected_(networkProperties)]]"> |
| 212 <div class="subtitle">$i18n{networkSectionProxy}</div> | 212 <div class="subtitle">$i18n{networkSectionProxy}</div> |
| 213 <network-proxy editable on-proxy-change="onProxyChange_" | 213 <network-proxy editable on-proxy-change="onProxyChange_" |
| 214 network-properties="[[networkProperties]]"> | 214 network-properties="[[networkProperties]]"> |
| 215 </network-proxy> | 215 </network-proxy> |
| 216 </div> | 216 </div> |
| 217 </div> | 217 </div> |
| 218 </iron-collapse> | 218 </iron-collapse> |
| 219 </template> | 219 </template> |
| 220 <script src="internet_detail_page.js"></script> | 220 <script src="internet_detail_page.js"></script> |
| 221 </dom-module> | 221 </dom-module> |
| OLD | NEW |