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