| OLD | NEW |
| 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"> |
| 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"> |
| 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"> |
| 7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 8 <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"> | 9 <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"> | 10 <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"> | 11 <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"> | 12 <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"> | 13 <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"> | |
| 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"> | |
| 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"> | |
| 12 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | |
| 13 <link rel="import" href="/route.html"> | 14 <link rel="import" href="/route.html"> |
| 14 <link rel="import" href="internet_shared_css.html"> | 15 <link rel="import" href="internet_shared_css.html"> |
| 15 <link rel="import" href="network_apnlist.html"> | 16 <link rel="import" href="network_apnlist.html"> |
| 16 <link rel="import" href="network_ip_config.html"> | 17 <link rel="import" href="network_ip_config.html"> |
| 17 <link rel="import" href="network_nameservers.html"> | 18 <link rel="import" href="network_nameservers.html"> |
| 18 <link rel="import" href="network_property_list.html"> | 19 <link rel="import" href="network_property_list.html"> |
| 19 <link rel="import" href="network_proxy.html"> | 20 <link rel="import" href="network_proxy.html"> |
| 20 <link rel="import" href="network_siminfo.html"> | 21 <link rel="import" href="network_siminfo.html"> |
| 21 | 22 |
| 22 <dom-module id="settings-internet-detail-page"> | 23 <dom-module id="settings-internet-detail-page"> |
| 23 <template> | 24 <template> |
| 24 <style include="internet-shared"> | 25 <style include="internet-shared"> |
| 25 iron-collapse { | 26 :host { |
| 26 margin: 10px; | 27 padding-bottom: 40px; |
| 27 } | 28 } |
| 28 | 29 |
| 29 cr-network-icon { | 30 cr-network-icon { |
| 30 -webkit-margin-end: 20px; | 31 -webkit-margin-end: 20px; |
| 31 height: 32px; | 32 height: 32px; |
| 32 width: 32px; | 33 width: 32px; |
| 33 } | 34 } |
| 34 | 35 |
| 35 cr-policy-network-indicator { | 36 cr-policy-network-indicator { |
| 36 -webkit-margin-start: 10px; | 37 -webkit-margin-start: 10px; |
| 37 } | 38 } |
| 38 | 39 |
| 40 iron-collapse { |
| 41 margin: 10px; |
| 42 } |
| 43 |
| 39 .subtitle { | 44 .subtitle { |
| 40 -webkit-margin-start: 20px; | 45 -webkit-margin-start: 20px; |
| 41 font-weight: 500; | 46 font-weight: 500; |
| 42 padding: 20px 0; | 47 padding: 20px 0; |
| 43 } | 48 } |
| 44 | 49 |
| 45 #buttonDiv paper-button { | 50 #buttonDiv paper-button { |
| 46 margin: 10px 0; | 51 margin: 10px 0; |
| 47 } | 52 } |
| 48 | 53 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 74 <div id="networkName">[[getStateName_(networkProperties)]]</div> | 79 <div id="networkName">[[getStateName_(networkProperties)]]</div> |
| 75 <div id="networkState" | 80 <div id="networkState" |
| 76 connected$="[[isConnectedState_(networkProperties)]]"> | 81 connected$="[[isConnectedState_(networkProperties)]]"> |
| 77 [[getStateText_(networkProperties)]] | 82 [[getStateText_(networkProperties)]] |
| 78 </div> | 83 </div> |
| 79 </div> | 84 </div> |
| 80 </div> | 85 </div> |
| 81 <div id="buttonDiv" class="layout horizontal center"> | 86 <div id="buttonDiv" class="layout horizontal center"> |
| 82 <paper-button class="secondary-button" on-tap="onForgetTap_" | 87 <paper-button class="secondary-button" on-tap="onForgetTap_" |
| 83 hidden$="[[!showForget_(networkProperties)]]"> | 88 hidden$="[[!showForget_(networkProperties)]]"> |
| 84 Forget | 89 $i18n{networkButtonForget} |
| 85 </paper-button> | 90 </paper-button> |
| 86 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | 91 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
| 87 hidden$="[[!showViewAccount_(networkProperties)]]"> | 92 hidden$="[[!showViewAccount_(networkProperties)]]"> |
| 88 View Account | 93 $i18n{networkButtonViewAccount} |
| 89 </paper-button> | 94 </paper-button> |
| 90 <paper-button class="secondary-button" on-tap="onActivateTap_" | 95 <paper-button class="secondary-button" on-tap="onActivateTap_" |
| 91 hidden$="[[!showActivate_(networkProperties)]]"> | 96 hidden$="[[!showActivate_(networkProperties)]]"> |
| 92 Activate | 97 $i18n{networkButtonActivate} |
| 93 </paper-button> | 98 </paper-button> |
| 94 <paper-button class="secondary-button" on-tap="onConfigureTap_" | 99 <paper-button class="secondary-button" on-tap="onConfigureTap_" |
| 95 hidden$="[[!showConfigure_(networkProperties)]]"> | 100 hidden$="[[!showConfigure_(networkProperties)]]"> |
| 96 Configure | 101 $i18n{networkButtonConfigure} |
| 97 </paper-button> | 102 </paper-button> |
| 98 <paper-button class="primary-button" on-tap="onConnectTap_" | 103 <paper-button class="primary-button" on-tap="onConnectTap_" |
| 99 hidden$="[[!showConnect_(networkProperties)]]" | 104 hidden$="[[!showConnect_(networkProperties)]]" |
| 100 disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]"> | 105 disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]"> |
| 101 Connect | 106 $i18n{networkButtonConnect} |
| 102 </paper-button> | 107 </paper-button> |
| 103 <paper-button class="primary-button" on-tap="onDisconnectTap_" | 108 <paper-button class="primary-button" on-tap="onDisconnectTap_" |
| 104 hidden$="[[!showDisconnect_(networkProperties)]]"> | 109 hidden$="[[!showDisconnect_(networkProperties)]]"> |
| 105 Disconnect | 110 $i18n{networkButtonDisconnect} |
| 106 </paper-button> | 111 </paper-button> |
| 107 </div> | 112 </div> |
| 108 </div> | 113 </div> |
| 109 <!-- Shared. --> | 114 <!-- Shared. --> |
| 110 <div class="settings-box embedded" | 115 <div class="settings-box embedded" |
| 111 hidden$="[[!showShared_(networkProperties)]]"> | 116 hidden$="[[!showShared_(networkProperties)]]"> |
| 112 This network is shared with other users. | 117 $i18n{networkShared} |
| 113 </div> | 118 </div> |
| 114 <!-- Prefer this network. --> | 119 <!-- Prefer this network. --> |
| 115 <div class="settings-box embedded" | 120 <div class="settings-box embedded" |
| 116 hidden$="[[!showPreferNetwork_(networkProperties)]]"> | 121 hidden$="[[!showPreferNetwork_(networkProperties)]]"> |
| 117 <paper-checkbox checked="{{preferNetwork}}" | 122 <paper-checkbox checked="{{preferNetwork}}" |
| 118 disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]"> | 123 disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]"> |
| 119 Prefer this network | 124 $i18n{networkPrefer} |
| 120 </paper-checkbox> | 125 </paper-checkbox> |
| 121 <cr-policy-network-indicator property="[[networkProperties.Priority]]"> | 126 <cr-policy-network-indicator property="[[networkProperties.Priority]]"> |
| 122 </cr-policy-network-indicator> | 127 </cr-policy-network-indicator> |
| 123 </div> | 128 </div> |
| 124 <!-- Autoconnect. --> | 129 <!-- Autoconnect. --> |
| 125 <div class="settings-box embedded" | 130 <div class="settings-box embedded" |
| 126 hidden$="[[!showAutoConnect_(networkProperties)]]"> | 131 hidden$="[[!showAutoConnect_(networkProperties)]]"> |
| 127 <paper-checkbox checked="{{autoConnect}}"> | 132 <paper-checkbox checked="{{autoConnect}}"> |
| 128 Automatically connect to this network | 133 $i18n{networkAutoConnect} |
| 129 </paper-checkbox> | 134 </paper-checkbox> |
| 130 <cr-policy-network-indicator | 135 <cr-policy-network-indicator |
| 131 property="[[getManagedAutoConnect_(networkProperties)]]"> | 136 property="[[getManagedAutoConnect_(networkProperties)]]"> |
| 132 </cr-policy-network-indicator> | 137 </cr-policy-network-indicator> |
| 133 </div> | 138 </div> |
| 134 </div> | 139 </div> |
| 135 | 140 |
| 136 <!-- SIM Info (Cellular only). --> | 141 <!-- SIM Info (Cellular only). --> |
| 137 <network-siminfo | 142 <network-siminfo |
| 138 editable on-siminfo-change="onNetworkPropertyChange_" | 143 editable on-siminfo-change="onNetworkPropertyChange_" |
| 139 hidden$="[[!showCellularSim_(networkProperties)]]" | 144 hidden$="[[!showCellularSim_(networkProperties)]]" |
| 140 network-properties="[[networkProperties]]" | 145 network-properties="[[networkProperties]]" |
| 141 networking-private="[[networkingPrivate]]"> | 146 networking-private="[[networkingPrivate]]"> |
| 142 </network-siminfo> | 147 </network-siminfo> |
| 143 | 148 |
| 144 <!-- IP Address. --> | 149 <!-- IP Address. --> |
| 145 <div class="settings-box two-line single-column" hidden$="[[!IPAddress]]"> | 150 <div class="settings-box two-line single-column" hidden$="[[!IPAddress]]"> |
| 146 <div>IP Address</div> | 151 <div>$i18n{networkIPAddress}</div> |
| 147 <div class="secondary">[[IPAddress]]</div> | 152 <div class="secondary">[[IPAddress]]</div> |
| 148 </div> | 153 </div> |
| 149 | 154 |
| 150 <!-- Properties to always show if present. --> | 155 <!-- Properties to always show if present. --> |
| 151 <network-property-list hidden$="[[!hasInfoFields_(networkProperties)]]" | 156 <network-property-list hidden$="[[!hasInfoFields_(networkProperties)]]" |
| 152 fields="[[getInfoFields_(networkProperties)]]" | 157 fields="[[getInfoFields_(networkProperties)]]" |
| 153 property-dict="[[networkProperties]]"> | 158 property-dict="[[networkProperties]]"> |
| 154 </network-property-list> | 159 </network-property-list> |
| 155 | 160 |
| 156 <!-- Advanced toggle. --> | 161 <!-- Advanced toggle. --> |
| 157 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" | 162 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" |
| 158 hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]"> | 163 hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]"> |
| 159 <div class="start">Advanced</div> | 164 <div class="start">$i18n{networkSectionAdvanced}</div> |
| 160 <cr-expand-button id="expandButton" expanded="{{advancedExpanded}}"> | 165 <cr-expand-button id="expandButton" expanded="{{advancedExpanded}}"> |
| 161 </cr-expand-button> | 166 </cr-expand-button> |
| 162 </div> | 167 </div> |
| 163 | 168 |
| 164 <!-- Advanced section --> | 169 <!-- Advanced section --> |
| 165 <iron-collapse opened="[[advancedExpanded]]"> | 170 <iron-collapse opened="[[advancedExpanded]]"> |
| 166 <div class="layout vertical indented"> | 171 <div class="layout vertical indented"> |
| 167 <!-- Advanced properties --> | 172 <!-- Advanced properties --> |
| 168 <network-property-list | 173 <network-property-list |
| 169 hidden$="[[!hasAdvancedFields_(networkProperties)]]" | 174 hidden$="[[!hasAdvancedFields_(networkProperties)]]" |
| 170 fields="[[getAdvancedFields_(networkProperties)]]" | 175 fields="[[getAdvancedFields_(networkProperties)]]" |
| 171 property-dict="[[networkProperties]]"> | 176 property-dict="[[networkProperties]]"> |
| 172 </network-property-list> | 177 </network-property-list> |
| 173 | 178 |
| 174 <!-- Device properties --> | 179 <!-- Device properties --> |
| 175 <network-property-list | 180 <network-property-list |
| 176 hidden$="[[!hasDeviceFields_(networkProperties)]]" | 181 hidden$="[[!hasDeviceFields_(networkProperties)]]" |
| 177 fields="[[getDeviceFields_(networkProperties)]]" | 182 fields="[[getDeviceFields_(networkProperties)]]" |
| 178 property-dict="[[networkProperties]]"> | 183 property-dict="[[networkProperties]]"> |
| 179 </network-property-list> | 184 </network-property-list> |
| 180 | 185 |
| 181 <!-- network --> | 186 <!-- network --> |
| 182 <div class="layout vertical" | 187 <div class="layout vertical" |
| 183 hidden$="[[!hasNetworkSection_(networkProperties)]]"> | 188 hidden$="[[!hasNetworkSection_(networkProperties)]]"> |
| 184 | 189 |
| 185 <div class="subtitle">Network</div> | 190 <div class="subtitle">$i18n{networkSectionNetwork}</div> |
| 186 <!-- APN --> | 191 <!-- APN --> |
| 187 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" | 192 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" |
| 188 hidden$="[[!isType_(NetworkType.CELLULAR, networkProperties)]]" | 193 hidden$="[[!isType_(NetworkType.CELLULAR, networkProperties)]]" |
| 189 network-properties="[[networkProperties]]"> | 194 network-properties="[[networkProperties]]"> |
| 190 </network-apnlist> | 195 </network-apnlist> |
| 191 <!-- IP Config --> | 196 <!-- IP Config --> |
| 192 <network-ip-config editable on-ip-change="onIPConfigChange_" | 197 <network-ip-config editable on-ip-change="onIPConfigChange_" |
| 193 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" | 198 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" |
| 194 network-properties="[[networkProperties]]"> | 199 network-properties="[[networkProperties]]"> |
| 195 </network-ip-config> | 200 </network-ip-config> |
| 196 | 201 |
| 197 <!-- Nameservers --> | 202 <!-- Nameservers --> |
| 198 <network-nameservers editable | 203 <network-nameservers editable |
| 199 on-nameservers-change="onIPConfigChange_" | 204 on-nameservers-change="onIPConfigChange_" |
| 200 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" | 205 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" |
| 201 network-properties="[[networkProperties]]"> | 206 network-properties="[[networkProperties]]"> |
| 202 </network-nameservers> | 207 </network-nameservers> |
| 203 </div> | 208 </div> |
| 204 | 209 |
| 205 <!-- Proxy --> | 210 <!-- Proxy --> |
| 206 <div hidden$="[[!isRememberedOrConnected_(networkProperties)]]"> | 211 <div hidden$="[[!isRememberedOrConnected_(networkProperties)]]"> |
| 207 <div class="subtitle">Proxy</div> | 212 <div class="subtitle">$i18n{networkSectionProxy}</div> |
| 208 <network-proxy editable on-proxy-change="onProxyChange_" | 213 <network-proxy editable on-proxy-change="onProxyChange_" |
| 209 network-properties="[[networkProperties]]"> | 214 network-properties="[[networkProperties]]"> |
| 210 </network-proxy> | 215 </network-proxy> |
| 211 </div> | 216 </div> |
| 212 </div> | 217 </div> |
| 213 </iron-collapse> | 218 </iron-collapse> |
| 214 </template> | 219 </template> |
| 215 <script src="internet_detail_page.js"></script> | 220 <script src="internet_detail_page.js"></script> |
| 216 </dom-module> | 221 </dom-module> |
| OLD | NEW |