OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 <link rel="import" href="/a11y_page/a11y_page.html"> | |
2 <link rel="import" href="/appearance_page/appearance_page.html"> | 3 <link rel="import" href="/appearance_page/appearance_page.html"> |
4 <link rel="import" href="/downloads_page/downloads_page.html"> | |
5 <link rel="import" href="/languages_page/languages_page.html"> | |
6 <link rel="import" href="/on_startup_page/on_startup_page.html"> | |
7 <link rel="import" href="/passwords_and_forms_page/passwords_and_forms_page.html "> | |
8 <link rel="import" href="/people_page/people_page.html"> | |
9 <link rel="import" href="/printing_page/printing_page.html"> | |
10 <link rel="import" href="/privacy_page/privacy_page.html"> | |
11 <link rel="import" href="/reset_page/reset_page.html"> | |
12 <link rel="import" href="/reset_page/reset_profile_banner.html"> | |
dpapad
2016/11/28 20:04:44
I am realizing that all those new HTML imports wil
michaelpg
2016/12/02 01:51:44
I'm not sure I understand/agree. Before this merge
| |
3 <link rel="import" href="/search_page/search_page.html"> | 13 <link rel="import" href="/search_page/search_page.html"> |
4 <link rel="import" href="/settings_page/main_page_behavior.html"> | 14 <link rel="import" href="/settings_page/main_page_behavior.html"> |
5 <link rel="import" href="/settings_page/settings_page_visibility.html"> | 15 <link rel="import" href="/settings_page/settings_page_visibility.html"> |
6 <link rel="import" href="/settings_page/settings_section.html"> | 16 <link rel="import" href="/settings_page/settings_section.html"> |
7 <link rel="import" href="/on_startup_page/on_startup_page.html"> | |
8 <link rel="import" href="/people_page/people_page.html"> | |
9 <link rel="import" href="/reset_page/reset_profile_banner.html"> | |
10 <link rel="import" href="/settings_page_css.html"> | 17 <link rel="import" href="/settings_page_css.html"> |
11 | 18 <link rel="import" href="/settings_vars_css.html"> |
12 <if expr="chromeos"> | 19 |
20 <if expr="chromeos"> | |
21 <link rel="import" href="/bluetooth_page/bluetooth_page.html"> | |
22 <link rel="import" href="/date_time_page/date_time_page.html"> | |
13 <link rel="import" href="/device_page/device_page.html"> | 23 <link rel="import" href="/device_page/device_page.html"> |
14 <link rel="import" href="/internet_page/internet_page.html"> | 24 <link rel="import" href="/internet_page/internet_page.html"> |
15 </if> | 25 </if> |
16 | 26 |
17 <if expr="not chromeos"> | 27 <if expr="not chromeos"> |
18 <link rel="import" href="/default_browser_page/default_browser_page.html"> | 28 <link rel="import" href="/default_browser_page/default_browser_page.html"> |
19 </if> | 29 <link rel="import" href="/system_page/system_page.html"> |
20 | 30 </if> |
31 | |
32 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page | |
33 includes both the basic and advanced settings. --> | |
21 <dom-module id="settings-basic-page"> | 34 <dom-module id="settings-basic-page"> |
22 <template> | 35 <template> |
23 <style include="settings-page-styles"></style> | 36 <style include="settings-page-styles"> |
24 <div> | 37 #advancedToggle { |
25 <template is="dom-if" if="[[showResetProfileBanner_]]"> | 38 --paper-button: { |
26 <settings-reset-profile-banner on-reset-done="onResetDone_"> | 39 text-transform: none; |
27 </settings-reset-profile-banner> | 40 } |
41 @apply(--settings-actionable); | |
42 align-items: center; | |
43 display: flex; | |
44 margin-bottom: 3px; | |
45 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ | |
46 min-height: 32px; | |
47 padding: 0 12px; | |
48 } | |
49 | |
50 #toggleContainer { | |
51 align-items: center; | |
52 display: flex; | |
53 font: inherit; | |
54 justify-content: center; | |
55 margin-bottom: 0; | |
56 margin-top: 0; | |
57 } | |
58 | |
59 #toggleSpacer { | |
60 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ | |
61 } | |
62 | |
63 iron-icon { | |
64 -webkit-margin-start: 16px; | |
65 } | |
66 </style> | |
67 <template is="dom-if" if="[[showBasicPage_( | |
68 currentRoute_, inSearchMode, hasExpandedSection_)]]"> | |
69 <div id="basicPage"> | |
70 <template is="dom-if" if="[[showResetProfileBanner_]]"> | |
71 <settings-reset-profile-banner on-reset-done="onResetDone_"> | |
72 </settings-reset-profile-banner> | |
73 </template> | |
74 <if expr="chromeos"> | |
75 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" | |
76 restamp> | |
77 <settings-section page-title="$i18n{internetPageTitle}" | |
78 section="internet"> | |
79 <settings-internet-page prefs="{{prefs}}"> | |
80 </settings-internet-page> | |
81 </settings-section> | |
82 </template> | |
83 </if> | |
84 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp> | |
85 <settings-section page-title="$i18n{peoplePageTitle}" | |
86 section="people"> | |
87 <settings-people-page prefs="{{prefs}}"></settings-people-page> | |
88 </settings-section> | |
89 </template> | |
90 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" | |
91 restamp> | |
92 <settings-section page-title="$i18n{appearancePageTitle}" | |
93 section="appearance"> | |
94 <settings-appearance-page prefs="{{prefs}}" | |
95 page-visibility="[[pageVisibility.appearance]]"> | |
96 </settings-appearance-page> | |
97 </settings-section> | |
98 </template> | |
99 <if expr="chromeos"> | |
100 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp> | |
101 <settings-section page-title="$i18n{devicePageTitle}" section="device" > | |
102 <settings-device-page prefs="{{prefs}}"></settings-device-page> | |
103 </settings-section> | |
104 </template> | |
105 </if> | |
106 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> | |
107 <settings-section page-title="$i18n{searchPageTitle}" section="search" > | |
108 <settings-search-page></settings-search-page> | |
109 </settings-section> | |
110 </template> | |
111 <if expr="not chromeos"> | |
112 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]" | |
113 restamp> | |
114 <settings-section page-title="$i18n{defaultBrowser}" | |
115 section="defaultBrowser"> | |
116 <settings-default-browser-page></settings-default-browser-page> | |
117 </settings-section> | |
118 </template> | |
119 </if> | |
120 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restam p> | |
121 <settings-section page-title="$i18n{onStartup}" section="onStartup"> | |
122 <settings-on-startup-page prefs="{{prefs}}"> | |
123 </settings-on-startup-page> | |
124 </settings-section> | |
125 </template> | |
126 </div> | |
127 </template> | |
128 | |
129 <template is="dom-if" | |
130 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | |
131 <template is="dom-if" if="[[showAdvancedToggle_( | |
132 inSearchMode, hasExpandedSection_)]]"> | |
133 <div id="toggleSpacer"></div> | |
134 <h2 id="toggleContainer"> | |
135 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}" | |
136 aria-active-attribute="aria-expanded" toggles> | |
137 <span>$i18n{advancedPageTitle}</span> | |
138 <iron-icon icon="[[arrowState_(advancedToggleExpanded)]]"> | |
139 </iron-icon> | |
140 </paper-button> | |
141 </h2> | |
28 </template> | 142 </template> |
29 <if expr="chromeos"> | 143 |
30 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> | 144 <template is="dom-if" if="[[showAdvancedPage_( |
31 <settings-section page-title="$i18n{internetPageTitle}" | 145 currentRoute_, inSearchMode, hasExpandedSection_, |
32 section="internet"> | 146 advancedToggleExpanded)]]"> |
33 <settings-internet-page prefs="{{prefs}}"> | 147 <div id="advancedPage"> |
34 </settings-internet-page> | 148 <if expr="chromeos"> |
35 </settings-section> | 149 <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]" |
150 restamp> | |
151 <settings-section page-title="$i18n{dateTimePageTitle}" | |
152 section="dateTime"> | |
153 <settings-date-time-page prefs="{{prefs}}" | |
154 page-visibility="[[pageVisibility.dateTime]]"> | |
155 </settings-date-time-page> | |
156 </settings-section> | |
157 </template> | |
158 </if> | |
159 <template is="dom-if" if="[[showPage(pageVisibility.privacy)]]" | |
160 restamp> | |
161 <settings-section page-title="$i18n{privacyPageTitle}" | |
162 section="privacy"> | |
163 <settings-privacy-page prefs="{{prefs}}" | |
164 page-visibility="[[pageVisibility.privacy]]"> | |
165 </settings-privacy-page> | |
166 </settings-section> | |
167 </template> | |
168 <if expr="chromeos"> | |
169 <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]" | |
170 restamp> | |
171 <settings-section page-title="$i18n{bluetoothPageTitle}" | |
172 section="bluetooth"> | |
173 <settings-bluetooth-page prefs="{{prefs}}"> | |
174 </settings-bluetooth-page> | |
175 </settings-section> | |
176 </template> | |
177 </if> | |
178 <template is="dom-if" | |
179 if="[[showPage(pageVisibility.passwordsAndForms)]]" restamp> | |
180 <settings-section | |
181 page-title="$i18n{passwordsAndAutofillPageTitle}" | |
182 section="passwordsAndForms"> | |
183 <settings-passwords-and-forms-page prefs="{{prefs}}"> | |
184 </settings-passwords-and-forms-page> | |
185 </settings-section> | |
186 </template> | |
187 <template is="dom-if" if="[[showPage(pageVisibility.languages)]]" | |
188 restamp> | |
189 <settings-section page-title="$i18n{languagesPageTitle}" | |
190 section="languages"> | |
191 <settings-languages-page prefs="{{prefs}}"></settings-languages-pa ge> | |
192 </settings-section> | |
193 </template> | |
194 <template is="dom-if" if="[[showPage(pageVisibility.downloads)]]" | |
195 restamp> | |
196 <settings-section page-title="$i18n{downloadsPageTitle}" | |
197 section="downloads"> | |
198 <settings-downloads-page prefs="{{prefs}}" | |
199 page-visibility="[[pageVisibility.downloads]]"> | |
200 </settings-downloads-page> | |
201 </settings-section> | |
202 </template> | |
203 <template is="dom-if" if="[[showPage(pageVisibility.printing)]]" | |
204 restamp> | |
205 <settings-section page-title="$i18n{printingPageTitle}" | |
206 section="printing"> | |
207 <settings-printing-page prefs="{{prefs}}"> | |
208 </settings-printing-page> | |
209 </settings-section> | |
210 </template> | |
211 <template is="dom-if" if="[[showPage(pageVisibility.a11y)]]" restamp> | |
212 <settings-section page-title="$i18n{a11yPageTitle}" section="a11y"> | |
213 <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page> | |
214 </settings-section> | |
215 </template> | |
216 <if expr="not chromeos"> | |
217 <template is="dom-if" if="[[showPage(pageVisibility.system)]]" | |
218 restamp> | |
219 <settings-section page-title="$i18n{systemPageTitle}" | |
220 section="system"> | |
221 <settings-system-page prefs="{{prefs}}"></settings-system-page> | |
222 </settings-section> | |
223 </template> | |
224 </if> | |
225 <template is="dom-if" if="[[showPage(pageVisibility.reset)]]" | |
226 restamp> | |
227 <settings-section page-title="$i18n{resetPageTitle}" | |
228 section="reset"> | |
229 <settings-reset-page></settings-reset-page> | |
230 </settings-section> | |
231 </template> | |
232 </div> | |
36 </template> | 233 </template> |
37 </if> | 234 </template> |
38 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp> | |
39 <settings-section page-title="$i18n{peoplePageTitle}" section="people"> | |
40 <settings-people-page prefs="{{prefs}}"></settings-people-page> | |
41 </settings-section> | |
42 </template> | |
43 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" | |
44 restamp> | |
45 <settings-section page-title="$i18n{appearancePageTitle}" | |
46 section="appearance"> | |
47 <settings-appearance-page prefs="{{prefs}}" | |
48 page-visibility="[[pageVisibility.appearance]]"> | |
49 </settings-appearance-page> | |
50 </settings-section> | |
51 </template> | |
52 <if expr="chromeos"> | |
53 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp> | |
54 <settings-section page-title="$i18n{devicePageTitle}" section="device"> | |
55 <settings-device-page prefs="{{prefs}}"></settings-device-page> | |
56 </settings-section> | |
57 </template> | |
58 </if> | |
59 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> | |
60 <settings-section page-title="$i18n{searchPageTitle}" section="search"> | |
61 <settings-search-page></settings-search-page> | |
62 </settings-section> | |
63 </template> | |
64 <if expr="not chromeos"> | |
65 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]" | |
66 restamp> | |
67 <settings-section page-title="$i18n{defaultBrowser}" | |
68 section="defaultBrowser"> | |
69 <settings-default-browser-page></settings-default-browser-page> | |
70 </settings-section> | |
71 </template> | |
72 </if> | |
73 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp> | |
74 <settings-section page-title="$i18n{onStartup}" section="onStartup"> | |
75 <settings-on-startup-page prefs="{{prefs}}"> | |
76 </settings-on-startup-page> | |
77 </settings-section> | |
78 </template> | |
79 </div> | |
80 </template> | 235 </template> |
81 <script src="basic_page.js"></script> | 236 <script src="/basic_page/basic_page.js"></script> |
dpapad
2016/11/28 20:04:44
Nit: Why changing this? We don't seem to be using
michaelpg
2016/12/08 03:31:58
Reverted.
| |
82 </dom-module> | 237 </dom-module> |
OLD | NEW |