Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 | 2 |
| 3 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> | 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> |
| 6 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> | 6 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> |
| 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat or.html"> | 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat or.html"> |
| 8 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> | 8 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> |
| 9 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> | 9 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> |
| 10 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 10 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 75 [[getStateText_(networkProperties)]] | 75 [[getStateText_(networkProperties)]] |
| 76 </div> | 76 </div> |
| 77 <template is="dom-if" | 77 <template is="dom-if" |
| 78 if="[[isPolicySource(networkProperties.Source))]]"> | 78 if="[[isPolicySource(networkProperties.Source))]]"> |
| 79 <cr-policy-indicator | 79 <cr-policy-indicator |
| 80 indicator-type="[[getIndicatorTypeForSource( | 80 indicator-type="[[getIndicatorTypeForSource( |
| 81 networkProperties.Source)]]"> | 81 networkProperties.Source)]]"> |
| 82 </cr-policy-indicator> | 82 </cr-policy-indicator> |
| 83 </template> | 83 </template> |
| 84 </div> | 84 </div> |
| 85 <div id="buttonDiv" class="button-container"> | 85 <template is="dom-if" if="[[!isSecondaryUser_]]"> |
|
stevenjb
2017/06/02 17:50:17
This is unnecessary, removing it makes this consis
| |
| 86 <template is="dom-if" if="[[!isSecondaryUser_]]"> | 86 <paper-button class="secondary-button" on-tap="onForgetTap_" |
| 87 <paper-button class="secondary-button" on-tap="onForgetTap_" | 87 hidden$="[[!showForget_(networkProperties)]]"> |
| 88 hidden$="[[!showForget_(networkProperties)]]"> | 88 $i18n{networkButtonForget} |
| 89 $i18n{networkButtonForget} | |
| 90 </paper-button> | |
| 91 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | |
| 92 hidden$="[[!showViewAccount_(networkProperties)]]"> | |
| 93 $i18n{networkButtonViewAccount} | |
| 94 </paper-button> | |
| 95 <paper-button class="secondary-button" on-tap="onActivateTap_" | |
| 96 hidden$="[[!showActivate_(networkProperties)]]"> | |
| 97 $i18n{networkButtonActivate} | |
| 98 </paper-button> | |
| 99 <paper-button class="secondary-button" on-tap="onConfigureTap_" | |
| 100 hidden$="[[!showConfigure_(networkProperties, globalPolicy)]]"> | |
| 101 $i18n{networkButtonConfigure} | |
| 102 </paper-button> | |
| 103 </template> | |
| 104 <paper-button class="primary-button" on-tap="onConnectTap_" | |
| 105 hidden$="[[!showConnect_(networkProperties, globalPolicy)]]" | |
| 106 disabled="[[!enableConnect_(networkProperties, defaultNetwork, | |
| 107 globalPolicy)]]"> | |
| 108 $i18n{networkButtonConnect} | |
| 109 </paper-button> | 89 </paper-button> |
| 110 <paper-button class="primary-button" on-tap="onDisconnectTap_" | 90 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
| 111 hidden$="[[!showDisconnect_(networkProperties)]]"> | 91 hidden$="[[!showViewAccount_(networkProperties)]]"> |
| 112 $i18n{networkButtonDisconnect} | 92 $i18n{networkButtonViewAccount} |
| 113 </paper-button> | 93 </paper-button> |
| 114 </div> | 94 <paper-button class="secondary-button" on-tap="onActivateTap_" |
| 95 hidden$="[[!showActivate_(networkProperties)]]"> | |
| 96 $i18n{networkButtonActivate} | |
| 97 </paper-button> | |
| 98 <paper-button class="secondary-button" on-tap="onConfigureTap_" | |
| 99 hidden$="[[!showConfigure_(networkProperties, globalPolicy)]]"> | |
| 100 $i18n{networkButtonConfigure} | |
| 101 </paper-button> | |
| 102 </template> | |
| 103 <paper-button class="primary-button" on-tap="onConnectTap_" | |
| 104 hidden$="[[!showConnect_(networkProperties, globalPolicy)]]" | |
| 105 disabled="[[!enableConnect_(networkProperties, defaultNetwork, | |
| 106 globalPolicy)]]"> | |
| 107 $i18n{networkButtonConnect} | |
| 108 </paper-button> | |
| 109 <paper-button class="primary-button" on-tap="onDisconnectTap_" | |
| 110 hidden$="[[!showDisconnect_(networkProperties)]]"> | |
| 111 $i18n{networkButtonDisconnect} | |
| 112 </paper-button> | |
| 115 </div> | 113 </div> |
| 116 | 114 |
| 117 <!-- Disabled by policy / Shared messages. --> | 115 <!-- Disabled by policy / Shared messages. --> |
| 118 <div class="settings-box continuation" | 116 <div class="settings-box continuation" |
| 119 hidden$="[[!connectNotAllowed_(networkProperties, globalPolicy)]]"> | 117 hidden$="[[!connectNotAllowed_(networkProperties, globalPolicy)]]"> |
| 120 <iron-icon class="policy" icon="cr20:domain"></iron-icon> | 118 <iron-icon class="policy" icon="cr20:domain"></iron-icon> |
| 121 <div>$i18n{networkConnectNotAllowed}</div> | 119 <div>$i18n{networkConnectNotAllowed}</div> |
| 122 </div> | 120 </div> |
| 123 <div class="settings-box continuation" | 121 <div class="settings-box continuation" |
| 124 hidden$="[[!showShared_(networkProperties)]]"> | 122 hidden$="[[!showShared_(networkProperties)]]"> |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 289 </template> | 287 </template> |
| 290 | 288 |
| 291 <tether-connection-dialog id="tetherDialog" | 289 <tether-connection-dialog id="tetherDialog" |
| 292 network-properties="[[networkProperties]]" | 290 network-properties="[[networkProperties]]" |
| 293 on-tether-connect="onTetherConnect_" | 291 on-tether-connect="onTetherConnect_" |
| 294 on-close="onTetherDialogClose_"> | 292 on-close="onTetherDialogClose_"> |
| 295 </tether-connection-dialog> | 293 </tether-connection-dialog> |
| 296 </template> | 294 </template> |
| 297 <script src="internet_detail_page.js"></script> | 295 <script src="internet_detail_page.js"></script> |
| 298 </dom-module> | 296 </dom-module> |
| OLD | NEW |