diff options
| author | Alex Yatskov <alex@foosoft.net> | 2017-02-26 11:05:41 -0800 |
|---|---|---|
| committer | Alex Yatskov <alex@foosoft.net> | 2017-02-26 11:05:41 -0800 |
| commit | 32f95e59a9c5612d2b5658ea8a70b55ec17cca18 (patch) | |
| tree | a75e426d9350f266402ff0e8a9d040a985a37629 /tmpl/fields.html | |
| parent | b7faaf0b51363b8366adae3ba7511d5232d6cd30 (diff) | |
| parent | 8966dc1213d4af15c956dbd8976b80a1287c9fe0 (diff) | |
Merge branch 'dev' into firefox
Diffstat (limited to 'tmpl/fields.html')
| -rw-r--r-- | tmpl/fields.html | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tmpl/fields.html b/tmpl/fields.html index ba03349c..33fbff44 100644 --- a/tmpl/fields.html +++ b/tmpl/fields.html @@ -48,15 +48,24 @@ {{#*inline "glossary"}} {{~#if html}}<div style="text-align: left;">{{/if~}} - {{~#if group~}} - {{~#if definition.definitions.[1]~}} - {{~#if html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single html=../html}}</li>{{/each}}</ol> - {{~else}}{{#each definition.definitions}} * {{> glossary-single html=../html}}{{/each}}{{/if~}} + {{~#if modeKanji~}} + {{~#if definition.glossary.[1]~}} + {{~#if html}}<ol>{{#each definition.glossary}}<li>{{.}}</li>{{/each}}</ol> + {{~else}}{{#each definition.glossary}}{{.}}{{#unless @last}}, {{/unless}}{{/each}}{{/if~}} {{~else~}} - {{~> glossary-single definition.definitions.[0] html=html~}} + {{definition.glossary.[0]}} {{~/if~}} {{~else~}} - {{~> glossary-single definition html=html~}} + {{~#if group~}} + {{~#if definition.definitions.[1]~}} + {{~#if html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single html=../html}}</li>{{/each}}</ol> + {{~else}}{{#each definition.definitions}} * {{> glossary-single html=../html}}{{/each}}{{/if~}} + {{~else~}} + {{~> glossary-single definition.definitions.[0] html=html~}} + {{~/if~}} + {{~else~}} + {{~> glossary-single definition html=html~}} + {{~/if~}} {{~/if~}} {{~#if html}}</div>{{/if~}} {{/inline}} |