From f808221470b607996aa1554ebd15afa26bcfabd1 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 22 Jan 2017 19:22:53 -0800
Subject: wip

---
 tmpl/fields.html     | 19 +++++++-------
 tmpl/kanji-list.html | 59 -------------------------------------------
 tmpl/kanji.html      | 59 +++++++++++++++++++++++++++++++++++++++++++
 tmpl/term-list.html  | 71 ----------------------------------------------------
 tmpl/terms.html      | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 140 insertions(+), 139 deletions(-)
 delete mode 100644 tmpl/kanji-list.html
 create mode 100644 tmpl/kanji.html
 delete mode 100644 tmpl/term-list.html
 create mode 100644 tmpl/terms.html

(limited to 'tmpl')

diff --git a/tmpl/fields.html b/tmpl/fields.html
index 6d3756d6..ca2a5ee2 100644
--- a/tmpl/fields.html
+++ b/tmpl/fields.html
@@ -1,15 +1,16 @@
 {{#*inline "audio"}}{{/inline}}
 
 {{#*inline "character"}}
-character
+{{definition.character}}
 {{/inline}}
 
 {{#*inline "dictionary"}}
-dictionary
+{{definition.dictionary}}
 {{/inline}}
 
 {{#*inline "expression"}}
-expression
+{{#if modeTermKana}}{{#if definition.reading}}{{definition.reading}}{{else}}{{definition.expression}}{{/if}}{{/if}}
+{{#if modeTermKanji}}{{definition.expression}}{{/if}}
 {{/inline}}
 
 {{#*inline "furigana"}}
@@ -21,27 +22,27 @@ glossary
 {{/inline}}
 
 {{#*inline "kunyomi"}}
-kunyomi
+{{definition.kunyomi}}
 {{/inline}}
 
 {{#*inline "onyomi"}}
-onyomi
+{{definition.onyomi}}
 {{/inline}}
 
 {{#*inline "reading"}}
-reading
+{{definition.reading}}
 {{/inline}}
 
 {{#*inline "sentence"}}
-sentence
+{{definition.sentence}}
 {{/inline}}
 
 {{#*inline "tags"}}
-tags
+{{#each definition.tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}
 {{/inline}}
 
 {{#*inline "url"}}
-url
+{{#if html}}<a href="{{definition.url}}">{{definition.url}}</a>{{else}}{{definition.url}}{{/if}}
 {{/inline}}
 
 {{> (lookup . 'marker') }}
diff --git a/tmpl/kanji-list.html b/tmpl/kanji-list.html
deleted file mode 100644
index 3f6d8084..00000000
--- a/tmpl/kanji-list.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{{#*inline "kanji"}}
-<div class="kanji-definition">
-    <div class="action-bar">
-        {{#if addable}}
-            <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="img/add_kanji.png"></a>
-        {{/if}}
-    </div>
-
-    <div class="kanji-glyph">{{character}}</div>
-
-    <div class="kanji-reading">
-        <table>
-            <tr>
-                <th>Kunyomi:</th>
-                <td>
-                    {{#each kunyomi}}
-                        {{.}}{{#unless @last}}, {{/unless}}
-                    {{/each}}
-                </td>
-            </tr>
-            <tr>
-                <th>Onyomi:</th>
-                <td>
-                    {{#each onyomi}}
-                        {{.}}{{#unless @last}}, {{/unless}}
-                    {{/each}}
-                </td>
-            </tr>
-        </table>
-    </div>
-
-    <div class="kanji-tags">
-        {{#each tags}}
-            <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span>
-        {{/each}}
-    </div>
-
-    <div class="kanji-glossary">
-        {{#if glossary.[1]}}
-            <ol "kanji-glossary-group">
-                {{#each glossary}}
-                    <li><span class="kanji-glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
-                {{/each}}
-            </ol>
-        {{else}}
-            <div class="kanji-glossary-group kanji-glossary-item">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
-        {{/if}}
-    </div>
-</div>
-{{/inline}}
-
-{{#if definitions}}
-    {{#each definitions}}
-        {{#unless @first}}<hr>{{/unless}}
-        {{> kanji addable=../addable root=../root}}
-    {{/each}}
-{{else}}
-    <p>No results found</p>
-{{/if}}
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
new file mode 100644
index 00000000..3f6d8084
--- /dev/null
+++ b/tmpl/kanji.html
@@ -0,0 +1,59 @@
+{{#*inline "kanji"}}
+<div class="kanji-definition">
+    <div class="action-bar">
+        {{#if addable}}
+            <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="img/add_kanji.png"></a>
+        {{/if}}
+    </div>
+
+    <div class="kanji-glyph">{{character}}</div>
+
+    <div class="kanji-reading">
+        <table>
+            <tr>
+                <th>Kunyomi:</th>
+                <td>
+                    {{#each kunyomi}}
+                        {{.}}{{#unless @last}}, {{/unless}}
+                    {{/each}}
+                </td>
+            </tr>
+            <tr>
+                <th>Onyomi:</th>
+                <td>
+                    {{#each onyomi}}
+                        {{.}}{{#unless @last}}, {{/unless}}
+                    {{/each}}
+                </td>
+            </tr>
+        </table>
+    </div>
+
+    <div class="kanji-tags">
+        {{#each tags}}
+            <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span>
+        {{/each}}
+    </div>
+
+    <div class="kanji-glossary">
+        {{#if glossary.[1]}}
+            <ol "kanji-glossary-group">
+                {{#each glossary}}
+                    <li><span class="kanji-glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
+                {{/each}}
+            </ol>
+        {{else}}
+            <div class="kanji-glossary-group kanji-glossary-item">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
+        {{/if}}
+    </div>
+</div>
+{{/inline}}
+
+{{#if definitions}}
+    {{#each definitions}}
+        {{#unless @first}}<hr>{{/unless}}
+        {{> kanji addable=../addable root=../root}}
+    {{/each}}
+{{else}}
+    <p>No results found</p>
+{{/if}}
diff --git a/tmpl/term-list.html b/tmpl/term-list.html
deleted file mode 100644
index aae365c7..00000000
--- a/tmpl/term-list.html
+++ /dev/null
@@ -1,71 +0,0 @@
-{{#*inline "definition"}}
-    {{#if tags}}
-        <div class="term-tags">
-            {{#each tags}}
-                <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span>
-            {{/each}}
-        </div>
-    {{/if}}
-    {{#if glossary.[1]}}
-        <ul class="term-glossary-group">
-            {{#each glossary}}
-                <li><span class="term-glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
-            {{/each}}
-        </ul>
-    {{else}}
-        <div class="term-glossary-group term-glossary-item">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
-    {{/if}}
-{{/inline}}
-
-{{#*inline "term"}}
-<div class="term-definition">
-    <div class="action-bar">
-        {{#if addable}}
-            <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="img/add_term_kanji.png"></a>
-            <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="img/add_term_kana.png"></a>
-        {{/if}}
-        {{#if playback}}
-            <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="img/play_audio.png"></a>
-        {{/if}}
-    </div>
-
-    {{#if reading}}
-        <div class="term-expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div>
-    {{else}}
-        <div class="term-expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>
-    {{/if}}
-
-    {{#if reasons}}
-        <div class="term-reasons">
-            {{#each reasons}}
-                <span class="reasons">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
-            {{/each}}
-        </div>
-    {{/if}}
-
-    <div class="term-glossary">
-    {{#if grouped}}
-        {{#if definitions.[1]}}
-        <ol>
-            {{#each definitions}}
-                <li>{{> definition}}</li>
-            {{/each}}
-        </ol>
-        {{else}}
-            {{> definition definitions.[0]}}
-        {{/if}}
-    {{else}}
-        {{> definition}}
-    {{/if}}
-    </div>
-</div>
-{{/inline}}
-
-{{#if definitions}}
-    {{#each definitions}}
-        {{#unless @first}}<hr>{{/unless}}
-        {{> term grouped=../grouped addable=../addable playback=../playback}}
-    {{/each}}
-{{else}}
-    <p>No results found</p>
-{{/if}}
diff --git a/tmpl/terms.html b/tmpl/terms.html
new file mode 100644
index 00000000..aae365c7
--- /dev/null
+++ b/tmpl/terms.html
@@ -0,0 +1,71 @@
+{{#*inline "definition"}}
+    {{#if tags}}
+        <div class="term-tags">
+            {{#each tags}}
+                <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span>
+            {{/each}}
+        </div>
+    {{/if}}
+    {{#if glossary.[1]}}
+        <ul class="term-glossary-group">
+            {{#each glossary}}
+                <li><span class="term-glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
+            {{/each}}
+        </ul>
+    {{else}}
+        <div class="term-glossary-group term-glossary-item">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
+    {{/if}}
+{{/inline}}
+
+{{#*inline "term"}}
+<div class="term-definition">
+    <div class="action-bar">
+        {{#if addable}}
+            <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="img/add_term_kanji.png"></a>
+            <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="img/add_term_kana.png"></a>
+        {{/if}}
+        {{#if playback}}
+            <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="img/play_audio.png"></a>
+        {{/if}}
+    </div>
+
+    {{#if reading}}
+        <div class="term-expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div>
+    {{else}}
+        <div class="term-expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>
+    {{/if}}
+
+    {{#if reasons}}
+        <div class="term-reasons">
+            {{#each reasons}}
+                <span class="reasons">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
+            {{/each}}
+        </div>
+    {{/if}}
+
+    <div class="term-glossary">
+    {{#if grouped}}
+        {{#if definitions.[1]}}
+        <ol>
+            {{#each definitions}}
+                <li>{{> definition}}</li>
+            {{/each}}
+        </ol>
+        {{else}}
+            {{> definition definitions.[0]}}
+        {{/if}}
+    {{else}}
+        {{> definition}}
+    {{/if}}
+    </div>
+</div>
+{{/inline}}
+
+{{#if definitions}}
+    {{#each definitions}}
+        {{#unless @first}}<hr>{{/unless}}
+        {{> term grouped=../grouped addable=../addable playback=../playback}}
+    {{/each}}
+{{else}}
+    <p>No results found</p>
+{{/if}}
-- 
cgit v1.2.3