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_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/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.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-icon/iron-icon.htm
l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
9 <link rel="import" href="../prefs/prefs.html"> | 9 <link rel="import" href="../prefs/prefs.html"> |
10 <link rel="import" href="../route.html"> | 10 <link rel="import" href="../route.html"> |
11 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 11 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
12 <link rel="import" href="../settings_page/settings_subpage.html"> | 12 <link rel="import" href="../settings_page/settings_subpage.html"> |
13 <link rel="import" href="../settings_shared_css.html"> | 13 <link rel="import" href="../settings_shared_css.html"> |
| 14 <link rel="import" href="internet_config.html"> |
14 <link rel="import" href="internet_detail_page.html"> | 15 <link rel="import" href="internet_detail_page.html"> |
15 <link rel="import" href="internet_known_networks_page.html"> | 16 <link rel="import" href="internet_known_networks_page.html"> |
16 <link rel="import" href="internet_subpage.html"> | 17 <link rel="import" href="internet_subpage.html"> |
17 <link rel="import" href="network_summary.html"> | 18 <link rel="import" href="network_summary.html"> |
18 | 19 |
19 <dom-module id="settings-internet-page"> | 20 <dom-module id="settings-internet-page"> |
20 <template> | 21 <template> |
21 <style include="settings-shared"> | 22 <style include="settings-shared"> |
22 iron-icon { | 23 iron-icon { |
23 -webkit-margin-end: 12px; | 24 -webkit-margin-end: 12px; |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 </template> | 74 </template> |
74 </template> | 75 </template> |
75 <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]"> | 76 <template is="dom-if" if="[[!allowAddConnection_(globalPolicy_)]]"> |
76 <div class="settings-box"> | 77 <div class="settings-box"> |
77 <iron-icon class="policy" icon="cr20:domain"></iron-icon> | 78 <iron-icon class="policy" icon="cr20:domain"></iron-icon> |
78 <div>$i18n{internetAddConnectionNotAllowed}</div> | 79 <div>$i18n{internetAddConnectionNotAllowed}</div> |
79 </div> | 80 </div> |
80 </template> | 81 </template> |
81 </neon-animatable> | 82 </neon-animatable> |
82 | 83 |
| 84 <template is="dom-if" route-path="/networkConfig" no-search> |
| 85 <settings-subpage page-title="$i18n{internetConfigTitle}"> |
| 86 <settings-internet-config networking-private="[[networkingPrivate]]"> |
| 87 </settings-internet-config> |
| 88 </settings-subpage> |
| 89 </template> |
| 90 |
83 <template is="dom-if" route-path="/networkDetail" no-search> | 91 <template is="dom-if" route-path="/networkDetail" no-search> |
84 <settings-subpage page-title="$i18n{internetDetailPageTitle}"> | 92 <settings-subpage page-title="$i18n{internetDetailPageTitle}"> |
85 <settings-internet-detail-page prefs="{{prefs}}" | 93 <settings-internet-detail-page prefs="{{prefs}}" |
86 default-network="[[defaultNetwork]]" | 94 default-network="[[defaultNetwork]]" |
87 global-policy="[[globalPolicy_]]" | 95 global-policy="[[globalPolicy_]]" |
88 networking-private="[[networkingPrivate]]"> | 96 networking-private="[[networkingPrivate]]"> |
89 </settings-internet-detail-page> | 97 </settings-internet-detail-page> |
90 </settings-subpage> | 98 </settings-subpage> |
91 </template> | 99 </template> |
92 | 100 |
(...skipping 17 matching lines...) Expand all Loading... |
110 networking-private="[[networkingPrivate]]" | 118 networking-private="[[networkingPrivate]]" |
111 show-spinner="{{showSpinner_}}"> | 119 show-spinner="{{showSpinner_}}"> |
112 </settings-bluetooth-subpage> | 120 </settings-bluetooth-subpage> |
113 </settings-subpage> | 121 </settings-subpage> |
114 </template> | 122 </template> |
115 | 123 |
116 </settings-animated-pages> | 124 </settings-animated-pages> |
117 </template> | 125 </template> |
118 <script src="internet_page.js"></script> | 126 <script src="internet_page.js"></script> |
119 </dom-module> | 127 </dom-module> |
OLD | NEW |