diff options
| author | siikamiika <siikamiika@users.noreply.github.com> | 2017-10-01 22:51:01 +0300 |
|---|---|---|
| committer | siikamiika <siikamiika@users.noreply.github.com> | 2017-10-01 22:51:01 +0300 |
| commit | 3b664dd908b94e1306a211e7c8b9cde74694c018 (patch) | |
| tree | c9475c552eaad89a79f949a9efd8a8bdbb54d653 | |
| parent | 803ccc1661384ee484298f3495585d3923495dd4 (diff) | |
merged mode: missing changes from previous commit
The compiled template is already there, though
| -rw-r--r-- | tmpl/terms.html | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tmpl/terms.html b/tmpl/terms.html index a130e775..ca0dcbe9 100644 --- a/tmpl/terms.html +++ b/tmpl/terms.html @@ -31,7 +31,12 @@ <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt> </div> + {{#if merged}} + <div class="expression">{{#kanjiLinks}}{{#expressions}}{{{.}}}{{/expressions}}{{/kanjiLinks}}</div> + <div>{{#readings}}{{{.}}}{{/readings}}</div> + {{else}} <div class="expression">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div> + {{/if}} {{#if reasons}} <div class="reasons"> @@ -60,6 +65,16 @@ {{else}} {{> definition definitions.[0]}} {{/if}} + {{else if merged}} + {{#if definitions.[1]}} + <ol> + {{#each definitions}} + <li>{{> definition}}</li> + {{/each}} + </ol> + {{else}} + {{> definition definitions.[0]}} + {{/if}} {{else}} {{> definition}} {{/if}} @@ -74,7 +89,7 @@ {{#if definitions}} {{#each definitions}} {{#unless @first}}<hr>{{/unless}} -{{> term debug=../debug grouped=../grouped addable=../addable playback=../playback}} +{{> term debug=../debug grouped=../grouped merged=../merged addable=../addable playback=../playback}} {{/each}} {{else}} <p class="note">No results found.</p> |