Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: chrome/browser/resources/settings/languages_page/languages_page.html

Issue 2402553002: MD Settings: Implementing modal popup/action menus. (Closed)
Patch Set: Address comments. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/assert.html"> 1 <link rel="import" href="chrome://resources/html/assert.html">
2 <link rel="import" href="chrome://resources/html/cr.html"> 2 <link rel="import" href="chrome://resources/html/cr.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
8 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 8 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
9 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_r ender.html"> 9 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_r ender.html">
10 <link rel="import" href="chrome://resources/cr_elements/cr_shared_menu/cr_shared _menu.html">
11 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 10 <link rel="import" href="chrome://resources/cr_elements/icons.html">
12 <link rel="import" href="/languages_page/add_languages_dialog.html"> 11 <link rel="import" href="/languages_page/add_languages_dialog.html">
13 <link rel="import" href="/languages_page/languages.html"> 12 <link rel="import" href="/languages_page/languages.html">
14 <link rel="import" href="/lifetime_browser_proxy.html"> 13 <link rel="import" href="/lifetime_browser_proxy.html">
15 <link rel="import" href="/route.html"> 14 <link rel="import" href="/route.html">
16 <link rel="import" href="/settings_page/settings_animated_pages.html"> 15 <link rel="import" href="/settings_page/settings_animated_pages.html">
17 <link rel="import" href="/settings_page/settings_subpage.html"> 16 <link rel="import" href="/settings_page/settings_subpage.html">
18 <link rel="import" href="/settings_shared_css.html"> 17 <link rel="import" href="/settings_shared_css.html">
18 <link rel="import" href="/settings_action_menu.html">
Dan Beam 2016/10/13 05:03:01 alpha
dpapad 2016/10/13 18:18:00 Done.
19 19
20 <if expr="not is_macosx"> 20 <if expr="not is_macosx">
21 <link rel="import" href="edit_dictionary_page.html"> 21 <link rel="import" href="edit_dictionary_page.html">
22 </if> 22 </if>
23 23
24 <if expr="chromeos"> 24 <if expr="chromeos">
25 <link rel="import" href="chrome://resources/html/chromeos/ui_account_tweaks.html "> 25 <link rel="import" href="chrome://resources/html/chromeos/ui_account_tweaks.html ">
26 <link rel="import" href="/languages_page/manage_input_methods_page.html"> 26 <link rel="import" href="/languages_page/manage_input_methods_page.html">
27 </if> 27 </if>
28 28
29 <dom-module id="settings-languages-page"> 29 <dom-module id="settings-languages-page">
30 <template> 30 <template>
31 <style include="settings-shared"> 31 <style include="settings-shared">
32 #languagesCollapse .list-item.selected { 32 #languagesCollapse .list-item.selected {
33 min-height: var(--settings-row-two-line-min-height); 33 min-height: var(--settings-row-two-line-min-height);
34 } 34 }
35 35
36 .explain-selected { 36 .explain-selected {
37 color: var(--google-green-700); 37 color: var(--google-green-700);
38 font-weight: initial; 38 font-weight: initial;
39 margin-top: 4px; 39 margin-top: 4px;
40 } 40 }
41 41
42 cr-shared-menu { 42 dialog[is='settings-action-menu'].complex .dropdown-item {
43 --cr-shared-menu-width: 320px;
44 }
45
46 cr-shared-menu.complex .dropdown-item {
47 min-height: 36px; 43 min-height: 36px;
48 } 44 }
49 45
50 cr-shared-menu:not(.complex) hr { 46 dialog[is='settings-action-menu']:not(.complex) hr {
51 display: none; 47 display: none;
52 } 48 }
53 49
54 cr-shared-menu.complex hr { 50 dialog[is='settings-action-menu'].complex hr {
55 /* Override user-agent border and margin. */ 51 /* Override user-agent border and margin. */
56 border: none; 52 border: none;
57 /* TODO(michaelpg): Update to whatever variable is used for the darker, 53 /* TODO(michaelpg): Update to whatever variable is used for the darker,
58 * full-width separators: crbug.com/649547. */ 54 * full-width separators: crbug.com/649547. */
59 border-top: var(--settings-separator-line); 55 border-top: var(--settings-separator-line);
60 margin: 6px 0 0 0; 56 margin: 6px 0 0 0;
61 } 57 }
62 58
63 paper-checkbox.dropdown-item { 59 paper-checkbox.dropdown-item {
64 --checkbox-margin-start: 0; 60 --checkbox-margin-start: 0;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 </div> 104 </div>
109 <if expr="chromeos or is_win"> 105 <if expr="chromeos or is_win">
110 <template is="dom-if" if="[[isRestartRequired_( 106 <template is="dom-if" if="[[isRestartRequired_(
111 item.language.code, prefs.intl.app_locale.value)]]"> 107 item.language.code, prefs.intl.app_locale.value)]]">
112 <paper-button on-tap="onRestartTap_"> 108 <paper-button on-tap="onRestartTap_">
113 $i18n{restart} 109 $i18n{restart}
114 </paper-button> 110 </paper-button>
115 </template> 111 </template>
116 </if> 112 </if>
117 <paper-icon-button id="more-[[item.language.code]]" 113 <paper-icon-button id="more-[[item.language.code]]"
118 icon="cr:more-vert" on-tap="toggleMenu_"> 114 icon="cr:more-vert" on-tap="onDotsTap_">
119 </paper-icon-button> 115 </paper-icon-button>
120 </div> 116 </div>
121 </template> 117 </template>
122 <div class="list-item list-button" on-tap="onAddLanguagesTap_"> 118 <div class="list-item list-button" on-tap="onAddLanguagesTap_">
123 $i18n{addLanguages} 119 $i18n{addLanguages}
124 </div> 120 </div>
125 </div> 121 </div>
126 </iron-collapse> 122 </iron-collapse>
127 <if expr="chromeos"> 123 <if expr="chromeos">
128 <div id="manage-input-methods-subpage-trigger" 124 <div id="manage-input-methods-subpage-trigger"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 </paper-checkbox> 186 </paper-checkbox>
191 </label> 187 </label>
192 </template> 188 </template>
193 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> 189 <div class="list-item list-button" on-tap="onEditDictionaryTap_">
194 $i18n{manageSpellCheck} 190 $i18n{manageSpellCheck}
195 </div> 191 </div>
196 </div> 192 </div>
197 </iron-collapse> 193 </iron-collapse>
198 </if> 194 </if>
199 <template is="cr-lazy-render" id="menu"> 195 <template is="cr-lazy-render" id="menu">
200 <cr-shared-menu 196 <dialog is="settings-action-menu"
201 class$="[[getMenuClass_(prefs.translate.enabled.value)]]"> 197 class$="[[getMenuClass_(prefs.translate.enabled.value)]]">
202 <if expr="chromeos or is_win"> 198 <if expr="chromeos or is_win">
203 <paper-checkbox id="uiLanguageItem" class="dropdown-item" 199 <paper-checkbox id="uiLanguageItem" class="dropdown-item"
204 checked="[[isProspectiveUILanguage_( 200 checked="[[isProspectiveUILanguage_(
205 detailLanguage_.language.code, 201 detailLanguage_.language.code,
206 prefs.intl.app_locale.value)]]" 202 prefs.intl.app_locale.value)]]"
207 on-change="onUILanguageChange_" 203 on-change="onUILanguageChange_"
208 disabled="[[disableUILanguageCheckbox_( 204 disabled="[[disableUILanguageCheckbox_(
209 detailLanguage_, prefs.intl.app_locale.value)]]"> 205 detailLanguage_, prefs.intl.app_locale.value)]]">
210 $i18n{displayInThisLanguage} 206 $i18n{displayInThisLanguage}
(...skipping 24 matching lines...) Expand all
235 on-tap="onMoveDownTap_" 231 on-tap="onMoveDownTap_"
236 hidden="[[isLastLanguage_( 232 hidden="[[isLastLanguage_(
237 detailLanguage_, languages.enabled.*)]]"> 233 detailLanguage_, languages.enabled.*)]]">
238 $i18n{moveDown} 234 $i18n{moveDown}
239 </button> 235 </button>
240 <button class="dropdown-item" role="menuitem" 236 <button class="dropdown-item" role="menuitem"
241 on-tap="onRemoveLanguageTap_" 237 on-tap="onRemoveLanguageTap_"
242 hidden="[[!detailLanguage_.removable]]"> 238 hidden="[[!detailLanguage_.removable]]">
243 $i18n{removeLanguage} 239 $i18n{removeLanguage}
244 </button> 240 </button>
245 </cr-shared-menu> 241 </dialog>
246 </template> 242 </template>
247 </neon-animatable> 243 </neon-animatable>
248 <if expr="chromeos"> 244 <if expr="chromeos">
249 <template is="dom-if" route-path="/inputMethods"> 245 <template is="dom-if" route-path="/inputMethods">
250 <settings-subpage 246 <settings-subpage
251 associated-control="[[$$('#manage-input-methods-subpage-trigger')]]" 247 associated-control="[[$$('#manage-input-methods-subpage-trigger')]]"
252 page-title="$i18n{manageInputMethodsPageTitle}"> 248 page-title="$i18n{manageInputMethodsPageTitle}">
253 <settings-manage-input-methods-page languages="{{languages}}" 249 <settings-manage-input-methods-page languages="{{languages}}"
254 language-helper="[[languageHelper]]"> 250 language-helper="[[languageHelper]]">
255 </settings-manage-input-methods-page> 251 </settings-manage-input-methods-page>
(...skipping 11 matching lines...) Expand all
267 </if> 263 </if>
268 </settings-animated-pages> 264 </settings-animated-pages>
269 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp> 265 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp>
270 <settings-add-languages-dialog languages="{{languages}}" 266 <settings-add-languages-dialog languages="{{languages}}"
271 language-helper="[[languageHelper]]"> 267 language-helper="[[languageHelper]]">
272 </settings-add-languages-dialog> 268 </settings-add-languages-dialog>
273 </template> 269 </template>
274 </template> 270 </template>
275 <script src="languages_page.js"></script> 271 <script src="languages_page.js"></script>
276 </dom-module> 272 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698