| 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 24 matching lines...) Expand all Loading... |
| 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; |
| 43 } | 43 } |
| 44 | 44 |
| 45 .settings-box.embedded { |
| 46 -webkit-margin-start: 0; |
| 47 align-items: stretch; |
| 48 flex-direction: column; |
| 49 justify-content: center; |
| 50 padding: 0; |
| 51 } |
| 52 |
| 53 .settings-box.stretch { |
| 54 align-items: stretch; |
| 55 } |
| 56 |
| 45 .subtitle { | 57 .subtitle { |
| 46 -webkit-margin-start: 20px; | 58 -webkit-margin-start: 20px; |
| 47 font-weight: 500; | 59 font-weight: 500; |
| 48 padding: 20px 0; | 60 padding: 20px 0; |
| 49 } | 61 } |
| 50 | 62 |
| 51 #buttonDiv paper-button { | 63 #buttonDiv paper-button { |
| 52 margin: 10px 0; | 64 margin: 10px 0; |
| 53 } | 65 } |
| 54 | 66 |
| 55 #networkState { | 67 #networkState { |
| 56 /* TODO(stevenjb): Finalize font-size / style for this. */ | 68 /* TODO(stevenjb): Finalize font-size / style for this. */ |
| 57 font-size: 125%; | 69 font-size: 125%; |
| 58 font-weight: 500; | 70 font-weight: 500; |
| 59 } | 71 } |
| 60 | 72 |
| 61 #networkState[connected] { | 73 #networkState[connected] { |
| 62 color: var(--google-green-500); | 74 color: var(--google-green-500); |
| 63 } | 75 } |
| 64 | 76 |
| 65 #proxyDiv { | 77 #proxyDiv { |
| 66 max-width: 500px; | 78 max-width: 500px; |
| 67 } | 79 } |
| 68 </style> | 80 </style> |
| 69 <div class="settings-box first single-column"> | 81 <!-- Title section: Icon + name + connection state. --> |
| 70 <!-- Title section: Icon + name + connection state. --> | 82 <div class="settings-box first"> |
| 71 <div class="settings-box embedded"> | 83 <div class="start layout horizontal center"> |
| 72 <div class="start layout horizontal center"> | 84 <cr-network-icon network-state="[[networkProperties]]"> |
| 73 <cr-network-icon network-state="[[networkProperties]]"> | 85 </cr-network-icon> |
| 74 </cr-network-icon> | 86 <div id="networkState" |
| 75 <div id="networkState" | 87 connected$="[[isConnectedState_(networkProperties)]]"> |
| 76 connected$="[[isConnectedState_(networkProperties)]]"> | 88 [[getStateText_(networkProperties)]] |
| 77 [[getStateText_(networkProperties)]] | |
| 78 </div> | |
| 79 </div> | |
| 80 <div id="buttonDiv" class="layout horizontal center"> | |
| 81 <paper-button class="secondary-button" on-tap="onForgetTap_" | |
| 82 hidden$="[[!showForget_(networkProperties)]]"> | |
| 83 $i18n{networkButtonForget} | |
| 84 </paper-button> | |
| 85 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | |
| 86 hidden$="[[!showViewAccount_(networkProperties)]]"> | |
| 87 $i18n{networkButtonViewAccount} | |
| 88 </paper-button> | |
| 89 <paper-button class="secondary-button" on-tap="onActivateTap_" | |
| 90 hidden$="[[!showActivate_(networkProperties)]]"> | |
| 91 $i18n{networkButtonActivate} | |
| 92 </paper-button> | |
| 93 <paper-button class="secondary-button" on-tap="onConfigureTap_" | |
| 94 hidden$="[[!showConfigure_(networkProperties)]]"> | |
| 95 $i18n{networkButtonConfigure} | |
| 96 </paper-button> | |
| 97 <paper-button class="primary-button" on-tap="onConnectTap_" | |
| 98 hidden$="[[!showConnect_(networkProperties)]]" | |
| 99 disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]"> | |
| 100 $i18n{networkButtonConnect} | |
| 101 </paper-button> | |
| 102 <paper-button class="primary-button" on-tap="onDisconnectTap_" | |
| 103 hidden$="[[!showDisconnect_(networkProperties)]]"> | |
| 104 $i18n{networkButtonDisconnect} | |
| 105 </paper-button> | |
| 106 </div> | 89 </div> |
| 107 </div> | 90 </div> |
| 108 <!-- Shared. --> | 91 <div id="buttonDiv" class="layout horizontal center"> |
| 109 <div class="settings-box embedded" | 92 <paper-button class="secondary-button" on-tap="onForgetTap_" |
| 110 hidden$="[[!showShared_(networkProperties)]]"> | 93 hidden$="[[!showForget_(networkProperties)]]"> |
| 111 $i18n{networkShared} | 94 $i18n{networkButtonForget} |
| 95 </paper-button> |
| 96 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
| 97 hidden$="[[!showViewAccount_(networkProperties)]]"> |
| 98 $i18n{networkButtonViewAccount} |
| 99 </paper-button> |
| 100 <paper-button class="secondary-button" on-tap="onActivateTap_" |
| 101 hidden$="[[!showActivate_(networkProperties)]]"> |
| 102 $i18n{networkButtonActivate} |
| 103 </paper-button> |
| 104 <paper-button class="secondary-button" on-tap="onConfigureTap_" |
| 105 hidden$="[[!showConfigure_(networkProperties)]]"> |
| 106 $i18n{networkButtonConfigure} |
| 107 </paper-button> |
| 108 <paper-button class="primary-button" on-tap="onConnectTap_" |
| 109 hidden$="[[!showConnect_(networkProperties)]]" |
| 110 disabled="[[!enableConnect_(networkProperties, defaultNetwork)]]"> |
| 111 $i18n{networkButtonConnect} |
| 112 </paper-button> |
| 113 <paper-button class="primary-button" on-tap="onDisconnectTap_" |
| 114 hidden$="[[!showDisconnect_(networkProperties)]]"> |
| 115 $i18n{networkButtonDisconnect} |
| 116 </paper-button> |
| 112 </div> | 117 </div> |
| 118 </div> |
| 119 |
| 120 <!-- Shared. --> |
| 121 <div class="settings-box continuation" |
| 122 hidden$="[[!showShared_(networkProperties)]]"> |
| 123 $i18n{networkShared} |
| 124 </div> |
| 125 <!-- Top level properties --> |
| 126 <div class="settings-box continuation embedded"> |
| 113 <!-- Prefer this network. --> | 127 <!-- Prefer this network. --> |
| 114 <div class="settings-box embedded" | 128 <div class="settings-box" |
| 115 hidden$="[[!showPreferNetwork_(networkProperties)]]"> | 129 hidden$="[[!showPreferNetwork_(networkProperties)]]"> |
| 116 <paper-checkbox checked="{{preferNetwork_}}" | 130 <paper-checkbox checked="{{preferNetwork_}}" |
| 117 disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]"> | 131 disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]"> |
| 118 $i18n{networkPrefer} | 132 $i18n{networkPrefer} |
| 119 </paper-checkbox> | 133 </paper-checkbox> |
| 120 <cr-policy-network-indicator property="[[networkProperties.Priority]]"> | 134 <cr-policy-network-indicator property="[[networkProperties.Priority]]"> |
| 121 </cr-policy-network-indicator> | 135 </cr-policy-network-indicator> |
| 122 </div> | 136 </div> |
| 123 <!-- Autoconnect. --> | 137 <!-- Autoconnect. --> |
| 124 <div class="settings-box embedded" | 138 <div class="settings-box" |
| 125 hidden$="[[!showAutoConnect_(networkProperties)]]"> | 139 hidden$="[[!showAutoConnect_(networkProperties)]]"> |
| 126 <paper-checkbox checked="{{autoConnect_}}"> | 140 <paper-checkbox checked="{{autoConnect_}}"> |
| 127 $i18n{networkAutoConnect} | 141 $i18n{networkAutoConnect} |
| 128 </paper-checkbox> | 142 </paper-checkbox> |
| 129 <cr-policy-network-indicator | 143 <cr-policy-network-indicator |
| 130 property="[[getManagedAutoConnect_(networkProperties)]]"> | 144 property="[[getManagedAutoConnect_(networkProperties)]]"> |
| 131 </cr-policy-network-indicator> | 145 </cr-policy-network-indicator> |
| 132 </div> | 146 </div> |
| 147 <!-- SIM Info (Cellular only). --> |
| 148 <div class="settings-box single-column stretch"> |
| 149 <network-siminfo |
| 150 editable on-siminfo-change="onNetworkPropertyChange_" |
| 151 hidden$="[[!showCellularSim_(networkProperties)]]" |
| 152 network-properties="[[networkProperties]]" |
| 153 networking-private="[[networkingPrivate]]"> |
| 154 </network-siminfo> |
| 155 </div> |
| 156 <!-- IP Address. --> |
| 157 <div class="settings-box two-line single-column stretch" |
| 158 hidden$="[[!IPAddress_]]"> |
| 159 <div>$i18n{networkIPAddress}</div> |
| 160 <div class="secondary">[[IPAddress_]]</div> |
| 161 </div> |
| 162 <!-- Properties to always show if present. --> |
| 163 <network-property-list hidden$="[[!hasInfoFields_(networkProperties)]]" |
| 164 fields="[[getInfoFields_(networkProperties)]]" |
| 165 property-dict="[[networkProperties]]"> |
| 166 </network-property-list> |
| 133 </div> | 167 </div> |
| 134 | 168 |
| 135 <!-- SIM Info (Cellular only). --> | |
| 136 <network-siminfo | |
| 137 editable on-siminfo-change="onNetworkPropertyChange_" | |
| 138 hidden$="[[!showCellularSim_(networkProperties)]]" | |
| 139 network-properties="[[networkProperties]]" | |
| 140 networking-private="[[networkingPrivate]]"> | |
| 141 </network-siminfo> | |
| 142 | |
| 143 <!-- IP Address. --> | |
| 144 <div class="settings-box two-line single-column" hidden$="[[!IPAddress_]]"> | |
| 145 <div>$i18n{networkIPAddress}</div> | |
| 146 <div class="secondary">[[IPAddress_]]</div> | |
| 147 </div> | |
| 148 | |
| 149 <!-- Properties to always show if present. --> | |
| 150 <network-property-list hidden$="[[!hasInfoFields_(networkProperties)]]" | |
| 151 fields="[[getInfoFields_(networkProperties)]]" | |
| 152 property-dict="[[networkProperties]]"> | |
| 153 </network-property-list> | |
| 154 | |
| 155 <!-- Advanced toggle. --> | 169 <!-- Advanced toggle. --> |
| 156 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" | 170 <div class="settings-box" actionable on-tap="toggleAdvancedExpanded_" |
| 157 hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]"> | 171 hidden$="[[!hasAdvancedOrDeviceFields_(networkProperties)]]"> |
| 158 <div class="start">$i18n{networkSectionAdvanced}</div> | 172 <div class="start">$i18n{networkSectionAdvanced}</div> |
| 159 <cr-expand-button id="expandButton" expanded="{{advancedExpanded_}}"> | 173 <cr-expand-button id="expandButton" expanded="{{advancedExpanded_}}"> |
| 160 </cr-expand-button> | 174 </cr-expand-button> |
| 161 </div> | 175 </div> |
| 162 | 176 |
| 163 <!-- Advanced section --> | 177 <!-- Advanced section --> |
| 164 <iron-collapse opened="[[advancedExpanded_]]"> | 178 <iron-collapse opened="[[advancedExpanded_]]"> |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 <div class="subtitle">$i18n{networkSectionProxy}</div> | 220 <div class="subtitle">$i18n{networkSectionProxy}</div> |
| 207 <network-proxy editable on-proxy-change="onProxyChange_" | 221 <network-proxy editable on-proxy-change="onProxyChange_" |
| 208 network-properties="[[networkProperties]]"> | 222 network-properties="[[networkProperties]]"> |
| 209 </network-proxy> | 223 </network-proxy> |
| 210 </div> | 224 </div> |
| 211 </div> | 225 </div> |
| 212 </iron-collapse> | 226 </iron-collapse> |
| 213 </template> | 227 </template> |
| 214 <script src="internet_detail_page.js"></script> | 228 <script src="internet_detail_page.js"></script> |
| 215 </dom-module> | 229 </dom-module> |
| OLD | NEW |