Chromium Code Reviews| OLD | NEW |
|---|---|
| 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"></style> | 29 <style include="settings-shared"> |
| 30 .list-button { | |
| 31 @apply(--settings-actionable); | |
| 32 } | |
| 33 </style> | |
| 30 <settings-languages languages="{{languages}}"></settings-languages> | 34 <settings-languages languages="{{languages}}"></settings-languages> |
| 31 <settings-animated-pages id="pages" current-route="{{currentRoute}}" | 35 <settings-animated-pages id="pages" current-route="{{currentRoute}}" |
| 32 section="languages"> | 36 section="languages"> |
| 33 <neon-animatable id="main"> | 37 <neon-animatable id="main"> |
| 34 <div class="settings-box first two-line"> | 38 <div class="settings-box first two-line"> |
| 35 <div class="start"> | 39 <div class="start"> |
| 36 <div>$i18n{languagesListTitle}</div> | 40 <div>$i18n{languagesListTitle}</div> |
| 37 <div class="secondary"> | 41 <div class="secondary"> |
| 38 [[getProspectiveUILanguageName_( | 42 [[getProspectiveUILanguageName_( |
| 39 languages, prefs.intl.app_locale.value)]] | 43 languages, prefs.intl.app_locale.value)]] |
| 40 </div> | 44 </div> |
| 41 </div> | 45 </div> |
| 42 <cr-expand-button expanded="{{languagesOpened_}}"> | 46 <cr-expand-button expanded="{{languagesOpened_}}"> |
| 43 </cr-expand-button> | 47 </cr-expand-button> |
| 44 </div> | 48 </div> |
| 45 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> | 49 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> |
| 46 <div class="list-frame vertical-list"> | 50 <div class="list-frame vertical-list"> |
| 47 <template is="dom-repeat" items="[[languages.enabled]]"> | 51 <template is="dom-repeat" items="[[languages.enabled]]"> |
| 48 <div class$="list-item [[getLanguageItemClass_( | 52 <div class$="list-item [[getLanguageItemClass_( |
| 49 item.language.code, prefs.intl.app_locale.value)]]" | 53 item.language.code, prefs.intl.app_locale.value, |
| 54 item.language.supportsUI)]]" | |
|
michaelpg
2016/06/24 17:04:29
test needs to change '.list-button' to '.list-butt
| |
| 50 on-tap="onLanguageTap_"> | 55 on-tap="onLanguageTap_"> |
| 51 <if expr="not chromeos and not is_win"> | 56 <if expr="not chromeos and not is_win"> |
| 52 <div class="start" title="[[item.language.nativeDisplayName]]"> | 57 <div class="start" title="[[item.language.nativeDisplayName]]"> |
| 53 [[item.language.displayName]] | 58 [[item.language.displayName]] |
| 54 </div> | 59 </div> |
| 55 </if> | 60 </if> |
| 56 <if expr="chromeos or is_win"> | 61 <if expr="chromeos or is_win"> |
| 57 <div title="[[item.language.nativeDisplayName]]"> | 62 <div title="[[item.language.nativeDisplayName]]"> |
| 58 [[item.language.displayName]] | 63 [[item.language.displayName]] |
| 59 </div> | 64 </div> |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 84 <cr-expand-button expanded="{{inputMethodsOpened_}}"> | 89 <cr-expand-button expanded="{{inputMethodsOpened_}}"> |
| 85 </cr-expand-button> | 90 </cr-expand-button> |
| 86 </div> | 91 </div> |
| 87 <iron-collapse id="inputMethodsCollapse" | 92 <iron-collapse id="inputMethodsCollapse" |
| 88 opened="[[inputMethodsOpened_]]"> | 93 opened="[[inputMethodsOpened_]]"> |
| 89 <div class="list-frame vertical-list"> | 94 <div class="list-frame vertical-list"> |
| 90 <template is="dom-repeat" | 95 <template is="dom-repeat" |
| 91 items="[[languages.inputMethods.enabled]]"> | 96 items="[[languages.inputMethods.enabled]]"> |
| 92 <div class$="list-item [[getInputMethodItemClass_( | 97 <div class$="list-item [[getInputMethodItemClass_( |
| 93 item.id, languages.inputMethods.currentId)]]" | 98 item.id, languages.inputMethods.currentId)]]" |
| 94 on-tap="onInputMethodTap_"> | 99 on-tap="onInputMethodTap_" actionable> |
| 95 <div>[[item.displayName]]</div> | 100 <div>[[item.displayName]]</div> |
| 96 <div class="middle"> | 101 <div class="middle"> |
| 97 <iron-icon icon="settings:done" | 102 <iron-icon icon="settings:done" |
| 98 hidden$="[[!isCurrentInputMethod_( | 103 hidden$="[[!isCurrentInputMethod_( |
| 99 item.id, languages.inputMethods.currentId)]]"> | 104 item.id, languages.inputMethods.currentId)]]"> |
| 100 </iron-icon> | 105 </iron-icon> |
| 101 </div> | 106 </div> |
| 102 <paper-icon-button icon="cr:settings" | 107 <paper-icon-button icon="cr:settings" |
| 103 on-tap="onInputMethodOptionsTap_" | 108 on-tap="onInputMethodOptionsTap_" |
| 104 hidden$="[[!item.hasOptionsPage]]"> | 109 hidden$="[[!item.hasOptionsPage]]"> |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 175 <template is="dom-if" name="edit-dictionary"> | 180 <template is="dom-if" name="edit-dictionary"> |
| 176 <settings-subpage page-title="$i18n{editDictionaryPageTitle}"> | 181 <settings-subpage page-title="$i18n{editDictionaryPageTitle}"> |
| 177 <settings-edit-dictionary-page></settings-edit-dictionary-page> | 182 <settings-edit-dictionary-page></settings-edit-dictionary-page> |
| 178 </settings-subpage> | 183 </settings-subpage> |
| 179 </template> | 184 </template> |
| 180 </if> | 185 </if> |
| 181 </settings-animated-pages> | 186 </settings-animated-pages> |
| 182 </template> | 187 </template> |
| 183 <script src="languages_page.js"></script> | 188 <script src="languages_page.js"></script> |
| 184 </dom-module> | 189 </dom-module> |
| OLD | NEW |