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"> |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 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 | |
| 35 .language-title-wrapper { | |
| 36 flex: 1; | |
| 37 } | |
| 34 </style> | 38 </style> |
| 35 <settings-languages languages="{{languages}}"></settings-languages> | 39 <settings-languages languages="{{languages}}"></settings-languages> |
| 36 <settings-animated-pages id="pages" section="languages"> | 40 <settings-animated-pages id="pages" section="languages"> |
| 37 <neon-animatable id="main"> | 41 <neon-animatable id="main"> |
| 38 <div id="manage-languages-subpage-trigger" | 42 <div id="manage-languages-subpage-trigger" |
| 39 class="settings-box first two-line"> | 43 class="settings-box first two-line"> |
| 40 <div class="start"> | 44 <div class="start"> |
| 41 <div>$i18n{languagesListTitle}</div> | 45 <div>$i18n{languagesListTitle}</div> |
| 42 <div class="secondary"> | 46 <div class="secondary"> |
| 43 [[getProspectiveUILanguageName_( | 47 [[getProspectiveUILanguageName_( |
| 44 languages, prefs.intl.app_locale.value)]] | 48 languages, prefs.intl.app_locale.value)]] |
| 45 </div> | 49 </div> |
| 46 </div> | 50 </div> |
| 47 <cr-expand-button expanded="{{languagesOpened_}}"> | 51 <cr-expand-button expanded="{{languagesOpened_}}"> |
| 48 </cr-expand-button> | 52 </cr-expand-button> |
| 49 </div> | 53 </div> |
| 50 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> | 54 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> |
| 51 <div class="list-frame vertical-list"> | 55 <div class="list-frame vertical-list"> |
| 52 <span class="list-item" | 56 <span class="list-item" |
| 53 hidden="[[isHelpTextHidden_(languages.enabled.*)]]"> | 57 hidden="[[isHelpTextHidden_(languages.enabled.*)]]"> |
| 54 <span>$i18n{orderLanguagesInstructions}</span> | 58 <span>$i18n{orderLanguagesInstructions}</span> |
| 55 <a href="$i18n{languagesLearnMoreURL}" target="_blank"> | 59 <a href="$i18n{languagesLearnMoreURL}" target="_blank"> |
| 56 $i18n{learnMore} | 60 $i18n{learnMore} |
| 57 </a> | 61 </a> |
| 58 </span> | 62 </span> |
| 59 <template is="dom-repeat" items="[[languages.enabled]]"> | 63 <template is="dom-repeat" items="[[languages.enabled]]"> |
| 60 <div class$="list-item [[getLanguageItemClass_( | 64 <div class$="list-item [[getLanguageItemClass_( |
|
Dan Beam
2016/08/12 01:43:43
why are these both .list-item
Moe
2016/08/12 16:46:53
again to maintain appearance.
| |
| 61 item.language.code, prefs.intl.app_locale.value, | 65 item.language.code, prefs.intl.app_locale.value, |
| 62 item.language.supportsUI)]]" | 66 item.language.supportsUI)]]"> |
| 63 on-tap="onLanguageTap_"> | 67 <div class="list-item language-title-wrapper" |
|
Dan Beam
2016/08/12 01:43:43
why is this a list-item?
Moe
2016/08/12 16:46:53
to maintain the appearance. '.list-item' gives the
| |
| 68 on-tap="onLanguageTap_"> | |
| 64 <if expr="not chromeos and not is_win"> | 69 <if expr="not chromeos and not is_win"> |
| 65 <div class="start" title="[[item.language.nativeDisplayName]]"> | 70 <div class="start" title="[[item.language.nativeDisplayName]]" > |
| 66 [[item.language.displayName]] | 71 [[item.language.displayName]] |
| 67 </div> | 72 </div> |
| 68 </if> | 73 </if> |
| 69 <if expr="chromeos or is_win"> | 74 <if expr="chromeos or is_win"> |
| 70 <div title="[[item.language.nativeDisplayName]]"> | 75 <div title="[[item.language.nativeDisplayName]]"> |
| 71 [[item.language.displayName]] | 76 [[item.language.displayName]] |
| 77 </div> | |
| 78 <div class="middle"> | |
| 79 <iron-icon icon="settings:done" | |
| 80 hidden$="[[!isProspectiveUILanguage_( | |
| 81 item.language.code, prefs.intl.app_locale.value)]]"> | |
| 82 </iron-icon> | |
| 83 </div> | |
| 84 </if> | |
| 72 </div> | 85 </div> |
| 73 <div class="middle"> | |
| 74 <iron-icon icon="settings:done" | |
| 75 hidden$="[[!isProspectiveUILanguage_( | |
| 76 item.language.code, prefs.intl.app_locale.value)]]"> | |
| 77 </iron-icon> | |
| 78 </div> | |
| 79 </if> | |
| 80 <paper-icon-button id="more-[[item.language.code]]" | 86 <paper-icon-button id="more-[[item.language.code]]" |
| 81 icon="cr:more-vert" toggles | 87 icon="cr:more-vert" toggles |
| 82 active="{{item.optionsMenuOpened}}"> | 88 active="{{item.optionsMenuOpened}}"> |
| 83 </paper-icon-button> | 89 </paper-icon-button> |
| 84 <iron-dropdown opened="{{item.optionsMenuOpened}}" | 90 <iron-dropdown opened="{{item.optionsMenuOpened}}" |
| 85 horizontal-align="right" vertical-align="auto"> | 91 horizontal-align="right" vertical-align="auto"> |
| 86 <div class="dropdown-content"> | 92 <div class="dropdown-content"> |
| 87 <button class="dropdown-item" role="option" | 93 <button class="dropdown-item" role="option" |
| 88 on-tap="onMoveUpTap_" | 94 on-tap="onMoveUpTap_" |
| 89 hidden="[[isFirstLanguage_(index, | 95 hidden="[[isFirstLanguage_(index, |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 217 associated-control="[[$$('#spellcheck-subpage-trigger')]]" | 223 associated-control="[[$$('#spellcheck-subpage-trigger')]]" |
| 218 page-title="$i18n{editDictionaryPageTitle}"> | 224 page-title="$i18n{editDictionaryPageTitle}"> |
| 219 <settings-edit-dictionary-page></settings-edit-dictionary-page> | 225 <settings-edit-dictionary-page></settings-edit-dictionary-page> |
| 220 </settings-subpage> | 226 </settings-subpage> |
| 221 </template> | 227 </template> |
| 222 </if> | 228 </if> |
| 223 </settings-animated-pages> | 229 </settings-animated-pages> |
| 224 </template> | 230 </template> |
| 225 <script src="languages_page.js"></script> | 231 <script src="languages_page.js"></script> |
| 226 </dom-module> | 232 </dom-module> |
| OLD | NEW |