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

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

Issue 2265253002: Replace Manage Languages with dialog and dropdown item (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@EnableDisableLanguage
Patch Set: indent Created 4 years, 4 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/icons.html"> 10 <link rel="import" href="chrome://resources/cr_elements/icons.html">
11 <link rel="import" href="/icons.html"> 11 <link rel="import" href="/icons.html">
12 <link rel="import" href="/route.html"> 12 <link rel="import" href="/route.html">
13 <link rel="import" href="/settings_page/settings_animated_pages.html"> 13 <link rel="import" href="/settings_page/settings_animated_pages.html">
14 <link rel="import" href="/settings_page/settings_subpage.html"> 14 <link rel="import" href="/settings_page/settings_subpage.html">
15 <link rel="import" href="/settings_shared_css.html"> 15 <link rel="import" href="/settings_shared_css.html">
16 <link rel="import" href="add_languages_dialog.html">
16 <link rel="import" href="language_detail_page.html"> 17 <link rel="import" href="language_detail_page.html">
17 <link rel="import" href="languages.html"> 18 <link rel="import" href="languages.html">
18 <link rel="import" href="manage_languages_page.html">
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="manage_input_methods_page.html"> 25 <link rel="import" href="manage_input_methods_page.html">
26 </if> 26 </if>
27 27
28 <dom-module id="settings-languages-page"> 28 <dom-module id="settings-languages-page">
29 <template> 29 <template>
30 <style include="settings-shared"> 30 <style include="settings-shared">
31 .list-button { 31 .list-button {
32 @apply(--settings-actionable); 32 @apply(--settings-actionable);
33 } 33 }
34 </style> 34 </style>
35 <settings-languages languages="{{languages}}" prefs="{{prefs}}" 35 <settings-languages languages="{{languages}}" prefs="{{prefs}}"
36 language-helper="{{languageHelper}}"> 36 language-helper="{{languageHelper}}">
37 </settings-languages> 37 </settings-languages>
38 <settings-animated-pages id="pages" section="languages"> 38 <settings-animated-pages id="pages" section="languages">
39 <neon-animatable route-path="default"> 39 <neon-animatable route-path="default">
40 <div id="manage-languages-subpage-trigger" 40 <div class="settings-box first two-line">
41 class="settings-box first two-line">
42 <div class="start"> 41 <div class="start">
43 <div>$i18n{languagesListTitle}</div> 42 <div>$i18n{languagesListTitle}</div>
44 <div class="secondary"> 43 <div class="secondary">
45 [[getProspectiveUILanguageName_( 44 [[getProspectiveUILanguageName_(
46 languages, prefs.intl.app_locale.value)]] 45 languages, prefs.intl.app_locale.value)]]
47 </div> 46 </div>
48 </div> 47 </div>
49 <cr-expand-button expanded="{{languagesOpened_}}"> 48 <cr-expand-button expanded="{{languagesOpened_}}">
50 </cr-expand-button> 49 </cr-expand-button>
51 </div> 50 </div>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 <button class="dropdown-item" role="option" 96 <button class="dropdown-item" role="option"
98 on-tap="onMoveDownTap_" 97 on-tap="onMoveDownTap_"
99 hidden="[[isLastLanguage_(index, 98 hidden="[[isLastLanguage_(index,
100 languages.enabled.*)]]"> 99 languages.enabled.*)]]">
101 $i18n{moveDown} 100 $i18n{moveDown}
102 </button> 101 </button>
103 <button class="dropdown-item" role="option" 102 <button class="dropdown-item" role="option"
104 on-tap="onShowLanguageDetailTap_"> 103 on-tap="onShowLanguageDetailTap_">
105 $i18n{languageDetail} 104 $i18n{languageDetail}
106 </button> 105 </button>
106 <button class="dropdown-item" role="option"
107 on-tap="onRemoveLanguageTap_"
108 disabled="[[!item.removable]]">
109 $i18n{removeLanguage}
110 </button>
107 </div> 111 </div>
108 </iron-dropdown> 112 </iron-dropdown>
109 </div> 113 </div>
110 </template> 114 </template>
111 <div class="list-item list-button" on-tap="onManageLanguagesTap_"> 115 <div class="list-item list-button" on-tap="onAddLanguagesTap_">
112 $i18n{manageLanguages} 116 $i18n{addLanguages}
113 </div> 117 </div>
114 </div> 118 </div>
115 </iron-collapse> 119 </iron-collapse>
116 <if expr="chromeos"> 120 <if expr="chromeos">
117 <div id="manage-input-methods-subpage-trigger" 121 <div id="manage-input-methods-subpage-trigger"
118 class="settings-box two-line"> 122 class="settings-box two-line">
119 <div class="start"> 123 <div class="start">
120 <div>$i18n{inputMethodsListTitle}</div> 124 <div>$i18n{inputMethodsListTitle}</div>
121 <div class="secondary"> 125 <div class="secondary">
122 [[getInputMethodName_(languages.inputMethods.currentId)]] 126 [[getInputMethodName_(languages.inputMethods.currentId)]]
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 </paper-toggle-button> 187 </paper-toggle-button>
184 </label> 188 </label>
185 </template> 189 </template>
186 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> 190 <div class="list-item list-button" on-tap="onEditDictionaryTap_">
187 $i18n{manageSpellCheck} 191 $i18n{manageSpellCheck}
188 </div> 192 </div>
189 </div> 193 </div>
190 </iron-collapse> 194 </iron-collapse>
191 </if> 195 </if>
192 </neon-animatable> 196 </neon-animatable>
193 <template is="dom-if" route-path="/manageLanguages">
194 <settings-subpage
195 associated-control="[[$$('#manage-languages-subpage-trigger')]]"
196 page-title="$i18n{manageLanguagesPageTitle}">
197 <settings-manage-languages-page
198 languages="{{languages}}" prefs="{{prefs}}"
199 language-helper="[[languageHelper]]">
200 </settings-manage-languages-page>
201 </settings-subpage>
202 </template>
203 <template is="dom-if" route-path="/languages/edit" no-search> 197 <template is="dom-if" route-path="/languages/edit" no-search>
204 <settings-subpage page-title="[[detailLanguage_.language.displayName]]"> 198 <settings-subpage page-title="[[detailLanguage_.language.displayName]]">
205 <settings-language-detail-page id="languageDetailPage" 199 <settings-language-detail-page id="languageDetailPage"
206 languages="{{languages}}" prefs="{{prefs}}" 200 languages="{{languages}}" prefs="{{prefs}}"
207 detail="[[detailLanguage_]]" language-helper="[[languageHelper]]"> 201 detail="[[detailLanguage_]]" language-helper="[[languageHelper]]">
208 </settings-language-detail-page> 202 </settings-language-detail-page>
209 </settings-subpage> 203 </settings-subpage>
210 </template> 204 </template>
211 <if expr="chromeos"> 205 <if expr="chromeos">
212 <template is="dom-if" route-path="/inputMethods"> 206 <template is="dom-if" route-path="/inputMethods">
213 <settings-subpage 207 <settings-subpage
214 associated-control="[[$$('#manage-input-methods-subpage-trigger')]]" 208 associated-control="[[$$('#manage-input-methods-subpage-trigger')]]"
215 page-title="$i18n{manageInputMethodsPageTitle}"> 209 page-title="$i18n{manageInputMethodsPageTitle}">
216 <settings-manage-input-methods-page languages="{{languages}}" 210 <settings-manage-input-methods-page languages="{{languages}}"
217 language-helper="[[languageHelper]]"> 211 language-helper="[[languageHelper]]">
218 </settings-manage-input-methods-page> 212 </settings-manage-input-methods-page>
219 </settings-subpage> 213 </settings-subpage>
220 </template> 214 </template>
221 </if> 215 </if>
222 <if expr="not is_macosx"> 216 <if expr="not is_macosx">
223 <template is="dom-if" route-path="/editDictionary"> 217 <template is="dom-if" route-path="/editDictionary">
224 <settings-subpage 218 <settings-subpage
225 associated-control="[[$$('#spellcheck-subpage-trigger')]]" 219 associated-control="[[$$('#spellcheck-subpage-trigger')]]"
226 page-title="$i18n{editDictionaryPageTitle}"> 220 page-title="$i18n{editDictionaryPageTitle}">
227 <settings-edit-dictionary-page></settings-edit-dictionary-page> 221 <settings-edit-dictionary-page></settings-edit-dictionary-page>
228 </settings-subpage> 222 </settings-subpage>
229 </template> 223 </template>
230 </if> 224 </if>
231 </settings-animated-pages> 225 </settings-animated-pages>
226 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp>
227 <settings-add-languages-dialog languages="{{languages}}"
228 language-helper="[[languageHelper]]">
229 </settings-add-languages-dialog>
230 </template>
232 </template> 231 </template>
233 <script src="languages_page.js"></script> 232 <script src="languages_page.js"></script>
234 </dom-module> 233 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698