Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
|
stevenjb
2015/07/08 01:59:25
+layout
| |
| 2 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_chec kbox.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_chec kbox.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_coll apse.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_coll apse.html"> |
| 4 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr _expand_button.html"> | 4 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr _expand_button.html"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_onc/cr_onc_types .html"> | 5 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_onc/cr_onc_types .html"> |
| 6 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_network_icon/cr_ network_icon.html"> | 6 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_network_icon/cr_ network_icon.html"> |
| 7 <link rel="import" href="network_ip_config.html"> | 7 <link rel="import" href="network_ip_config.html"> |
| 8 <link rel="import" href="network_nameservers.html"> | 8 <link rel="import" href="network_nameservers.html"> |
| 9 <link rel="import" href="network_property_list.html"> | 9 <link rel="import" href="network_property_list.html"> |
| 10 <link rel="import" href="network_proxy.html"> | |
| 10 | 11 |
| 11 <dom-module id="cr-settings-internet-detail-page"> | 12 <dom-module id="cr-settings-internet-detail-page"> |
| 12 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css"> | 13 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css"> |
| 13 <link rel="import" type="css" href="internet_detail_page.css"> | 14 <link rel="import" type="css" href="internet_detail_page.css"> |
| 14 <template> | 15 <template> |
| 15 <paper-material class="layout vertical"> | 16 <paper-material class="layout vertical"> |
| 16 <div id="outerDiv" class="layout vertical"> | 17 <div id="outerDiv" class="layout vertical"> |
| 17 <div id="titleDiv" class="layout horizontal"> | 18 <div id="titleDiv" class="layout horizontal"> |
| 18 <div class="layout center horizontal flex"> | 19 <div class="layout center horizontal flex"> |
| 19 <cr-network-icon id="networkIcon" network-state="[[networkState]]"> | 20 <cr-network-icon id="networkIcon" network-state="[[networkState]]"> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 65 | 66 |
| 66 <div id="advancedDiv" class="layout vertical" | 67 <div id="advancedDiv" class="layout vertical" |
| 67 hidden$="[[!hasAdvancedOrDeviceFields_(networkState)]]"> | 68 hidden$="[[!hasAdvancedOrDeviceFields_(networkState)]]"> |
| 68 <cr-collapse opened="[[advancedExpanded]]"> | 69 <cr-collapse opened="[[advancedExpanded]]"> |
| 69 <network-property-list | 70 <network-property-list |
| 70 fields="[[getAdvancedFields_(networkState)]]" | 71 fields="[[getAdvancedFields_(networkState)]]" |
| 71 network-state="[[networkState]]"> | 72 network-state="[[networkState]]"> |
| 72 </network-property-list> | 73 </network-property-list> |
| 73 | 74 |
| 74 <div class="layout vertical" | 75 <div class="layout vertical" |
| 76 hidden$="[[!hasNetworkSection_(networkState)]]"> | |
| 77 <cr-button toggles active="{{proxyExpanded}}"> | |
| 78 Proxy | |
| 79 </cr-button> | |
| 80 <cr-collapse opened="[[proxyExpanded]]"> | |
| 81 <div id="proxyDiv" class="layout vertical flex"> | |
| 82 <network-proxy editable | |
|
stevenjb
2015/07/08 01:59:25
elim 'editable' for now
| |
| 83 network-state="[[networkState]]" | |
| 84 on-changed="onProxyChanged_"> | |
| 85 </network-proxy> | |
| 86 </div> | |
| 87 </cr-collapse> | |
| 88 </div> | |
| 89 | |
| 90 <div class="layout vertical" | |
| 75 hidden$="[[!hasDeviceFields_(networkState)]]"> | 91 hidden$="[[!hasDeviceFields_(networkState)]]"> |
| 76 <cr-button toggles active="{{deviceExpanded}}"> | 92 <cr-button toggles active="{{deviceExpanded}}"> |
| 77 Device | 93 Device |
| 78 </cr-button> | 94 </cr-button> |
| 79 <cr-collapse opened="[[deviceExpanded]]"> | 95 <cr-collapse opened="[[deviceExpanded]]"> |
| 80 <network-property-list | 96 <network-property-list |
| 81 fields="[[getDeviceFields_(networkState)]]" | 97 fields="[[getDeviceFields_(networkState)]]" |
| 82 network-state="[[networkState]]"> | 98 network-state="[[networkState]]"> |
| 83 </network-property-list> | 99 </network-property-list> |
| 84 </cr-collapse> | 100 </cr-collapse> |
| 85 </div> | 101 </div> |
| 86 </cr-collapse> | 102 </cr-collapse> |
| 87 </div> | 103 </div> |
| 88 </div> | 104 </div> |
| 89 </div> | 105 </div> |
| 90 </paper-shadow> | 106 </paper-shadow> |
| 91 </template> | 107 </template> |
| 92 <script src="internet_detail_page.js"></script> | 108 <script src="internet_detail_page.js"></script> |
| 93 </dom-module> | 109 </dom-module> |
| OLD | NEW |