diff options
| author | Alex Yatskov <alex@foosoft.net> | 2017-08-26 12:36:56 -0700 |
|---|---|---|
| committer | Alex Yatskov <alex@foosoft.net> | 2017-08-26 12:36:56 -0700 |
| commit | 65b679caeb7ae7261ea6f2ba76d1b14ff1d68c5c (patch) | |
| tree | 16ff39b4730b5c84b0952a0cdd10b09e86d6a5b3 /tmpl | |
| parent | 4325f325975614dc728a14fec0478654b1b43777 (diff) | |
| parent | dbe6a16ca4db10b1c3ff51d0d79b563ff2bb7aeb (diff) | |
Merge branch 'master' into firefox-amo
Diffstat (limited to 'tmpl')
| -rw-r--r-- | tmpl/fields.html | 8 | ||||
| -rw-r--r-- | tmpl/terms.html | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tmpl/fields.html b/tmpl/fields.html index 944a43e6..2794484c 100644 --- a/tmpl/fields.html +++ b/tmpl/fields.html @@ -44,12 +44,16 @@ {{#*inline "furigana"}} {{~#if html~}} - {{~#if definition.reading}}<ruby>{{definition.expression}}<rt>{{definition.reading}}</rt></ruby>{{else}}{{definition.expression}}{{/if~}} + {{#furigana}}{{{definition}}}{{/furigana}} {{~else~}} - {{~#if definition.reading}}{{definition.expression}} [{{definition.reading}}]{{else}}{{definition.expression}}{{/if~}} + {{#furiganaPlain}}{{{definition}}}{{/furiganaPlain}} {{~/if~}} {{/inline}} +{{#*inline "furigana-plain"}} + {{#furiganaPlain}}{{{definition}}}{{/furiganaPlain}} +{{/inline}} + {{#*inline "glossary"}} {{~#if html}}<div style="text-align: left;">{{/if~}} {{~#if modeKanji~}} diff --git a/tmpl/terms.html b/tmpl/terms.html index db36e5cc..ffe52ab8 100644 --- a/tmpl/terms.html +++ b/tmpl/terms.html @@ -31,11 +31,7 @@ <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt> </div> - {{#if reading}} - <div class="expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div> - {{else}} - <div class="expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div> - {{/if}} + <div class="expression">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div> {{#if reasons}} <div class="reasons"> |