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_indicat
or.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat
or.html"> |
6 <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
_behavior.html"> |
7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> | 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network
_indicator.html"> |
8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
9 <link rel="import" href="chrome://resources/html/polymer.html"> | 9 <link rel="import" href="chrome://resources/html/polymer.html"> |
10 <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-collapse/iron-coll
apse.html"> |
(...skipping 13 matching lines...) Expand all Loading... |
24 <link rel="import" href="network_siminfo.html"> | 24 <link rel="import" href="network_siminfo.html"> |
25 <link rel="import" href="tether_connection_dialog.html"> | 25 <link rel="import" href="tether_connection_dialog.html"> |
26 | 26 |
27 <dom-module id="settings-internet-detail-page"> | 27 <dom-module id="settings-internet-detail-page"> |
28 <template> | 28 <template> |
29 <style include="internet-shared iron-flex"> | 29 <style include="internet-shared iron-flex"> |
30 :host { | 30 :host { |
31 padding-bottom: 40px; | 31 padding-bottom: 40px; |
32 } | 32 } |
33 | 33 |
34 cr-network-icon { | |
35 -webkit-padding-end: 8px; | |
36 } | |
37 | |
38 iron-collapse { | 34 iron-collapse { |
39 margin: 10px 0; | 35 margin: 10px 0; |
40 } | 36 } |
41 | 37 |
42 iron-icon { | 38 iron-icon { |
43 -webkit-margin-end: 10px; | 39 -webkit-margin-end: 10px; |
44 } | 40 } |
45 | 41 |
46 paper-toggle-button { | 42 paper-toggle-button { |
47 -webkit-margin-start: var(--settings-control-label-spacing); | 43 -webkit-margin-start: var(--settings-control-label-spacing); |
48 } | 44 } |
49 | 45 |
50 cr-policy-network-indicator, | 46 cr-policy-network-indicator, |
51 cr-policy-indicator { | 47 cr-policy-indicator { |
52 -webkit-margin-start: var(--settings-controlled-by-spacing); | 48 -webkit-margin-start: var(--settings-controlled-by-spacing); |
53 } | 49 } |
54 | 50 |
55 .indented { | 51 .indented { |
56 -webkit-margin-start: var(--settings-box-row-padding); | 52 -webkit-margin-start: var(--settings-box-row-padding); |
57 } | 53 } |
58 | 54 |
59 .settings-box.stretch { | 55 .settings-box.stretch { |
60 align-items: stretch; | 56 align-items: stretch; |
61 } | 57 } |
62 | 58 |
63 .settings-box:first-of-type { | 59 .settings-box:first-of-type { |
64 border-top: none; | 60 border-top: none; |
65 } | 61 } |
66 | 62 |
67 #buttonDiv paper-button { | |
68 /* Align text edge with trailing margin (12px button padding) */ | |
69 -webkit-margin-end: -12px; | |
70 /* 8px spacing between highlight edges. */ | |
71 -webkit-margin-start: calc(12px + 8px); | |
72 margin-bottom: 10px; | |
73 margin-top: 10px; | |
74 } | |
75 | |
76 #networkState { | 63 #networkState { |
77 -webkit-padding-start: 8px; | |
78 font-size: 107.69%; /* 14px / 13px */ | 64 font-size: 107.69%; /* 14px / 13px */ |
79 font-weight: 500; | 65 font-weight: 500; |
80 } | 66 } |
81 | 67 |
82 #networkState[connected] { | 68 #networkState[connected] { |
83 color: var(--google-green-500); | 69 color: var(--google-green-500); |
84 } | 70 } |
85 </style> | 71 </style> |
86 <!-- Title section: Icon + name + connection state. --> | 72 <!-- Title section: Icon + name + connection state. --> |
87 <div class="settings-box first"> | 73 <div class="settings-box first"> |
88 <div class="start layout horizontal center"> | 74 <div class="start layout horizontal center"> |
89 <cr-network-icon network-state="[[networkProperties]]"> | 75 <cr-network-icon network-state="[[networkProperties]]"> |
90 </cr-network-icon> | 76 </cr-network-icon> |
91 <div id="networkState" | 77 <div id="networkState" |
92 connected$="[[isConnectedState_(networkProperties)]]"> | 78 connected$="[[isConnectedState_(networkProperties)]]"> |
93 [[getStateText_(networkProperties)]] | 79 [[getStateText_(networkProperties)]] |
94 </div> | 80 </div> |
95 <template is="dom-if" | 81 <template is="dom-if" |
96 if="[[isPolicySource(networkProperties.Source))]]"> | 82 if="[[isPolicySource(networkProperties.Source))]]"> |
97 <cr-policy-indicator | 83 <cr-policy-indicator |
98 indicator-type="[[getIndicatorTypeForSource( | 84 indicator-type="[[getIndicatorTypeForSource( |
99 networkProperties.Source)]]"> | 85 networkProperties.Source)]]"> |
100 </cr-policy-indicator> | 86 </cr-policy-indicator> |
101 </template> | 87 </template> |
102 </div> | 88 </div> |
103 <div id="buttonDiv" class="layout horizontal center"> | 89 <div id="buttonDiv" class="button-container"> |
104 <template is="dom-if" if="[[!isSecondaryUser_]]"> | 90 <template is="dom-if" if="[[!isSecondaryUser_]]"> |
105 <paper-button class="secondary-button" on-tap="onForgetTap_" | 91 <paper-button class="secondary-button" on-tap="onForgetTap_" |
106 hidden$="[[!showForget_(networkProperties)]]"> | 92 hidden$="[[!showForget_(networkProperties)]]"> |
107 $i18n{networkButtonForget} | 93 $i18n{networkButtonForget} |
108 </paper-button> | 94 </paper-button> |
109 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | 95 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
110 hidden$="[[!showViewAccount_(networkProperties)]]"> | 96 hidden$="[[!showViewAccount_(networkProperties)]]"> |
111 $i18n{networkButtonViewAccount} | 97 $i18n{networkButtonViewAccount} |
112 </paper-button> | 98 </paper-button> |
113 <paper-button class="secondary-button" on-tap="onActivateTap_" | 99 <paper-button class="secondary-button" on-tap="onActivateTap_" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 property="[[getManagedAutoConnect_(networkProperties)]]"> | 167 property="[[getManagedAutoConnect_(networkProperties)]]"> |
182 </cr-policy-network-indicator> | 168 </cr-policy-network-indicator> |
183 <paper-toggle-button checked="{{autoConnect_}}" | 169 <paper-toggle-button checked="{{autoConnect_}}" |
184 disabled="[[!enableAutoConnect_(networkProperties, | 170 disabled="[[!enableAutoConnect_(networkProperties, |
185 globalPolicy)]]" | 171 globalPolicy)]]" |
186 aria-labelledby="autoConnectToggleLabel"> | 172 aria-labelledby="autoConnectToggleLabel"> |
187 </paper-toggle-button> | 173 </paper-toggle-button> |
188 </div> | 174 </div> |
189 </template> | 175 </template> |
190 <!-- Data roaming (Cellular only). --> | 176 <!-- Data roaming (Cellular only). --> |
191 <template is="dom-if" | 177 <template is="dom-if" if="[[isCellular_(networkProperties)]]"> |
192 if="[[isType_(NetworkType_.CELLULAR, networkProperties)]]"> | |
193 <div class="settings-box"> | 178 <div class="settings-box"> |
194 <settings-toggle-button id="allowDataRoaming" class="start" | 179 <settings-toggle-button id="allowDataRoaming" class="start" |
195 pref="{{prefs.cros.signed.data_roaming_enabled}}" | 180 pref="{{prefs.cros.signed.data_roaming_enabled}}" |
196 label="$i18n{networkAllowDataRoaming}"> | 181 label="$i18n{networkAllowDataRoaming}"> |
197 </settings-toggle-button> | 182 </settings-toggle-button> |
198 </div> | 183 </div> |
199 </template> | 184 </template> |
200 <!-- SIM Info (Cellular only). --> | 185 <!-- SIM Info (Cellular only). --> |
201 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> | 186 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> |
202 <div class="settings-box single-column stretch"> | 187 <div class="settings-box single-column stretch"> |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 <div class="settings-box" actionable on-tap="toggleNetworkExpanded_"> | 246 <div class="settings-box" actionable on-tap="toggleNetworkExpanded_"> |
262 <div class="start">$i18n{networkSectionNetwork}</div> | 247 <div class="start">$i18n{networkSectionNetwork}</div> |
263 <cr-expand-button expanded="{{networkExpanded_}}" | 248 <cr-expand-button expanded="{{networkExpanded_}}" |
264 alt="$i18n{networkSectionNetworkExpandA11yLabel}"> | 249 alt="$i18n{networkSectionNetworkExpandA11yLabel}"> |
265 </cr-expand-button> | 250 </cr-expand-button> |
266 </div> | 251 </div> |
267 | 252 |
268 <iron-collapse opened="[[networkExpanded_]]"> | 253 <iron-collapse opened="[[networkExpanded_]]"> |
269 <div class="layout vertical indented"> | 254 <div class="layout vertical indented"> |
270 <!-- APN --> | 255 <!-- APN --> |
271 <template is="dom-if" | 256 <template is="dom-if" if="[[isCellular_(networkProperties)]]"> |
272 if="[[isType_(NetworkType_.CELLULAR, networkProperties)]]"> | |
273 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" | 257 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" |
274 network-properties="[[networkProperties]]"> | 258 network-properties="[[networkProperties]]"> |
275 </network-apnlist> | 259 </network-apnlist> |
276 </template> | 260 </template> |
277 | 261 |
278 <!-- IP Config, Nameservers --> | 262 <!-- IP Config, Nameservers --> |
279 <template is="dom-if" | 263 <template is="dom-if" |
280 if="[[isRememberedOrConnected_(networkProperties)]]"> | 264 if="[[isRememberedOrConnected_(networkProperties)]]"> |
281 <network-ip-config editable on-ip-change="onIPConfigChange_" | 265 <network-ip-config editable on-ip-change="onIPConfigChange_" |
282 network-properties="[[networkProperties]]"> | 266 network-properties="[[networkProperties]]"> |
283 </network-ip-config> | 267 </network-ip-config> |
284 <network-nameservers editable | 268 <network-nameservers editable |
285 on-nameservers-change="onIPConfigChange_" | 269 on-nameservers-change="onIPConfigChange_" |
286 network-properties="[[networkProperties]]"> | 270 network-properties="[[networkProperties]]"> |
287 </network-nameservers> | 271 </network-nameservers> |
288 </template> | 272 </template> |
289 </div> | 273 </div> |
290 </iron-collapse> | 274 </iron-collapse> |
291 | 275 |
292 <!-- Proxy toggle --> | 276 <!-- Proxy toggle --> |
293 <div class="settings-box" actionable on-tap="toggleProxyExpanded_"> | 277 <div class="settings-box" actionable on-tap="toggleProxyExpanded_"> |
294 <div class="start">$i18n{networkSectionProxy}</div> | 278 <div class="start">$i18n{networkSectionProxy}</div> |
295 <cr-expand-button expanded="{{proxyExpanded_}}" | 279 <cr-expand-button expanded="{{proxyExpanded_}}" |
296 alt="$i18n{networkSectionProxyExpandA11yLabel}"> | 280 alt="$i18n{networkSectionProxyExpandA11yLabel}"> |
297 </cr-expand-button> | 281 </cr-expand-button> |
298 </div> | 282 </div> |
299 | 283 |
300 <iron-collapse opened="[[proxyExpanded_]]"> | 284 <iron-collapse opened="[[proxyExpanded_]]"> |
301 <network-proxy editable prefs="{{prefs}}" | 285 <div class="layout vertical indented"> |
302 on-proxy-change="onProxyChange_" | 286 <network-proxy editable prefs="{{prefs}}" |
303 network-properties="[[networkProperties]]"> | 287 on-proxy-change="onProxyChange_" |
304 </network-proxy> | 288 network-properties="[[networkProperties]]"> |
| 289 </network-proxy> |
| 290 </div> |
305 </iron-collapse> | 291 </iron-collapse> |
306 </template> | 292 </template> |
307 </template> | 293 </template> |
308 | 294 |
309 <tether-connection-dialog id="tetherDialog" | 295 <tether-connection-dialog id="tetherDialog" |
310 network-properties="[[networkProperties]]" | 296 network-properties="[[networkProperties]]" |
311 on-tether-connect="onTetherConnect_" | 297 on-tether-connect="onTetherConnect_" |
312 on-close="onTetherDialogClose_"> | 298 on-close="onTetherDialogClose_"> |
313 </tether-connection-dialog> | 299 </tether-connection-dialog> |
314 </template> | 300 </template> |
315 <script src="internet_detail_page.js"></script> | 301 <script src="internet_detail_page.js"></script> |
316 </dom-module> | 302 </dom-module> |
OLD | NEW |