OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
6 <link rel="import" href="../i18n_setup.html"> | 6 <link rel="import" href="../i18n_setup.html"> |
7 <link rel="import" href="clear_browsing_data_browser_proxy.html"> | 7 <link rel="import" href="clear_browsing_data_browser_proxy.html"> |
8 <link rel="import" href="history_deletion_dialog.html"> | 8 <link rel="import" href="history_deletion_dialog.html"> |
9 <link rel="import" href="../controls/important_site_checkbox.html"> | |
9 <link rel="import" href="../controls/settings_checkbox.html"> | 10 <link rel="import" href="../controls/settings_checkbox.html"> |
10 <link rel="import" href="../controls/settings_dropdown_menu.html"> | 11 <link rel="import" href="../controls/settings_dropdown_menu.html"> |
11 <link rel="import" href="../icons.html"> | 12 <link rel="import" href="../icons.html"> |
12 <link rel="import" href="../settings_shared_css.html"> | 13 <link rel="import" href="../settings_shared_css.html"> |
13 | 14 |
14 <dom-module id="settings-clear-browsing-data-dialog"> | 15 <dom-module id="settings-clear-browsing-data-dialog"> |
15 <template> | 16 <template> |
16 <style include="settings-shared"> | 17 <style include="settings-shared"> |
17 #dialog:not(.fully-rendered) { | 18 #dialog:not(.fully-rendered) { |
18 visibility: hidden; | 19 visibility: hidden; |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
72 } | 73 } |
73 | 74 |
74 .clear-browsing-data-footer a { | 75 .clear-browsing-data-footer a { |
75 text-decoration: none; | 76 text-decoration: none; |
76 } | 77 } |
77 | 78 |
78 #clearFrom { | 79 #clearFrom { |
79 -webkit-margin-start: 0.5em; | 80 -webkit-margin-start: 0.5em; |
80 } | 81 } |
81 | 82 |
83 .title .secondary { | |
84 font-size: 86.67%; /* (13px / 15px) * 100 */ | |
dschuyler
2017/04/11 23:49:32
nit: two spaces between the ; and the /*
dullweber
2017/04/13 14:47:49
Done.
| |
85 padding-top: 8px; | |
86 } | |
87 | |
82 /* Cap the height on smaller screens to avoid unfavorable clipping. | 88 /* Cap the height on smaller screens to avoid unfavorable clipping. |
83 * Replace the bottom margin with padding to avoid the gap between | 89 * Replace the bottom margin with padding to avoid the gap between |
84 * the scrollbar and the bottom separator. */ | 90 * the scrollbar and the bottom separator. */ |
85 @media all and (max-height: 724px) { | 91 @media all and (max-height: 724px) { |
86 #dialog { | 92 #dialog { |
87 /* crbug.com/652027: Show four and a *half* items in the list. */ | 93 /* crbug.com/652027: Show four and a *half* items in the list. */ |
88 --cr-dialog-body-container: { | 94 --cr-dialog-body-container: { |
89 max-height: 280px; | 95 max-height: 280px; |
90 }; | 96 }; |
91 } | 97 } |
92 } | 98 } |
93 </style> | 99 </style> |
94 | 100 |
95 <dialog is="cr-dialog" id="dialog" close-text="$i18n{close}" | 101 <dialog is="cr-dialog" id="dialog" close-text="$i18n{close}" |
96 show-scroll-borders ignore-popstate> | 102 show-scroll-borders ignore-popstate> |
97 <div class="title">$i18n{clearBrowsingData}</div> | 103 <div class="title"> |
98 <div class="body"> | 104 $i18n{clearBrowsingData} |
105 <div class="secondary" | |
106 hidden$="[[!isImportantSitesDialog_(dialogState_)]]"> | |
107 $i18n{importantSitesSubtitle} | |
108 </div> | |
109 </div> | |
110 <div class="body" hidden$="[[!isClearBrowsingDataDialog_(dialogState_)]]"> | |
dschuyler
2017/04/11 23:49:32
This looks like it is changing quite a bit of the
dullweber
2017/04/13 14:47:49
I build the dialog similar to the bluetooth_device
| |
99 <div class="row"> | 111 <div class="row"> |
100 $i18n{clearFollowingItemsFrom} | 112 $i18n{clearFollowingItemsFrom} |
101 <settings-dropdown-menu id="clearFrom" | 113 <settings-dropdown-menu id="clearFrom" |
102 pref="{{prefs.browser.clear_data.time_period}}" | 114 pref="{{prefs.browser.clear_data.time_period}}" |
103 menu-options="[[clearFromOptions_]]"> | 115 menu-options="[[clearFromOptions_]]"> |
104 </settings-dropdown-menu> | 116 </settings-dropdown-menu> |
105 </div> | 117 </div> |
106 <settings-checkbox id="browsingCheckbox" | 118 <settings-checkbox id="browsingCheckbox" |
107 pref="{{prefs.browser.clear_data.browsing_history}}" | 119 pref="{{prefs.browser.clear_data.browsing_history}}" |
108 label="$i18n{clearBrowsingHistory}" | 120 label="$i18n{clearBrowsingHistory}" |
109 sub-label="[[counters_.browsing_history]]" | 121 sub-label="[[counters_.browsing_history]]" |
110 disabled="[[clearingInProgress_]]"> | 122 disabled="[[clearingInProgress_]]"> |
111 </settings-checkbox> | 123 </settings-checkbox> |
112 <settings-checkbox id="downloadCheckbox" | 124 <settings-checkbox id="downloadCheckbox" |
113 pref="{{prefs.browser.clear_data.download_history}}" | 125 pref="{{prefs.browser.clear_data.download_history}}" |
114 label="$i18n{clearDownloadHistory}" | 126 label="$i18n{clearDownloadHistory}" |
115 sub-label="[[counters_.download_history]]" | 127 sub-label="[[counters_.download_history]]" |
116 disabled="[[clearingInProgress_]]"> | 128 disabled="[[clearingInProgress_]]"> |
117 </settings-checkbox> | 129 </settings-checkbox> |
118 <settings-checkbox | 130 <settings-checkbox id="cacheCheckbox" |
119 pref="{{prefs.browser.clear_data.cache}}" | 131 pref="{{prefs.browser.clear_data.cache}}" |
120 label="$i18n{clearCache}" | 132 label="$i18n{clearCache}" |
121 sub-label="[[counters_.cache]]" | 133 sub-label="[[counters_.cache]]" |
122 disabled="[[clearingInProgress_]]"> | 134 disabled="[[clearingInProgress_]]"> |
123 </settings-checkbox> | 135 </settings-checkbox> |
124 <settings-checkbox | 136 <settings-checkbox id="cookiesCheckbox" |
125 pref="{{prefs.browser.clear_data.cookies}}" | 137 pref="{{prefs.browser.clear_data.cookies}}" |
126 label="$i18n{clearCookies}" | 138 label="$i18n{clearCookies}" |
127 sub-label="$i18n{clearCookiesCounter}" | 139 sub-label="$i18n{clearCookiesCounter}" |
128 disabled="[[clearingInProgress_]]"> | 140 disabled="[[clearingInProgress_]]"> |
129 </settings-checkbox> | 141 </settings-checkbox> |
130 <settings-checkbox | 142 <settings-checkbox |
131 pref="{{prefs.browser.clear_data.passwords}}" | 143 pref="{{prefs.browser.clear_data.passwords}}" |
132 label="$i18n{clearPasswords}" | 144 label="$i18n{clearPasswords}" |
133 sub-label="[[counters_.passwords]]" | 145 sub-label="[[counters_.passwords]]" |
134 disabled="[[clearingInProgress_]]"> | 146 disabled="[[clearingInProgress_]]"> |
(...skipping 10 matching lines...) Expand all Loading... | |
145 sub-label="[[counters_.hosted_apps_data]]" | 157 sub-label="[[counters_.hosted_apps_data]]" |
146 disabled="[[clearingInProgress_]]"> | 158 disabled="[[clearingInProgress_]]"> |
147 </settings-checkbox> | 159 </settings-checkbox> |
148 <settings-checkbox | 160 <settings-checkbox |
149 pref="{{prefs.browser.clear_data.media_licenses}}" | 161 pref="{{prefs.browser.clear_data.media_licenses}}" |
150 label="$i18n{clearMediaLicenses}" | 162 label="$i18n{clearMediaLicenses}" |
151 sub-label="[[counters_.media_licenses]]" | 163 sub-label="[[counters_.media_licenses]]" |
152 disabled="[[clearingInProgress_]]"> | 164 disabled="[[clearingInProgress_]]"> |
153 </settings-checkbox> | 165 </settings-checkbox> |
154 </div> | 166 </div> |
167 <template is="dom-if" if="[[isImportantSitesDialog_(dialogState_)]]"> | |
168 <div class="body"> | |
169 <template is="dom-repeat" items="[[importantSites_]]"> | |
170 <div class="row"> | |
171 <important-site-checkbox | |
172 site="[[item]]" | |
173 disabled="[[clearingInProgress_]]"> | |
174 </important-site-checkbox> | |
175 </div> | |
176 </template> | |
177 </div> | |
178 </template> | |
155 <div class="button-container"> | 179 <div class="button-container"> |
156 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner> | 180 <paper-spinner active="[[clearingInProgress_]]"></paper-spinner> |
157 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]" | 181 <paper-button class="cancel-button" disabled="[[clearingInProgress_]]" |
158 on-tap="onCancelTap_">$i18n{cancel}</paper-button> | 182 on-tap="onCancelTap_">$i18n{cancel}</paper-button> |
159 <paper-button class="action-button" disabled="[[clearingInProgress_]]" | 183 <paper-button class="action-button" disabled="[[clearingInProgress_]]" |
160 on-tap="onClearBrowsingDataTap_"> | 184 on-tap="onClearBrowsingDataTap_"> |
161 $i18n{clearBrowsingData} | 185 <template is="dom-if" |
186 if="[[isClearBrowsingDataDialog_(dialogState_)]]"> | |
187 $i18n{clearBrowsingData} | |
188 </template> | |
189 <template is="dom-if" if="[[isImportantSitesDialog_(dialogState_)]]"> | |
190 $i18n{importantSitesConfirm} | |
191 </template> | |
162 </paper-button> | 192 </paper-button> |
163 </div> | 193 </div> |
164 <div class="footer"> | 194 <div class="footer" |
195 hidden$="[[!isClearBrowsingDataDialog_(dialogState_)]]"> | |
165 <div id="googleFooter" class="clear-browsing-data-footer"> | 196 <div id="googleFooter" class="clear-browsing-data-footer"> |
166 <iron-icon icon="settings:googleg"></iron-icon> | 197 <iron-icon icon="settings:googleg"></iron-icon> |
167 <div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div> | 198 <div class="footer-text">$i18nRaw{otherFormsOfBrowsingHistory}</div> |
168 </div> | 199 </div> |
169 <div id="generalFooter" class="clear-browsing-data-footer"> | 200 <div id="generalFooter" class="clear-browsing-data-footer"> |
170 <iron-icon icon="settings:info"></iron-icon> | 201 <iron-icon icon="settings:info"></iron-icon> |
171 <div class="footer-text"> | 202 <div class="footer-text"> |
172 <span id="syncedDataSentence">$i18n{clearsSyncedData}</span> | 203 <span id="syncedDataSentence">$i18n{clearsSyncedData}</span> |
173 <span>$i18n{warnAboutNonClearedData}</span> | 204 <span>$i18n{warnAboutNonClearedData}</span> |
174 <a id="clear-browser-data-old-learn-more-link" | 205 <a id="clear-browser-data-old-learn-more-link" |
175 href="$i18n{clearBrowsingDataLearnMoreUrl}" | 206 href="$i18n{clearBrowsingDataLearnMoreUrl}" |
176 target="_blank">$i18n{learnMore}</a> | 207 target="_blank">$i18n{learnMore}</a> |
177 </div> | 208 </div> |
178 </div> | 209 </div> |
179 </div> | 210 </div> |
180 </dialog> | 211 </dialog> |
181 | 212 |
182 <template is="dom-if" if="[[showHistoryDeletionDialog_]]" restamp> | 213 <template is="dom-if" if="[[showHistoryDeletionDialog_]]" restamp> |
183 <settings-history-deletion-dialog id="notice" | 214 <settings-history-deletion-dialog id="notice" |
184 on-close="onHistoryDeletionDialogClose_"> | 215 on-close="onHistoryDeletionDialogClose_"> |
185 </settings-history-deletion-dialog> | 216 </settings-history-deletion-dialog> |
186 </template> | 217 </template> |
187 </template> | 218 </template> |
188 <script src="clear_browsing_data_dialog.js"></script> | 219 <script src="clear_browsing_data_dialog.js"></script> |
189 </dom-module> | 220 </dom-module> |
OLD | NEW |