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

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

Issue 2089313005: Revert of MD Settings: make custom UIs look "actionable" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/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="/settings_page/settings_animated_pages.html"> 12 <link rel="import" href="/settings_page/settings_animated_pages.html">
13 <link rel="import" href="/settings_page/settings_subpage.html"> 13 <link rel="import" href="/settings_page/settings_subpage.html">
14 <link rel="import" href="/settings_shared_css.html"> 14 <link rel="import" href="/settings_shared_css.html">
15 <link rel="import" href="language_detail_page.html"> 15 <link rel="import" href="language_detail_page.html">
16 <link rel="import" href="languages.html"> 16 <link rel="import" href="languages.html">
17 <link rel="import" href="manage_languages_page.html"> 17 <link rel="import" href="manage_languages_page.html">
18 18
19 <if expr="not is_macosx"> 19 <if expr="not is_macosx">
20 <link rel="import" href="edit_dictionary_page.html"> 20 <link rel="import" href="edit_dictionary_page.html">
21 </if> 21 </if>
22 22
23 <if expr="chromeos"> 23 <if expr="chromeos">
24 <link rel="import" href="manage_input_methods_page.html"> 24 <link rel="import" href="manage_input_methods_page.html">
25 </if> 25 </if>
26 26
27 <dom-module id="settings-languages-page"> 27 <dom-module id="settings-languages-page">
28 <template> 28 <template>
29 <style include="settings-shared"> 29 <style include="settings-shared"></style>
30 .list-button {
31 @apply(--settings-actionable);
32 }
33 </style>
34 <settings-languages languages="{{languages}}"></settings-languages> 30 <settings-languages languages="{{languages}}"></settings-languages>
35 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 31 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
36 section="languages"> 32 section="languages">
37 <neon-animatable id="main"> 33 <neon-animatable id="main">
38 <div class="settings-box first two-line"> 34 <div class="settings-box first two-line">
39 <div class="start"> 35 <div class="start">
40 <div>$i18n{languagesListTitle}</div> 36 <div>$i18n{languagesListTitle}</div>
41 <div class="secondary"> 37 <div class="secondary">
42 [[getProspectiveUILanguageName_( 38 [[getProspectiveUILanguageName_(
43 languages, prefs.intl.app_locale.value)]] 39 languages, prefs.intl.app_locale.value)]]
44 </div> 40 </div>
45 </div> 41 </div>
46 <cr-expand-button expanded="{{languagesOpened_}}"> 42 <cr-expand-button expanded="{{languagesOpened_}}">
47 </cr-expand-button> 43 </cr-expand-button>
48 </div> 44 </div>
49 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> 45 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]">
50 <div class="list-frame vertical-list"> 46 <div class="list-frame vertical-list">
51 <template is="dom-repeat" items="[[languages.enabled]]"> 47 <template is="dom-repeat" items="[[languages.enabled]]">
52 <div class$="list-item [[getLanguageItemClass_( 48 <div class$="list-item [[getLanguageItemClass_(
53 item.language.code, prefs.intl.app_locale.value, 49 item.language.code, prefs.intl.app_locale.value)]]"
54 item.language.supportsUI)]]"
55 on-tap="onLanguageTap_"> 50 on-tap="onLanguageTap_">
56 <if expr="not chromeos and not is_win"> 51 <if expr="not chromeos and not is_win">
57 <div class="start" title="[[item.language.nativeDisplayName]]"> 52 <div class="start" title="[[item.language.nativeDisplayName]]">
58 [[item.language.displayName]] 53 [[item.language.displayName]]
59 </div> 54 </div>
60 </if> 55 </if>
61 <if expr="chromeos or is_win"> 56 <if expr="chromeos or is_win">
62 <div title="[[item.language.nativeDisplayName]]"> 57 <div title="[[item.language.nativeDisplayName]]">
63 [[item.language.displayName]] 58 [[item.language.displayName]]
64 </div> 59 </div>
(...skipping 24 matching lines...) Expand all
89 <cr-expand-button expanded="{{inputMethodsOpened_}}"> 84 <cr-expand-button expanded="{{inputMethodsOpened_}}">
90 </cr-expand-button> 85 </cr-expand-button>
91 </div> 86 </div>
92 <iron-collapse id="inputMethodsCollapse" 87 <iron-collapse id="inputMethodsCollapse"
93 opened="[[inputMethodsOpened_]]"> 88 opened="[[inputMethodsOpened_]]">
94 <div class="list-frame vertical-list"> 89 <div class="list-frame vertical-list">
95 <template is="dom-repeat" 90 <template is="dom-repeat"
96 items="[[languages.inputMethods.enabled]]"> 91 items="[[languages.inputMethods.enabled]]">
97 <div class$="list-item [[getInputMethodItemClass_( 92 <div class$="list-item [[getInputMethodItemClass_(
98 item.id, languages.inputMethods.currentId)]]" 93 item.id, languages.inputMethods.currentId)]]"
99 on-tap="onInputMethodTap_" actionable> 94 on-tap="onInputMethodTap_">
100 <div>[[item.displayName]]</div> 95 <div>[[item.displayName]]</div>
101 <div class="middle"> 96 <div class="middle">
102 <iron-icon icon="settings:done" 97 <iron-icon icon="settings:done"
103 hidden$="[[!isCurrentInputMethod_( 98 hidden$="[[!isCurrentInputMethod_(
104 item.id, languages.inputMethods.currentId)]]"> 99 item.id, languages.inputMethods.currentId)]]">
105 </iron-icon> 100 </iron-icon>
106 </div> 101 </div>
107 <paper-icon-button icon="cr:settings" 102 <paper-icon-button icon="cr:settings"
108 on-tap="onInputMethodOptionsTap_" 103 on-tap="onInputMethodOptionsTap_"
109 hidden$="[[!item.hasOptionsPage]]"> 104 hidden$="[[!item.hasOptionsPage]]">
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 <template is="dom-if" name="edit-dictionary"> 175 <template is="dom-if" name="edit-dictionary">
181 <settings-subpage page-title="$i18n{editDictionaryPageTitle}"> 176 <settings-subpage page-title="$i18n{editDictionaryPageTitle}">
182 <settings-edit-dictionary-page></settings-edit-dictionary-page> 177 <settings-edit-dictionary-page></settings-edit-dictionary-page>
183 </settings-subpage> 178 </settings-subpage>
184 </template> 179 </template>
185 </if> 180 </if>
186 </settings-animated-pages> 181 </settings-animated-pages>
187 </template> 182 </template>
188 <script src="languages_page.js"></script> 183 <script src="languages_page.js"></script>
189 </dom-module> 184 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698