| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> |
| 7 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> | 7 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> |
| 8 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 8 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 9 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> | 9 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon.
html"> |
| 10 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 10 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 11 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> | 11 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_behavior.html"> |
| 12 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | 12 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
| 13 <link rel="import" href="/settings_shared_css.html"> | 13 <link rel="import" href="internet_shared_css.html"> |
| 14 <link rel="import" href="network_apnlist.html"> | 14 <link rel="import" href="network_apnlist.html"> |
| 15 <link rel="import" href="network_ip_config.html"> | 15 <link rel="import" href="network_ip_config.html"> |
| 16 <link rel="import" href="network_nameservers.html"> | 16 <link rel="import" href="network_nameservers.html"> |
| 17 <link rel="import" href="network_property_list.html"> | 17 <link rel="import" href="network_property_list.html"> |
| 18 <link rel="import" href="network_proxy.html"> | 18 <link rel="import" href="network_proxy.html"> |
| 19 <link rel="import" href="network_siminfo.html"> | 19 <link rel="import" href="network_siminfo.html"> |
| 20 | 20 |
| 21 <dom-module id="settings-internet-detail-page"> | 21 <dom-module id="settings-internet-detail-page"> |
| 22 <template> | 22 <template> |
| 23 <style include="settings-shared"> | 23 <style include="internet-shared"> |
| 24 iron-collapse { | 24 iron-collapse { |
| 25 margin: 10px; | 25 margin: 10px; |
| 26 } | 26 } |
| 27 | 27 |
| 28 cr-network-icon { | 28 cr-network-icon { |
| 29 -webkit-margin-end: 20px; | 29 -webkit-margin-end: 20px; |
| 30 height: 32px; | 30 height: 32px; |
| 31 width: 32px; | 31 width: 32px; |
| 32 } | 32 } |
| 33 | 33 |
| 34 cr-policy-network-indicator { | 34 cr-policy-network-indicator { |
| 35 -webkit-margin-start: 10px; | 35 -webkit-margin-start: 10px; |
| 36 } | 36 } |
| 37 | 37 |
| 38 div.indented { | 38 .subtitle { |
| 39 -webkit-margin-start: 20px; | 39 -webkit-margin-start: 20px; |
| 40 } | |
| 41 | |
| 42 .settings-box.embedded { | |
| 43 align-self: stretch; | |
| 44 border-top: none; | |
| 45 padding: 0; | |
| 46 } | |
| 47 | |
| 48 div.subtitle { | |
| 49 font-weight: 500; | 40 font-weight: 500; |
| 50 padding: 20px 0; | 41 padding: 20px 0; |
| 51 } | 42 } |
| 52 | 43 |
| 53 #buttonDiv paper-button { | 44 #buttonDiv paper-button { |
| 54 margin: 10px 0; | 45 margin: 10px 0; |
| 55 } | 46 } |
| 56 | 47 |
| 57 #networkName { | 48 #networkName { |
| 58 /* TODO(stevenjb): Finalize font-size for this and networkState. */ | 49 /* TODO(stevenjb): Finalize font-size for this and networkState. */ |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 <!-- Device properties --> | 166 <!-- Device properties --> |
| 176 <network-property-list | 167 <network-property-list |
| 177 hidden$="[[!hasDeviceFields_(networkProperties)]]" | 168 hidden$="[[!hasDeviceFields_(networkProperties)]]" |
| 178 fields="[[getDeviceFields_(networkProperties)]]" | 169 fields="[[getDeviceFields_(networkProperties)]]" |
| 179 property-dict="[[networkProperties]]"> | 170 property-dict="[[networkProperties]]"> |
| 180 </network-property-list> | 171 </network-property-list> |
| 181 | 172 |
| 182 <!-- network --> | 173 <!-- network --> |
| 183 <div class="layout vertical" | 174 <div class="layout vertical" |
| 184 hidden$="[[!hasNetworkSection_(networkProperties)]]"> | 175 hidden$="[[!hasNetworkSection_(networkProperties)]]"> |
| 185 <div class="subtitle indented">Network</div> | |
| 186 | 176 |
| 177 <div class="subtitle">Network</div> |
| 187 <!-- APN --> | 178 <!-- APN --> |
| 188 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" | 179 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" |
| 189 hidden$="[[!isType_(networkProperties, NetworkType.CELLULAR)]]" | 180 hidden$="[[!isType_(networkProperties, NetworkType.CELLULAR)]]" |
| 190 network-properties="[[networkProperties]]"> | 181 network-properties="[[networkProperties]]"> |
| 191 </network-apnlist> | 182 </network-apnlist> |
| 192 <!-- IP Config --> | 183 <!-- IP Config --> |
| 193 <network-ip-config editable on-ip-change="onIPConfigChange_" | 184 <network-ip-config editable on-ip-change="onIPConfigChange_" |
| 194 network-properties="[[networkProperties]]"> | 185 network-properties="[[networkProperties]]"> |
| 195 </network-ip-config> | 186 </network-ip-config> |
| 187 |
| 196 <!-- Nameservers --> | 188 <!-- Nameservers --> |
| 197 <network-nameservers editable | 189 <network-nameservers editable |
| 198 on-nameservers-change="onIPConfigChange_" | 190 on-nameservers-change="onIPConfigChange_" |
| 199 network-properties="[[networkProperties]]"> | 191 network-properties="[[networkProperties]]"> |
| 200 </network-nameservers> | 192 </network-nameservers> |
| 201 </div> | 193 </div> |
| 202 | 194 |
| 203 <!-- Proxy --> | 195 <!-- Proxy --> |
| 204 <div class="subtitle">Proxy</div> | 196 <div class="subtitle">Proxy</div> |
| 205 <div id="proxyDiv" class="layout vertical"> | 197 <network-proxy editable on-proxy-change="onProxyChange_" |
| 206 <network-proxy editable on-proxy-change="onProxyChange_" | 198 network-properties="[[networkProperties]]"> |
| 207 network-properties="[[networkProperties]]"> | 199 </network-proxy> |
| 208 </network-proxy> | |
| 209 </div> | |
| 210 </div> | 200 </div> |
| 211 </iron-collapse> | 201 </iron-collapse> |
| 212 </template> | 202 </template> |
| 213 <script src="internet_detail_page.js"></script> | 203 <script src="internet_detail_page.js"></script> |
| 214 </dom-module> | 204 </dom-module> |
| OLD | NEW |