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

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

Issue 2277633003: Use one instance of language settings detail menu for all languages (Closed)
Patch Set: Fix test Created 4 years, 3 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/iron-icon/iron-icon.htm l"> 5 <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/neon-animation/neon-ani matable.html"> 6 <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/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/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
9 <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_expand_button/cr_expa nd_button.html">
10 <link rel="import" href="chrome://resources/cr_elements/cr_shared_menu/cr_shared _menu.html">
10 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 11 <link rel="import" href="chrome://resources/cr_elements/icons.html">
11 <link rel="import" href="/icons.html"> 12 <link rel="import" href="/icons.html">
12 <link rel="import" href="/route.html"> 13 <link rel="import" href="/route.html">
13 <link rel="import" href="/settings_page/settings_animated_pages.html"> 14 <link rel="import" href="/settings_page/settings_animated_pages.html">
14 <link rel="import" href="/settings_page/settings_subpage.html"> 15 <link rel="import" href="/settings_page/settings_subpage.html">
15 <link rel="import" href="/settings_shared_css.html"> 16 <link rel="import" href="/settings_shared_css.html">
16 <link rel="import" href="add_languages_dialog.html"> 17 <link rel="import" href="add_languages_dialog.html">
17 <link rel="import" href="language_detail_page.html"> 18 <link rel="import" href="language_detail_page.html">
18 <link rel="import" href="languages.html"> 19 <link rel="import" href="languages.html">
19 20
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 [[item.language.displayName]] 73 [[item.language.displayName]]
73 </div> 74 </div>
74 <div class="middle"> 75 <div class="middle">
75 <iron-icon icon="settings:done" 76 <iron-icon icon="settings:done"
76 hidden$="[[!isProspectiveUILanguage_( 77 hidden$="[[!isProspectiveUILanguage_(
77 item.language.code, prefs.intl.app_locale.value)]]"> 78 item.language.code, prefs.intl.app_locale.value)]]">
78 </iron-icon> 79 </iron-icon>
79 </div> 80 </div>
80 </if> 81 </if>
81 <paper-icon-button id="more-[[item.language.code]]" 82 <paper-icon-button id="more-[[item.language.code]]"
82 icon="cr:more-vert" toggles 83 icon="cr:more-vert" on-tap="toggleMenu_">
83 active="{{item.optionsMenuOpened}}"
84 on-tap="stopPropagationHandler_">
85 </paper-icon-button> 84 </paper-icon-button>
86 <iron-dropdown opened="{{item.optionsMenuOpened}}"
87 horizontal-align="right" vertical-align="auto">
88 <div class="dropdown-content"
89 on-tap="stopPropagationHandler_">
90 <button class="dropdown-item" role="option"
91 on-tap="onMoveUpTap_"
92 hidden="[[isFirstLanguage_(index,
93 languages.enabled.*)]]">
94 $i18n{moveUp}
95 </button>
96 <button class="dropdown-item" role="option"
97 on-tap="onMoveDownTap_"
98 hidden="[[isLastLanguage_(index,
99 languages.enabled.*)]]">
100 $i18n{moveDown}
101 </button>
102 <button class="dropdown-item" role="option"
103 on-tap="onShowLanguageDetailTap_">
104 $i18n{languageDetail}
105 </button>
106 <button class="dropdown-item" role="option"
107 on-tap="onRemoveLanguageTap_"
108 disabled="[[!item.removable]]">
109 $i18n{removeLanguage}
110 </button>
111 </div>
112 </iron-dropdown>
113 </div> 85 </div>
114 </template> 86 </template>
115 <div class="list-item list-button" on-tap="onAddLanguagesTap_"> 87 <div class="list-item list-button" on-tap="onAddLanguagesTap_">
116 $i18n{addLanguages} 88 $i18n{addLanguages}
117 </div> 89 </div>
118 </div> 90 </div>
119 </iron-collapse> 91 </iron-collapse>
120 <if expr="chromeos"> 92 <if expr="chromeos">
121 <div id="manage-input-methods-subpage-trigger" 93 <div id="manage-input-methods-subpage-trigger"
122 class="settings-box two-line"> 94 class="settings-box two-line">
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 "supportsSpellCheckLabel-[[item.language.code]]"> 158 "supportsSpellCheckLabel-[[item.language.code]]">
187 </paper-toggle-button> 159 </paper-toggle-button>
188 </label> 160 </label>
189 </template> 161 </template>
190 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> 162 <div class="list-item list-button" on-tap="onEditDictionaryTap_">
191 $i18n{manageSpellCheck} 163 $i18n{manageSpellCheck}
192 </div> 164 </div>
193 </div> 165 </div>
194 </iron-collapse> 166 </iron-collapse>
195 </if> 167 </if>
168 <template is="dom-if" id="menuTemplate">
169 <cr-shared-menu>
170 <button class="dropdown-item" role="menuitem"
171 on-tap="onMoveUpTap_"
172 hidden="[[isFirstLanguage_(
173 detailLanguage_, languages.enabled.*)]]">
174 $i18n{moveUp}
175 </button>
176 <button class="dropdown-item" role="menuitem"
177 on-tap="onMoveDownTap_"
178 hidden="[[isLastLanguage_(
179 detailLanguage_, languages.enabled.*)]]">
180 $i18n{moveDown}
181 </button>
182 <button class="dropdown-item" role="menuitem"
183 on-tap="onShowLanguageDetailTap_">
184 $i18n{languageDetail}
185 </button>
186 <button class="dropdown-item" role="menuitem"
187 on-tap="onRemoveLanguageTap_"
188 disabled="[[!detailLanguage_.removable]]">
189 $i18n{removeLanguage}
190 </button>
191 </cr-shared-menu>
192 </template>
196 </neon-animatable> 193 </neon-animatable>
197 <template is="dom-if" route-path="/languages/edit" no-search> 194 <template is="dom-if" route-path="/languages/edit" no-search>
198 <settings-subpage page-title="[[detailLanguage_.language.displayName]]"> 195 <settings-subpage page-title="[[detailLanguage_.language.displayName]]">
199 <settings-language-detail-page id="languageDetailPage" 196 <settings-language-detail-page id="languageDetailPage"
200 languages="{{languages}}" prefs="{{prefs}}" 197 languages="{{languages}}" prefs="{{prefs}}"
201 detail="[[detailLanguage_]]" language-helper="[[languageHelper]]"> 198 detail="[[detailLanguage_]]" language-helper="[[languageHelper]]">
202 </settings-language-detail-page> 199 </settings-language-detail-page>
203 </settings-subpage> 200 </settings-subpage>
204 </template> 201 </template>
205 <if expr="chromeos"> 202 <if expr="chromeos">
(...skipping 18 matching lines...) Expand all
224 </if> 221 </if>
225 </settings-animated-pages> 222 </settings-animated-pages>
226 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp> 223 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp>
227 <settings-add-languages-dialog languages="{{languages}}" 224 <settings-add-languages-dialog languages="{{languages}}"
228 language-helper="[[languageHelper]]"> 225 language-helper="[[languageHelper]]">
229 </settings-add-languages-dialog> 226 </settings-add-languages-dialog>
230 </template> 227 </template>
231 </template> 228 </template>
232 <script src="languages_page.js"></script> 229 <script src="languages_page.js"></script>
233 </dom-module> 230 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698