Chromium Code Reviews| 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/network/cr_network_icon. html"> | 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> | 4 <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 _indicator.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> |
| 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 7 <link rel="import" href="chrome://resources/html/polymer.html"> | 7 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 8 <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-flex-layout/classe s/iron-flex-layout.html"> | 9 <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/paper-button/paper-butt on.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 } | 34 } |
| 35 | 35 |
| 36 cr-policy-network-indicator { | 36 cr-policy-network-indicator { |
| 37 -webkit-margin-start: 10px; | 37 -webkit-margin-start: 10px; |
| 38 } | 38 } |
| 39 | 39 |
| 40 iron-collapse { | 40 iron-collapse { |
| 41 margin: 10px 0; | 41 margin: 10px 0; |
| 42 } | 42 } |
| 43 | 43 |
| 44 iron-icon { | |
| 45 -webkit-margin-end: 10px; | |
| 46 } | |
| 47 | |
| 44 /* Use <span> for subtitles so as not to interfere with | 48 /* Use <span> for subtitles so as not to interfere with |
| 45 * settings-box:first-of-type. */ | 49 * settings-box:first-of-type. */ |
| 46 span.subtitle { | 50 span.subtitle { |
| 47 font-weight: 700; | 51 font-weight: 700; |
| 48 padding: 20px; | 52 padding: 20px; |
| 49 } | 53 } |
| 50 | 54 |
| 51 .advanced { | 55 .advanced { |
| 52 font-weight: 700; | 56 font-weight: 700; |
| 53 } | 57 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 </div> | 97 </div> |
| 94 <template is="dom-if" | 98 <template is="dom-if" |
| 95 if="[[isPolicySource(networkProperties.Source))]]"> | 99 if="[[isPolicySource(networkProperties.Source))]]"> |
| 96 <cr-policy-network-indicator | 100 <cr-policy-network-indicator |
| 97 indicator-type="[[getIndicatorTypeForSource( | 101 indicator-type="[[getIndicatorTypeForSource( |
| 98 networkProperties.Source)]]"> | 102 networkProperties.Source)]]"> |
| 99 </cr-policy-network-indicator> | 103 </cr-policy-network-indicator> |
| 100 </template> | 104 </template> |
| 101 </div> | 105 </div> |
| 102 <div id="buttonDiv" class="layout horizontal center"> | 106 <div id="buttonDiv" class="layout horizontal center"> |
| 103 <paper-button class="secondary-button" on-tap="onForgetTap_" | 107 <template is="dom-if" if="[[!isSecondaryUser_(primaryUserEmail_)]]"> |
| 104 hidden$="[[!showForget_(networkProperties)]]"> | 108 <paper-button class="secondary-button" on-tap="onForgetTap_" |
| 105 $i18n{networkButtonForget} | 109 hidden$="[[!showForget_(networkProperties)]]"> |
| 106 </paper-button> | 110 $i18n{networkButtonForget} |
| 107 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | 111 </paper-button> |
| 108 hidden$="[[!showViewAccount_(networkProperties)]]"> | 112 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
| 109 $i18n{networkButtonViewAccount} | 113 hidden$="[[!showViewAccount_(networkProperties)]]"> |
| 110 </paper-button> | 114 $i18n{networkButtonViewAccount} |
| 111 <paper-button class="secondary-button" on-tap="onActivateTap_" | 115 </paper-button> |
| 112 hidden$="[[!showActivate_(networkProperties)]]"> | 116 <paper-button class="secondary-button" on-tap="onActivateTap_" |
| 113 $i18n{networkButtonActivate} | 117 hidden$="[[!showActivate_(networkProperties)]]"> |
| 114 </paper-button> | 118 $i18n{networkButtonActivate} |
| 115 <paper-button class="secondary-button" on-tap="onConfigureTap_" | 119 </paper-button> |
| 116 hidden$="[[!showConfigure_(networkProperties)]]"> | 120 <paper-button class="secondary-button" on-tap="onConfigureTap_" |
| 117 $i18n{networkButtonConfigure} | 121 hidden$="[[!showConfigure_(networkProperties)]]"> |
| 118 </paper-button> | 122 $i18n{networkButtonConfigure} |
| 123 </paper-button> | |
| 124 </template> | |
| 119 <paper-button class="primary-button" on-tap="onConnectTap_" | 125 <paper-button class="primary-button" on-tap="onConnectTap_" |
| 120 hidden$="[[!showConnect_(networkProperties)]]" | 126 hidden$="[[!showConnect_(networkProperties)]]" |
| 121 disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]"> | 127 disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]"> |
| 122 $i18n{networkButtonConnect} | 128 $i18n{networkButtonConnect} |
| 123 </paper-button> | 129 </paper-button> |
| 124 <paper-button class="primary-button" on-tap="onDisconnectTap_" | 130 <paper-button class="primary-button" on-tap="onDisconnectTap_" |
| 125 hidden$="[[!showDisconnect_(networkProperties)]]"> | 131 hidden$="[[!showDisconnect_(networkProperties)]]"> |
| 126 $i18n{networkButtonDisconnect} | 132 $i18n{networkButtonDisconnect} |
| 127 </paper-button> | 133 </paper-button> |
| 128 </div> | 134 </div> |
| 129 </div> | 135 </div> |
| 130 | 136 |
| 131 <!-- Shared. --> | 137 <!-- Shared. --> |
| 132 <div class="settings-box continuation" | 138 <div class="settings-box continuation" |
| 133 hidden$="[[!showShared_(networkProperties)]]"> | 139 hidden$="[[!showShared_(networkProperties)]]"> |
| 134 $i18n{networkShared} | 140 $i18n{networkShared} |
| 135 </div> | 141 </div> |
| 136 <!-- Top level properties --> | 142 |
| 137 <div class="layout vertical"> | 143 <template is="dom-if" if="[[isSecondaryUser_(primaryUserEmail_)]]"> |
| 138 <!-- Prefer this network. --> | 144 <!-- Show message for non primary users. --> |
| 139 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> | 145 <div class="settings-box continuation single-column"> |
| 140 <div class="settings-box"> | 146 <div class="layout horizontal center"> |
| 141 <paper-checkbox checked="{{preferNetwork_}}" | 147 <iron-icon tabindex="0" icon="cr:group"> |
| 142 disabled="[[isNetworkPolicyEnforced( | 148 </iron-icon> |
| 143 networkProperties.Priority)]]"> | 149 <div> |
| 144 $i18n{networkPrefer} | 150 [[i18n('networkPrimaryUserControlled', primaryUserEmail_)]] |
| 145 </paper-checkbox> | 151 </div> |
| 146 <cr-policy-network-indicator | |
| 147 property="[[networkProperties.Priority]]"> | |
| 148 </cr-policy-network-indicator> | |
| 149 </div> | 152 </div> |
| 150 </template> | 153 </div> |
| 151 <!-- Autoconnect. --> | 154 </template> |
| 152 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> | 155 <template is="dom-if" if="[[!isSecondaryUser_(primaryUserEmail_)]]"> |
| 153 <div class="settings-box"> | 156 <!-- Top level properties --> |
|
stevenjb
2016/12/12 21:10:51
Ugh, sorry, coderview diff sucks. Nothing below th
| |
| 154 <paper-checkbox checked="{{autoConnect_}}" | 157 <div class="layout vertical"> |
| 155 disabled="[[isNetworkPolicyEnforced( | 158 <!-- Prefer this network. --> |
| 156 getManagedAutoConnect_(networkProperties))]]"> | 159 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> |
| 157 $i18n{networkAutoConnect} | 160 <div class="settings-box"> |
| 158 </paper-checkbox> | 161 <paper-checkbox checked="{{preferNetwork_}}" |
| 159 <cr-policy-network-indicator | 162 disabled="[[isNetworkPolicyEnforced( |
| 160 property="[[getManagedAutoConnect_(networkProperties)]]"> | 163 networkProperties.Priority)]]"> |
| 161 </cr-policy-network-indicator> | 164 $i18n{networkPrefer} |
| 162 </div> | 165 </paper-checkbox> |
| 163 </template> | 166 <cr-policy-network-indicator |
| 164 <!-- SIM Info (Cellular only). --> | 167 property="[[networkProperties.Priority]]"> |
| 165 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> | 168 </cr-policy-network-indicator> |
| 166 <div class="settings-box single-column stretch"> | 169 </div> |
| 167 <network-siminfo | |
| 168 editable on-siminfo-change="onNetworkPropertyChange_" | |
| 169 network-properties="[[networkProperties]]" | |
| 170 networking-private="[[networkingPrivate]]"> | |
| 171 </network-siminfo> | |
| 172 </div> | |
| 173 </template> | |
| 174 <!-- IP Address. --> | |
| 175 <template is="dom-if" if="[[IPAddress_]]"> | |
| 176 <div class="settings-box two-line single-column stretch"> | |
| 177 <div>$i18n{networkIPAddress}</div> | |
| 178 <div class="secondary">[[IPAddress_]]</div> | |
| 179 </div> | |
| 180 </template> | |
| 181 <!-- Properties to always show if present. --> | |
| 182 <template is="dom-if" if="[[hasInfoFields_(networkProperties)]]"> | |
| 183 <div class="settings-box single-column stretch"> | |
| 184 <network-property-list fields="[[getInfoFields_(networkProperties)]]" | |
| 185 property-dict="[[networkProperties]]"> | |
| 186 </network-property-list> | |
| 187 </div> | |
| 188 </template> | |
| 189 </div> | |
| 190 | |
| 191 <!-- Advanced toggle. --> | |
| 192 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" | |
| 193 hidden$="[[!showAdvanced_(networkProperties)]]"> | |
| 194 <div class="advanced flex">$i18n{networkSectionAdvanced}</div> | |
| 195 <cr-expand-button id="expandButton" expanded="{{advancedExpanded_}}" | |
| 196 alt="$i18n{networkSectionAdvancedExpandA11yLabel}"> | |
| 197 </cr-expand-button> | |
| 198 </div> | |
| 199 | |
| 200 <!-- Advanced section --> | |
| 201 <iron-collapse opened="[[advancedExpanded_]]"> | |
| 202 <div class="layout vertical indented"> | |
| 203 <div class="settings-box single-column stretch" | |
| 204 hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]"> | |
| 205 <!-- Advanced properties --> | |
| 206 <network-property-list | |
| 207 hidden$="[[!hasAdvancedFields_(networkProperties)]]" | |
| 208 fields="[[getAdvancedFields_(networkProperties)]]" | |
| 209 property-dict="[[networkProperties]]"> | |
| 210 </network-property-list> | |
| 211 <!-- Device properties --> | |
| 212 <network-property-list | |
| 213 hidden$="[[!hasDeviceFields_(networkProperties)]]" | |
| 214 fields="[[getDeviceFields_(networkProperties)]]" | |
| 215 property-dict="[[networkProperties]]"> | |
| 216 </network-property-list> | |
| 217 </div> | |
| 218 | |
| 219 <!-- Network sub-section title --> | |
| 220 <div class="layout vertical" | |
| 221 hidden$="[[!hasNetworkSection_(networkProperties)]]"> | |
| 222 <span class="subtitle">$i18n{networkSectionNetwork}</span> | |
| 223 </div> | |
| 224 | |
| 225 <!-- APN --> | |
| 226 <template is="dom-if" | |
| 227 if="[[isType_(NetworkType_.CELLULAR, networkProperties)]]"> | |
| 228 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" | |
| 229 network-properties="[[networkProperties]]"> | |
| 230 </network-apnlist> | |
| 231 </template> | 170 </template> |
| 232 | 171 <!-- Autoconnect. --> |
| 233 <!-- IP Config, Nameservers, Proxy --> | 172 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> |
| 234 <template is="dom-if" | 173 <div class="settings-box"> |
| 235 if="[[isRememberedOrConnected_(networkProperties)]]"> | 174 <paper-checkbox checked="{{autoConnect_}}" |
| 236 <network-ip-config editable on-ip-change="onIPConfigChange_" | 175 disabled="[[isNetworkPolicyEnforced( |
| 237 network-properties="[[networkProperties]]"> | 176 getManagedAutoConnect_(networkProperties))]]"> |
| 238 </network-ip-config> | 177 $i18n{networkAutoConnect} |
| 239 <network-nameservers editable | 178 </paper-checkbox> |
| 240 on-nameservers-change="onIPConfigChange_" | 179 <cr-policy-network-indicator |
| 241 network-properties="[[networkProperties]]"> | 180 property="[[getManagedAutoConnect_(networkProperties)]]"> |
| 242 </network-nameservers> | 181 </cr-policy-network-indicator> |
| 243 <span class="subtitle">$i18n{networkSectionProxy}</span> | 182 </div> |
| 244 <network-proxy editable prefs="{{prefs}}" | 183 </template> |
| 245 on-proxy-change="onProxyChange_" | 184 <!-- SIM Info (Cellular only). --> |
| 246 network-properties="[[networkProperties]]"> | 185 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> |
| 247 </network-proxy> | 186 <div class="settings-box single-column stretch"> |
| 187 <network-siminfo | |
| 188 editable on-siminfo-change="onNetworkPropertyChange_" | |
| 189 network-properties="[[networkProperties]]" | |
| 190 networking-private="[[networkingPrivate]]"> | |
| 191 </network-siminfo> | |
| 192 </div> | |
| 193 </template> | |
| 194 <!-- IP Address. --> | |
| 195 <template is="dom-if" if="[[IPAddress_]]"> | |
| 196 <div class="settings-box two-line single-column stretch"> | |
| 197 <div>$i18n{networkIPAddress}</div> | |
| 198 <div class="secondary">[[IPAddress_]]</div> | |
| 199 </div> | |
| 200 </template> | |
| 201 <!-- Properties to always show if present. --> | |
| 202 <template is="dom-if" if="[[hasInfoFields_(networkProperties)]]"> | |
| 203 <div class="settings-box single-column stretch"> | |
| 204 <network-property-list | |
| 205 fields="[[getInfoFields_(networkProperties)]]" | |
| 206 property-dict="[[networkProperties]]"> | |
| 207 </network-property-list> | |
| 208 </div> | |
| 248 </template> | 209 </template> |
| 249 </div> | 210 </div> |
| 250 </iron-collapse> | 211 |
| 212 <!-- Advanced toggle. --> | |
| 213 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" | |
| 214 hidden$="[[!showAdvanced_(networkProperties)]]"> | |
| 215 <div class="advanced flex">$i18n{networkSectionAdvanced}</div> | |
| 216 <cr-expand-button id="expandButton" expanded="{{advancedExpanded_}}" | |
| 217 alt="$i18n{networkSectionAdvancedExpandA11yLabel}"> | |
| 218 </cr-expand-button> | |
| 219 </div> | |
| 220 | |
| 221 <!-- Advanced section --> | |
| 222 <iron-collapse opened="[[advancedExpanded_]]"> | |
| 223 <div class="layout vertical indented"> | |
| 224 <div class="settings-box single-column stretch" | |
| 225 hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]"> | |
| 226 <!-- Advanced properties --> | |
| 227 <network-property-list | |
| 228 hidden$="[[!hasAdvancedFields_(networkProperties)]]" | |
| 229 fields="[[getAdvancedFields_(networkProperties)]]" | |
| 230 property-dict="[[networkProperties]]"> | |
| 231 </network-property-list> | |
| 232 <!-- Device properties --> | |
| 233 <network-property-list | |
| 234 hidden$="[[!hasDeviceFields_(networkProperties)]]" | |
| 235 fields="[[getDeviceFields_(networkProperties)]]" | |
| 236 property-dict="[[networkProperties]]"> | |
| 237 </network-property-list> | |
| 238 </div> | |
| 239 | |
| 240 <!-- Network sub-section title --> | |
| 241 <div class="layout vertical" | |
| 242 hidden$="[[!hasNetworkSection_(networkProperties)]]"> | |
| 243 <span class="subtitle">$i18n{networkSectionNetwork}</span> | |
| 244 </div> | |
| 245 | |
| 246 <!-- APN --> | |
| 247 <template is="dom-if" | |
| 248 if="[[isType_(NetworkType_.CELLULAR, networkProperties)]]"> | |
| 249 <network-apnlist editable on-apn-change="onNetworkPropertyChange_" | |
| 250 network-properties="[[networkProperties]]"> | |
| 251 </network-apnlist> | |
| 252 </template> | |
| 253 | |
| 254 <!-- IP Config, Nameservers, Proxy --> | |
| 255 <template is="dom-if" | |
| 256 if="[[isRememberedOrConnected_(networkProperties)]]"> | |
| 257 <network-ip-config editable on-ip-change="onIPConfigChange_" | |
| 258 network-properties="[[networkProperties]]"> | |
| 259 </network-ip-config> | |
| 260 <network-nameservers editable | |
| 261 on-nameservers-change="onIPConfigChange_" | |
| 262 network-properties="[[networkProperties]]"> | |
| 263 </network-nameservers> | |
| 264 <span class="subtitle">$i18n{networkSectionProxy}</span> | |
| 265 <network-proxy editable prefs="{{prefs}}" | |
| 266 on-proxy-change="onProxyChange_" | |
| 267 network-properties="[[networkProperties]]"> | |
| 268 </network-proxy> | |
| 269 </template> | |
| 270 </div> | |
| 271 </iron-collapse> | |
| 272 </template> | |
| 251 </template> | 273 </template> |
| 252 <script src="internet_detail_page.js"></script> | 274 <script src="internet_detail_page.js"></script> |
| 253 </dom-module> | 275 </dom-module> |
| OLD | NEW |