aboutsummaryrefslogtreecommitdiff
path: root/tmpl
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-08-17 19:39:32 -0700
committerAlex Yatskov <alex@foosoft.net>2017-08-17 19:39:32 -0700
commit39fbabfe626e7ae2c2e0c1dd45bda33dd5dab66c (patch)
tree334bc2282389c910ed9f7d724458b6d8b650311a /tmpl
parent65c100fe16c4829971055da384da90b1a1cddcd5 (diff)
parent7586572fbaab7de698ec13f8712cc95e24ab6273 (diff)
Merge branch 'master' into firefox-amo
Diffstat (limited to 'tmpl')
-rw-r--r--tmpl/fields.html20
-rw-r--r--tmpl/kanji.html3
-rw-r--r--tmpl/terms.html3
3 files changed, 18 insertions, 8 deletions
diff --git a/tmpl/fields.html b/tmpl/fields.html
index ab1a9722..944a43e6 100644
--- a/tmpl/fields.html
+++ b/tmpl/fields.html
@@ -1,13 +1,17 @@
{{#*inline "glossary-single"}}
{{~#if html~}}
- {{~#if tags~}}<i>({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}})</i> {{/if~}}
+ {{~#unless brief~}}
+ {{~#if tags~}}<i>({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}})</i> {{/if~}}
+ {{~/unless~}}
{{~#if glossary.[1]~}}
<ul>{{#each glossary}}<li>{{#multiLine}}{{.}}{{/multiLine}}</li>{{/each}}</ul>
{{~else~}}
{{~#multiLine}}{{glossary.[0]}}{{/multiLine~}}
{{~/if~}}
{{~else~}}
- {{~#if tags~}}({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}) {{/if~}}
+ {{~#unless brief~}}
+ {{~#if tags~}}({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}) {{/if~}}
+ {{~/unless~}}
{{~#if glossary.[1]~}}
{{#each glossary}}{{.}}{{#unless @last}}, {{/unless}}{{/each}}
{{~else~}}
@@ -58,18 +62,22 @@
{{~else~}}
{{~#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 html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single html=../html brief=../brief}}</li>{{/each}}</ol>
+ {{~else}}{{#each definition.definitions}} * {{> glossary-single html=../html brief=../brief}}{{/each}}{{/if~}}
{{~else~}}
- {{~> glossary-single definition.definitions.[0] html=html~}}
+ {{~> glossary-single definition.definitions.[0] html=html brief=brief~}}
{{~/if~}}
{{~else~}}
- {{~> glossary-single definition html=html~}}
+ {{~> glossary-single definition html=html brief=brief~}}
{{~/if~}}
{{~/if~}}
{{~#if html}}</div>{{/if~}}
{{/inline}}
+{{#*inline "glossary-brief"}}
+ {{~> glossary brief=true ~}}
+{{/inline}}
+
{{#*inline "kunyomi"}}
{{~#each definition.kunyomi}}{{.}}{{#unless @last}}, {{/unless}}{{/each~}}
{{/inline}}
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index 28e4b8a4..bb62f488 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -1,13 +1,14 @@
{{#*inline "kanji"}}
<div class="entry" data-type="kanji">
<div class="actions">
- <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
{{#if addable}}
+ <a href="#" class="action-view-note pending disabled"><img src="/mixed/img/view-note.png" title="View added note (Alt + V)" alt></a>
<a href="#" class="action-add-note pending disabled" data-mode="kanji"><img src="/mixed/img/add-kanji.png" title="Add Kanji (Alt + K)" alt></a>
{{/if}}
{{#if source}}
<a href="#" class="source-term"><img src="/mixed/img/source-term.png" title="Source term (Alt + B)" alt></a>
{{/if}}
+ <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
</div>
<div class="glyph">{{character}}</div>
diff --git a/tmpl/terms.html b/tmpl/terms.html
index bf656cfb..db36e5cc 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -20,14 +20,15 @@
{{#*inline "term"}}
<div class="entry" data-type="term">
<div class="actions">
- <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
{{#if addable}}
+ <a href="#" class="action-view-note pending disabled"><img src="/mixed/img/view-note.png" title="View added note (Alt + V)" alt></a>
<a href="#" class="action-add-note pending disabled" data-mode="term-kanji"><img src="/mixed/img/add-term-kanji.png" title="Add expression (Alt + E)" alt></a>
<a href="#" class="action-add-note pending disabled" data-mode="term-kana"><img src="/mixed/img/add-term-kana.png" title="Add reading (Alt + R)" alt></a>
{{/if}}
{{#if playback}}
<a href="#" class="action-play-audio"><img src="/mixed/img/play-audio.png" title="Play audio (Alt + P)" alt></a>
{{/if}}
+ <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
</div>
{{#if reading}}