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-icon/iron-icon.htm l"> | |
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
8 <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"> |
9 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 8 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
10 <link rel="import" href="languages.html"> | 9 <link rel="import" href="languages.html"> |
11 | 10 |
12 <dom-module id="settings-manage-languages-page"> | 11 <dom-module id="settings-manage-languages-page"> |
13 <template> | 12 <template> |
14 <style include="settings-shared"> | 13 <style include="settings-shared"> |
14 .list-frame { | |
15 display: flex; | |
16 flex-direction: column; | |
17 align-items: initial; | |
18 } | |
19 | |
15 iron-list { | 20 iron-list { |
16 height: 300px; | 21 height: 300px; |
17 } | 22 } |
18 </style> | 23 </style> |
19 <settings-languages languages="{{languages}}"></settings-languages> | 24 <settings-languages languages="{{languages}}"></settings-languages> |
20 <div class="settings-box first content"> | 25 <div class="settings-box first content"> |
21 <div class="start"> | 26 <div class="start"> |
dschuyler
2016/04/06 21:45:50
Is that extra space intentional?
michaelpg
2016/04/07 14:55:47
Done.
| |
22 <h2 i18n-content="enabledLanguages"></h2> | 27 <h2 i18n-content="enabledLanguages"></h2> |
23 <div class="list-frame vertical-list"> | 28 <div id="languages-list" class="list-frame vertical-list"> |
dschuyler
2016/04/06 21:45:50
The style doc (below) suggests using camel
case id
michaelpg
2016/04/07 14:55:47
Removed.
| |
24 <template is="dom-repeat" items="{{languages.enabledLanguages}}"> | 29 <template is="dom-repeat" items="{{languages.enabledLanguages}}"> |
25 <div class="list-item"> | 30 <div class="list-item"> |
26 <div class="language-name start" | 31 <div class="start" title="[[item.language.nativeDisplayName]]"> |
27 title="[[item.language.nativeDisplayName]]"> | |
28 [[item.language.displayName]] | 32 [[item.language.displayName]] |
29 </div> | 33 </div> |
30 <paper-icon-button icon="clear" on-tap="onRemoveLanguageTap_" | 34 <paper-icon-button icon="clear" on-tap="onRemoveLanguageTap_" |
31 hidden$="[[!canRemoveLanguage_(item.language.code, prefs.intl. app_locale.value)]]"> | 35 hidden$="[[!canRemoveLanguage_(item.language.code, prefs.intl. app_locale.value)]]"> |
32 </paper-icon-button> | 36 </paper-icon-button> |
33 </div> | 37 </div> |
34 </template> | 38 </template> |
35 </div> | 39 </div> |
36 <h2 i18n-content="allLanguages"></h2> | 40 <h2 i18n-content="allLanguages"></h2> |
37 <div class="list-frame vertical-list"> | 41 <div class="list-frame vertical-list"> |
38 <iron-list items="{{availableLanguages_}}" as="item"> | 42 <iron-list items="{{availableLanguages_}}" as="item"> |
39 <template> | 43 <template> |
40 <div class="list-item" on-tap="onAddLanguageTap_"> | 44 <div class="list-item"> |
41 <div class="language-name"> | 45 <paper-checkbox checked="[[item.enabled]]" |
42 <span>[[item.displayName]]</span> - | 46 title$="[[item.nativeDisplayName]]" |
43 <span>[[item.nativeDisplayName]]</span> | 47 disabled="[[!canRemoveLanguage_(item.code, prefs.intl.app_lo cale.value)]]" |
dschuyler
2016/04/06 21:45:50
I think we are now able to wrap these lines,
can t
michaelpg
2016/04/07 14:55:47
Done. Not sure whether they should get an extra 4
| |
44 </div> | 48 on-change="onLanguageCheckboxChange_"> |
45 <iron-icon icon="done" hidden$="[[!item.enabled]]"> | 49 [[item.displayName]] |
46 </iron-icon> | 50 </paper-checkbox> |
47 </div> | 51 </div> |
48 </template> | 52 </template> |
49 </iron-list> | 53 </iron-list> |
50 </div> | 54 </div> |
51 </div> | 55 </div> |
52 </div> | 56 </div> |
53 </template> | 57 </template> |
54 <script src="manage_languages_page.js"></script> | 58 <script src="manage_languages_page.js"></script> |
55 </dom-module> | 59 </dom-module> |
OLD | NEW |