Chromium Code Reviews| Index: chrome/browser/resources/settings/languages_page/manage_languages_page.html |
| diff --git a/chrome/browser/resources/settings/languages_page/manage_languages_page.html b/chrome/browser/resources/settings/languages_page/manage_languages_page.html |
| index d193e5944316f45353092d86a05459b150f2ae22..226de49ccd75aa518b1b657182795a32f412ec14 100644 |
| --- a/chrome/browser/resources/settings/languages_page/manage_languages_page.html |
| +++ b/chrome/browser/resources/settings/languages_page/manage_languages_page.html |
| @@ -22,38 +22,35 @@ |
| } |
| </style> |
| <settings-languages languages="{{languages}}"></settings-languages> |
| - <div class="settings-box first content"> |
| - <div class="start"> |
| - <h2 i18n-content="enabledLanguages"></h2> |
| - <div class="list-frame vertical-list"> |
| - <template is="dom-repeat" items="{{languages.enabledLanguages}}"> |
| + <div class="settings-box first block"> |
| + <h2 i18n-content="enabledLanguages"></h2> |
|
stevenjb
2016/04/20 20:40:50
$i18n{}
michaelpg
2016/04/20 23:19:59
I've done this separately in crrev.com/1905533005
|
| + <div class="list-frame vertical-list"> |
| + <template is="dom-repeat" items="{{languages.enabled}}"> |
| + <div class="list-item"> |
| + <div class="start" title="[[item.language.nativeDisplayName]]"> |
| + [[item.language.displayName]] |
| + </div> |
| + <paper-icon-button icon="clear" on-tap="onRemoveLanguageTap_" |
| + hidden$="[[!item.removable]]"> |
| + </paper-icon-button> |
| + </div> |
| + </template> |
| + </div> |
| + <h2 i18n-content="allLanguages"></h2> |
|
stevenjb
2016/04/20 20:40:50
$i18n{}
michaelpg
2016/04/20 23:19:59
Done.
|
| + <div class="list-frame vertical-list"> |
| + <iron-list items="{{languages.supported}}" as="item"> |
|
stevenjb
2016/04/20 20:40:50
as= not needed?
michaelpg
2016/04/20 23:19:59
Done.
|
| + <template> |
| <div class="list-item"> |
| - <div class="start" title="[[item.language.nativeDisplayName]]"> |
| - [[item.language.displayName]] |
| - </div> |
| - <paper-icon-button icon="clear" on-tap="onRemoveLanguageTap_" |
| - hidden$="[[!canRemoveLanguage_( |
| - item.language.code, prefs.intl.app_locale.value)]]"> |
| - </paper-icon-button> |
| + <paper-checkbox |
| + checked="[[isCheckboxChecked_(item, languages.enabled.*)]]" |
| + disabled="[[isLanguageRequired_(item, languages.enabled.*)]]" |
| + title$="[[item.nativeDisplayName]]" |
| + on-change="onLanguageCheckboxChange_"> |
| + [[item.displayName]] |
| + </paper-checkbox> |
| </div> |
| </template> |
| - </div> |
| - <h2 i18n-content="allLanguages"></h2> |
| - <div class="list-frame vertical-list"> |
| - <iron-list items="{{availableLanguages_}}" as="item"> |
| - <template> |
| - <div class="list-item"> |
| - <paper-checkbox checked="[[item.enabled]]" |
| - title$="[[item.nativeDisplayName]]" |
| - disabled="[[!canRemoveLanguage_( |
| - item.code, prefs.intl.app_locale.value)]]" |
| - on-change="onLanguageCheckboxChange_"> |
| - [[item.displayName]] |
| - </paper-checkbox> |
| - </div> |
| - </template> |
| - </iron-list> |
| - </div> |
| + </iron-list> |
| </div> |
| </div> |
| </template> |