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/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_list. html"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list. html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list_ item.html"> |
| 5 <link rel="import" href="chrome://resources/html/polymer.html"> | 5 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior /iron-a11y-keys-behavior.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior /iron-a11y-keys-behavior.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 7 <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/paper-icon-button/paper -icon-button.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> | 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> |
| 11 <link rel="import" href="/settings_shared_css.html"> | 12 <link rel="import" href="/settings_shared_css.html"> |
| 12 <link rel="import" href="network_siminfo.html"> | 13 <link rel="import" href="network_siminfo.html"> |
| 13 | 14 |
| 14 <dom-module name="network-summary-item"> | 15 <dom-module name="network-summary-item"> |
| 15 <template> | 16 <template> |
| 16 <style include="settings-shared"> | 17 <style include="settings-shared"> |
| 17 paper-spinner { | 18 paper-spinner { |
| 18 height: 20px; | 19 height: 20px; |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 46 | 47 |
| 47 #deviceEnabledButton { | 48 #deviceEnabledButton { |
| 48 -webkit-margin-start: 10px; | 49 -webkit-margin-start: 10px; |
| 49 } | 50 } |
| 50 | 51 |
| 51 #networkList { | 52 #networkList { |
| 52 margin: 5px 0 10px; | 53 margin: 5px 0 10px; |
| 53 max-height: 400px; | 54 max-height: 400px; |
| 54 } | 55 } |
| 55 </style> | 56 </style> |
| 56 <div class="settings-box two-line"> | 57 <div class="settings-box two-line" actionable on-tap="onDetailsTap_"> |
|
dschuyler
2016/12/09 01:15:52
optional:
I don't think there's a style guide on i
stevenjb
2016/12/09 01:29:30
Yeah, there's not. I tend to prefer: id class attr
| |
| 57 <div id="details" selectable | 58 <div id="details" |
| 58 no-flex$="[[showSimInfo_(deviceState)]]" | 59 no-flex$="[[showSimInfo_(deviceState)]]"> |
| 59 on-tap="onDetailsTap_" tabindex$="[[getTabIndex_(deviceState)]]"> | |
| 60 <cr-network-list-item item="[[activeNetworkState]]" class="flex"> | 60 <cr-network-list-item item="[[activeNetworkState]]" class="flex"> |
| 61 </cr-network-list-item> | 61 </cr-network-list-item> |
| 62 <paper-spinner active="[[scanningIsActive_(deviceState, expanded_)]]" | 62 <paper-spinner active="[[scanningIsActive_(deviceState, expanded_)]]" |
| 63 hidden$="[[!scanningIsVisible_(deviceState)]]"> | 63 hidden$="[[!scanningIsVisible_(deviceState)]]"> |
| 64 </paper-spinner> | 64 </paper-spinner> |
| 65 </div> | 65 </div> |
| 66 | 66 |
| 67 <template is="dom-if" if="[[showSimInfo_(deviceState)]]"> | 67 <template is="dom-if" if="[[showSimInfo_(deviceState)]]"> |
| 68 <network-siminfo editable class="flex" | 68 <network-siminfo editable class="flex" |
| 69 network-properties="[[getCellularState_(deviceState)]]" | 69 network-properties="[[getCellularState_(deviceState)]]" |
| 70 networking-private="[[networkingPrivate]]"> | 70 networking-private="[[networkingPrivate]]"> |
| 71 </network-siminfo> | 71 </network-siminfo> |
| 72 </template> | 72 </template> |
| 73 | 73 |
| 74 <div> | 74 <div id="buttons" class="layout horizontal"> |
| 75 <div id="buttons" class="layout horizontal"> | 75 <template is="dom-if" |
| 76 <template is="dom-if" | 76 if="[[expandIsVisible_(deviceState, networkStateList)]]"> |
| 77 if="[[showDetailsIsVisible_(deviceState, networkStateList)]]"> | 77 <cr-expand-button id="expandListButton" expanded="{{expanded_}}"> |
| 78 <paper-icon-button icon="cr:settings" on-tap="onShowDetailsTap_"> | 78 </cr-expand-button> |
| 79 </paper-icon-button> | 79 </template> |
| 80 </template> | 80 <template is="dom-if" |
| 81 <template is="dom-if" | 81 if="[[!expandIsVisible_(deviceState, networkStateList)]]"> |
| 82 if="[[expandIsVisible_(deviceState, networkStateList)]]"> | 82 <button class="subpage-arrow" is="paper-icon-button-light" |
| 83 <cr-expand-button id="expandListButton" expanded="{{expanded_}}"> | 83 on-tap="onShowDetailsTap_"> |
| 84 </cr-expand-button> | 84 </button> |
| 85 </template> | 85 </template> |
| 86 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> | 86 </div> |
| 87 <paper-toggle-button id="deviceEnabledButton" | 87 |
| 88 checked="[[deviceIsEnabled_(deviceState)]]" | 88 <template is="dom-if" if="[[enableIsVisible_(deviceState)]]"> |
| 89 on-tap="onDeviceEnabledTap_"> | 89 <div class="secondary-action"> |
| 90 </paper-toggle-button> | 90 <paper-toggle-button id="deviceEnabledButton" |
| 91 </template> | 91 checked="[[deviceIsEnabled_(deviceState)]]" |
| 92 on-tap="onDeviceEnabledTap_"> | |
| 93 </paper-toggle-button> | |
| 92 </div> | 94 </div> |
| 93 </div> | 95 </template> |
| 96 | |
| 94 </div> | 97 </div> |
| 95 <template is="dom-if" | 98 <template is="dom-if" |
| 96 if="[[networksDomIfIsTrue_(expanded_, wasExpanded_)]]"> | 99 if="[[networksDomIfIsTrue_(expanded_, wasExpanded_)]]"> |
| 97 <iron-collapse | 100 <iron-collapse |
| 98 opened="[[networksIronCollapseIsOpened_(expanded_, wasExpanded_)]]"> | 101 opened="[[networksIronCollapseIsOpened_(expanded_, wasExpanded_)]]"> |
| 99 <div class="list-frame"> | 102 <div class="list-frame"> |
| 100 <cr-network-list id="networkList" max-height="[[maxHeight]]" | 103 <cr-network-list id="networkList" max-height="[[maxHeight]]" |
| 101 networks="[[networkStateList]]" show-buttons> | 104 networks="[[networkStateList]]" show-buttons> |
| 102 </cr-network-list> | 105 </cr-network-list> |
| 103 <template is="dom-if" | 106 <template is="dom-if" |
| 104 if="[[knownNetworksIsVisible_(activeNetworkState)]]"> | 107 if="[[knownNetworksIsVisible_(activeNetworkState)]]"> |
| 105 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> | 108 <div class="button-row" actionable on-tap="onKnownNetworksTap_"> |
| 106 <a is="action-link">$i18n{knownNetworksButton}</a> | 109 <a is="action-link">$i18n{knownNetworksButton}</a> |
| 107 </div> | 110 </div> |
| 108 </template> | 111 </template> |
| 109 </div> | 112 </div> |
| 110 </iron-collapse> | 113 </iron-collapse> |
| 111 </template> | 114 </template> |
| 112 </template> | 115 </template> |
| 113 <script src="network_summary_item.js"></script> | 116 <script src="network_summary_item.js"></script> |
| 114 </dom-module> | 117 </dom-module> |
| OLD | NEW |