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

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

Issue 2077063002: MD Settings: Allow the user to order the list of languages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed broken tests Created 4 years, 6 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/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/icons.html"> 9 <link rel="import" href="chrome://resources/cr_elements/icons.html">
10 <link rel="import" href="/icons.html"> 10 <link rel="import" href="/icons.html">
11 <link rel="import" href="/settings_page/settings_animated_pages.html"> 11 <link rel="import" href="/settings_page/settings_animated_pages.html">
12 <link rel="import" href="/settings_page/settings_subpage.html"> 12 <link rel="import" href="/settings_page/settings_subpage.html">
13 <link rel="import" href="/settings_shared_css.html"> 13 <link rel="import" href="/settings_shared_css.html">
14 <link rel="import" href="language_detail_page.html"> 14 <link rel="import" href="language_detail_page.html">
15 <link rel="import" href="languages.html"> 15 <link rel="import" href="languages.html">
16 <link rel="import" href="manage_languages_page.html"> 16 <link rel="import" href="manage_languages_page.html">
17 17
18 <if expr="not is_macosx"> 18 <if expr="not is_macosx">
19 <link rel="import" href="edit_dictionary_page.html"> 19 <link rel="import" href="edit_dictionary_page.html">
20 </if> 20 </if>
21 21
22 <if expr="chromeos"> 22 <if expr="chromeos">
23 <link rel="import" href="manage_input_methods_page.html"> 23 <link rel="import" href="manage_input_methods_page.html">
24 </if> 24 </if>
25 25
26 <dom-module id="settings-languages-page"> 26 <dom-module id="settings-languages-page">
27 <template> 27 <template>
28 <style include="settings-shared"></style> 28 <style include="settings-shared">
29 .dropdown-content {
30 background: white;
31 box-shadow: 0 2px 6px grey;
32 }
33
34 paper-item:hover {
35 background-color: var(--settings-hover-color);
36 }
37 </style>
29 <settings-languages languages="{{languages}}"></settings-languages> 38 <settings-languages languages="{{languages}}"></settings-languages>
30 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 39 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
31 section="languages"> 40 section="languages">
32 <neon-animatable id="main"> 41 <neon-animatable id="main">
33 <div class="settings-box first two-line"> 42 <div class="settings-box first two-line">
34 <div class="start"> 43 <div class="start">
35 <div>$i18n{languagesListTitle}</div> 44 <div>$i18n{languagesListTitle}</div>
36 <div class="secondary"> 45 <div class="secondary">
37 [[getProspectiveUILanguageName_( 46 [[getProspectiveUILanguageName_(
38 languages, prefs.intl.app_locale.value)]] 47 languages, prefs.intl.app_locale.value)]]
39 </div> 48 </div>
40 </div> 49 </div>
41 <cr-expand-button expanded="{{languagesOpened_}}"> 50 <cr-expand-button expanded="{{languagesOpened_}}">
42 </cr-expand-button> 51 </cr-expand-button>
43 </div> 52 </div>
44 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> 53 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]">
45 <div class="list-frame vertical-list"> 54 <div class="list-frame vertical-list">
55 <span class="list-item"
56 hidden="[[isHelpTextHidden_(languages.enabled.*)]]">
57 <span>$i18n{orderLanguagesInstructions}</span>
58 <a href="$i18n{languagesLearnMoreURL}" target="_blank">
59 $i18n{learnMore}
60 </a>
61 </span>
46 <template is="dom-repeat" items="[[languages.enabled]]"> 62 <template is="dom-repeat" items="[[languages.enabled]]">
47 <div class$="list-item [[getLanguageItemClass_( 63 <div class$="list-item [[getLanguageItemClass_(
48 item.language.code, prefs.intl.app_locale.value)]]" 64 item.language.code, prefs.intl.app_locale.value)]]"
49 on-tap="onLanguageTap_"> 65 on-tap="onLanguageTap_">
50 <if expr="not chromeos and not is_win"> 66 <if expr="not chromeos and not is_win">
51 <div class="start" title="[[item.language.nativeDisplayName]]"> 67 <div class="start" title="[[item.language.nativeDisplayName]]">
52 [[item.language.displayName]] 68 [[item.language.displayName]]
53 </div> 69 </div>
54 </if> 70 </if>
55 <if expr="chromeos or is_win"> 71 <if expr="chromeos or is_win">
56 <div title="[[item.language.nativeDisplayName]]"> 72 <div title="[[item.language.nativeDisplayName]]">
57 [[item.language.displayName]] 73 [[item.language.displayName]]
58 </div> 74 </div>
59 <div class="middle"> 75 <div class="middle">
60 <iron-icon icon="settings:done" 76 <iron-icon icon="settings:done"
61 hidden$="[[!isProspectiveUILanguage_( 77 hidden$="[[!isProspectiveUILanguage_(
62 item.language.code, prefs.intl.app_locale.value)]]"> 78 item.language.code, prefs.intl.app_locale.value)]]">
63 </iron-icon> 79 </iron-icon>
64 </div> 80 </div>
65 </if> 81 </if>
66 <paper-icon-button icon="cr:settings" 82 <paper-icon-button icon="cr:more-vert" toggles
67 on-tap="onShowLanguageDetailTap_"></paper-icon-button> 83 active="{{item.optionsMenuOpened}}">
84 </paper-icon-button>
85 <iron-dropdown opened="{{item.optionsMenuOpened}}"
michaelpg 2016/06/21 00:34:42 I noticed some issues here, but they exist elsewhe
Moe 2016/06/21 20:10:19 Acknowledged. I've seen the gray focus ring in MD
86 horizontal-align="right" vertical-align="top">
87 <div class="dropdown-content">
88 <paper-item on-tap="onMoveUpTap_" id="moveUp"
michaelpg 2016/06/21 00:34:42 an id in a dom-repeat doesn't make sense (it'll be
Moe 2016/06/21 20:10:19 Yep. this is wrong. Changed it to "moveUp-[[item.l
michaelpg 2016/06/22 01:06:27 Looks like we only use these IDs for testing, and
Moe 2016/06/27 15:00:05 Done.
89 hidden="[[isFirstLanguage_(index,
90 languages.enabled.*)]]">
91 $i18n{moveUp}
92 </paper-item>
93 <paper-item on-tap="onMoveDownTap_" id="moveDown"
michaelpg 2016/06/21 00:34:42 id?
Moe 2016/06/21 20:10:19 Done.
94 hidden="[[isLastLanguage_(index,
95 languages.enabled.*)]]">
michaelpg 2016/06/21 00:34:42 align as on 90
Moe 2016/06/21 20:10:19 Done.
96 $i18n{moveDown}
97 </paper-item>
98 <paper-item id="languageDetail"
michaelpg 2016/06/21 00:34:42 id?
Moe 2016/06/21 20:10:19 Done.
99 on-tap="onShowLanguageDetailTap_">
100 $i18n{languageDetail}
101 </paper-item>
102 </div>
103 </iron-dropdown>
68 </div> 104 </div>
69 </template> 105 </template>
70 <div class="list-item list-button" on-tap="onManageLanguagesTap_"> 106 <div class="list-item list-button" on-tap="onManageLanguagesTap_">
71 $i18n{manageLanguages} 107 $i18n{manageLanguages}
72 </div> 108 </div>
73 </div> 109 </div>
74 </iron-collapse> 110 </iron-collapse>
75 <if expr="chromeos"> 111 <if expr="chromeos">
76 <div class="settings-box two-line"> 112 <div class="settings-box two-line">
77 <div class="start"> 113 <div class="start">
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 <template is="dom-if" name="edit-dictionary"> 207 <template is="dom-if" name="edit-dictionary">
172 <settings-subpage page-title="$i18n{editDictionaryPageTitle}"> 208 <settings-subpage page-title="$i18n{editDictionaryPageTitle}">
173 <settings-edit-dictionary-page></settings-edit-dictionary-page> 209 <settings-edit-dictionary-page></settings-edit-dictionary-page>
174 </settings-subpage> 210 </settings-subpage>
175 </template> 211 </template>
176 </if> 212 </if>
177 </settings-animated-pages> 213 </settings-animated-pages>
178 </template> 214 </template>
179 <script src="languages_page.js"></script> 215 <script src="languages_page.js"></script>
180 </dom-module> 216 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698