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 21 matching lines...) Expand all Loading... |
32 height: 32px; | 32 height: 32px; |
33 margin-top: -4px; /* Align better with text */ | 33 margin-top: -4px; /* Align better with text */ |
34 width: 32px; | 34 width: 32px; |
35 } | 35 } |
36 | 36 |
37 cr-policy-network-indicator { | 37 cr-policy-network-indicator { |
38 -webkit-margin-start: 10px; | 38 -webkit-margin-start: 10px; |
39 } | 39 } |
40 | 40 |
41 iron-collapse { | 41 iron-collapse { |
42 margin: 10px; | 42 margin: 10px 0; |
43 } | 43 } |
44 | 44 |
45 .settings-box.embedded { | 45 /* Use <span> for subtitles so as not to interfere with |
46 -webkit-margin-start: 0; | 46 * settings-box:first-of-type. */ |
47 align-items: stretch; | 47 span.subtitle { |
48 flex-direction: column; | 48 font-weight: 700; |
49 justify-content: center; | 49 padding: 20px; |
50 padding: 0; | 50 } |
| 51 |
| 52 .advanced { |
| 53 font-weight: 700; |
| 54 } |
| 55 |
| 56 .indented { |
| 57 -webkit-margin-start: var(--settings-box-row-padding); |
51 } | 58 } |
52 | 59 |
53 .settings-box.stretch { | 60 .settings-box.stretch { |
54 align-items: stretch; | 61 align-items: stretch; |
55 } | 62 } |
56 | 63 |
57 .subtitle { | 64 .settings-box:first-of-type { |
58 -webkit-margin-start: 20px; | 65 border-top: none; |
59 font-weight: 500; | |
60 padding: 20px 0; | |
61 } | 66 } |
62 | 67 |
63 #buttonDiv paper-button { | 68 #buttonDiv paper-button { |
64 margin: 10px 0; | 69 margin: 10px 0; |
65 } | 70 } |
66 | 71 |
67 #networkState { | 72 #networkState { |
68 /* TODO(stevenjb): Finalize font-size / style for this. */ | 73 /* TODO(stevenjb): Finalize font-size / style for this. */ |
69 font-size: 125%; | 74 font-size: 125%; |
70 font-weight: 500; | 75 font-weight: 500; |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 </paper-button> | 121 </paper-button> |
117 </div> | 122 </div> |
118 </div> | 123 </div> |
119 | 124 |
120 <!-- Shared. --> | 125 <!-- Shared. --> |
121 <div class="settings-box continuation" | 126 <div class="settings-box continuation" |
122 hidden$="[[!showShared_(networkProperties)]]"> | 127 hidden$="[[!showShared_(networkProperties)]]"> |
123 $i18n{networkShared} | 128 $i18n{networkShared} |
124 </div> | 129 </div> |
125 <!-- Top level properties --> | 130 <!-- Top level properties --> |
126 <div class="settings-box continuation embedded"> | 131 <div class="layout vertical"> |
127 <!-- Prefer this network. --> | 132 <!-- Prefer this network. --> |
128 <div class="settings-box" | 133 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> |
129 hidden$="[[!showPreferNetwork_(networkProperties)]]"> | 134 <div class="settings-box"> |
130 <paper-checkbox checked="{{preferNetwork_}}" | 135 <paper-checkbox checked="{{preferNetwork_}}" |
131 disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]"> | 136 disabled="[[isNetworkPolicyEnforced( |
132 $i18n{networkPrefer} | 137 networkProperties.Priority)]]"> |
133 </paper-checkbox> | 138 $i18n{networkPrefer} |
134 <cr-policy-network-indicator property="[[networkProperties.Priority]]"> | 139 </paper-checkbox> |
135 </cr-policy-network-indicator> | 140 <cr-policy-network-indicator |
136 </div> | 141 property="[[networkProperties.Priority]]"> |
| 142 </cr-policy-network-indicator> |
| 143 </div> |
| 144 </template> |
137 <!-- Autoconnect. --> | 145 <!-- Autoconnect. --> |
138 <div class="settings-box" | 146 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> |
139 hidden$="[[!showAutoConnect_(networkProperties)]]"> | 147 <div class="settings-box"> |
140 <paper-checkbox checked="{{autoConnect_}}"> | 148 <paper-checkbox checked="{{autoConnect_}}"> |
141 $i18n{networkAutoConnect} | 149 $i18n{networkAutoConnect} |
142 </paper-checkbox> | 150 </paper-checkbox> |
143 <cr-policy-network-indicator | 151 <cr-policy-network-indicator |
144 property="[[getManagedAutoConnect_(networkProperties)]]"> | 152 property="[[getManagedAutoConnect_(networkProperties)]]"> |
145 </cr-policy-network-indicator> | 153 </cr-policy-network-indicator> |
146 </div> | 154 </div> |
| 155 </template> |
147 <!-- SIM Info (Cellular only). --> | 156 <!-- SIM Info (Cellular only). --> |
148 <div class="settings-box single-column stretch"> | 157 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> |
149 <network-siminfo | 158 <div class="settings-box single-column stretch"> |
150 editable on-siminfo-change="onNetworkPropertyChange_" | 159 <network-siminfo |
151 hidden$="[[!showCellularSim_(networkProperties)]]" | 160 editable on-siminfo-change="onNetworkPropertyChange_" |
152 network-properties="[[networkProperties]]" | 161 network-properties="[[networkProperties]]" |
153 networking-private="[[networkingPrivate]]"> | 162 networking-private="[[networkingPrivate]]"> |
154 </network-siminfo> | 163 </network-siminfo> |
155 </div> | 164 </div> |
| 165 </template> |
156 <!-- IP Address. --> | 166 <!-- IP Address. --> |
157 <div class="settings-box two-line single-column stretch" | 167 <template is="dom-if" if="[[IPAddress_]]"> |
158 hidden$="[[!IPAddress_]]"> | 168 <div class="settings-box two-line single-column stretch"> |
159 <div>$i18n{networkIPAddress}</div> | 169 <div>$i18n{networkIPAddress}</div> |
160 <div class="secondary">[[IPAddress_]]</div> | 170 <div class="secondary">[[IPAddress_]]</div> |
161 </div> | 171 </div> |
| 172 </template> |
162 <!-- Properties to always show if present. --> | 173 <!-- Properties to always show if present. --> |
163 <network-property-list hidden$="[[!hasInfoFields_(networkProperties)]]" | 174 <template is="dom-if" if="[[hasInfoFields_(networkProperties)]]"> |
164 fields="[[getInfoFields_(networkProperties)]]" | 175 <div class="settings-box single-column stretch"> |
165 property-dict="[[networkProperties]]"> | 176 <network-property-list fields="[[getInfoFields_(networkProperties)]]" |
166 </network-property-list> | 177 property-dict="[[networkProperties]]"> |
| 178 </network-property-list> |
| 179 </div> |
| 180 </template> |
167 </div> | 181 </div> |
168 | 182 |
169 <!-- Advanced toggle. --> | 183 <!-- Advanced toggle. --> |
170 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" | 184 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" |
171 hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]"> | 185 hidden$="[[!showAdvanced_(networkProperties)]]"> |
172 <div class="start">$i18n{networkSectionAdvanced}</div> | 186 <div class="advanced flex">$i18n{networkSectionAdvanced}</div> |
173 <cr-expand-button id="expandButton" expanded="{{advancedExpanded_}}"> | 187 <cr-expand-button id="expandButton" expanded="{{advancedExpanded_}}"> |
174 </cr-expand-button> | 188 </cr-expand-button> |
175 </div> | 189 </div> |
176 | 190 |
177 <!-- Advanced section --> | 191 <!-- Advanced section --> |
178 <iron-collapse opened="[[advancedExpanded_]]"> | 192 <iron-collapse opened="[[advancedExpanded_]]"> |
179 <div class="layout vertical indented"> | 193 <div class="layout vertical indented"> |
180 <!-- Advanced properties --> | 194 <div class="settings-box single-column stretch"> |
181 <network-property-list | 195 <!-- Advanced properties --> |
182 hidden$="[[!hasAdvancedFields_(networkProperties)]]" | 196 <network-property-list |
183 fields="[[getAdvancedFields_(networkProperties)]]" | 197 hidden$="[[!hasAdvancedFields_(networkProperties)]]" |
184 property-dict="[[networkProperties]]"> | 198 fields="[[getAdvancedFields_(networkProperties)]]" |
185 </network-property-list> | 199 property-dict="[[networkProperties]]"> |
| 200 </network-property-list> |
| 201 <!-- Device properties --> |
| 202 <network-property-list |
| 203 hidden$="[[!hasDeviceFields_(networkProperties)]]" |
| 204 fields="[[getDeviceFields_(networkProperties)]]" |
| 205 property-dict="[[networkProperties]]"> |
| 206 </network-property-list> |
| 207 </div> |
186 | 208 |
187 <!-- Device properties --> | 209 <!-- Network sub-section title --> |
188 <network-property-list | |
189 hidden$="[[!hasDeviceFields_(networkProperties)]]" | |
190 fields="[[getDeviceFields_(networkProperties)]]" | |
191 property-dict="[[networkProperties]]"> | |
192 </network-property-list> | |
193 | |
194 <!-- network --> | |
195 <div class="layout vertical" | 210 <div class="layout vertical" |
196 hidden$="[[!hasNetworkSection_(networkProperties)]]"> | 211 hidden$="[[!hasNetworkSection_(networkProperties)]]"> |
| 212 <span class="subtitle">$i18n{networkSectionNetwork}</span> |
| 213 </div> |
197 | 214 |
198 <div class="subtitle">$i18n{networkSectionNetwork}</div> | 215 <!-- APN --> |
199 <!-- APN --> | 216 <template is="dom-if" |
| 217 if="[[isType_(NetworkType_.CELLULAR, networkProperties)]]"> |
200 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" | 218 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" |
201 hidden$="[[!isType_(NetworkType_.CELLULAR, networkProperties)]]" | |
202 network-properties="[[networkProperties]]"> | 219 network-properties="[[networkProperties]]"> |
203 </network-apnlist> | 220 </network-apnlist> |
204 <!-- IP Config --> | 221 </template> |
| 222 |
| 223 <!-- IP Config, Nameservers, Proxy --> |
| 224 <template is="dom-if" |
| 225 if="[[isRememberedOrConnected_(networkProperties)]]"> |
205 <network-ip-config editable on-ip-change="onIPConfigChange_" | 226 <network-ip-config editable on-ip-change="onIPConfigChange_" |
206 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" | |
207 network-properties="[[networkProperties]]"> | 227 network-properties="[[networkProperties]]"> |
208 </network-ip-config> | 228 </network-ip-config> |
209 | |
210 <!-- Nameservers --> | |
211 <network-nameservers editable | 229 <network-nameservers editable |
212 on-nameservers-change="onIPConfigChange_" | 230 on-nameservers-change="onIPConfigChange_" |
213 hidden$="[[!isRememberedOrConnected_(networkProperties)]]" | |
214 network-properties="[[networkProperties]]"> | 231 network-properties="[[networkProperties]]"> |
215 </network-nameservers> | 232 </network-nameservers> |
216 </div> | 233 <span class="subtitle">$i18n{networkSectionProxy}</span> |
217 | |
218 <!-- Proxy --> | |
219 <div hidden$="[[!isRememberedOrConnected_(networkProperties)]]"> | |
220 <div class="subtitle">$i18n{networkSectionProxy}</div> | |
221 <network-proxy editable on-proxy-change="onProxyChange_" | 234 <network-proxy editable on-proxy-change="onProxyChange_" |
222 network-properties="[[networkProperties]]"> | 235 network-properties="[[networkProperties]]"> |
223 </network-proxy> | 236 </network-proxy> |
224 </div> | 237 </template> |
225 </div> | 238 </div> |
226 </iron-collapse> | 239 </iron-collapse> |
227 </template> | 240 </template> |
228 <script src="internet_detail_page.js"></script> | 241 <script src="internet_detail_page.js"></script> |
229 </dom-module> | 242 </dom-module> |
OLD | NEW |