From 29135ff84ff51dfdbf271490bc53138e306e75d8 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 7 Aug 2016 19:56:50 -0700
Subject: Updating kanji display

---
 tmpl/kanji.html | 58 ++++++++++++++++++++++++++++++---------------------------
 tmpl/term.html  |  4 ----
 2 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'tmpl')

diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index 3e148aae..0a0cfe11 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -9,34 +9,38 @@
 
     <div class="kanji-glyph">{{character}}</div>
 
-    <div class="kanji-info">
-        <dl>
-            {{#if glossary}}
-            <dt>Meanings</dt>
-            <dd>
-                {{#each glossary}}
-                {{.}}{{#unless @last}}, {{/unless}}
-                {{/each}}
-            </dd>
-            {{/if}}
+    <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>
 
-            {{#if kunyomi}}
-            <dt>Kun'yomi</dt>
-            <dd class="kanji-reading">
-                {{#each kunyomi}}
-                {{.}}{{#unless @last}}, {{/unless}}
-                {{/each}}
-            </dd>
-            {{/if}}
+    <div class="kanji-tags">
+        {{#each tags}}
+        <span class="tag tag-{{class}}" title="{{desc}}">{{name}}</span>
+        {{/each}}
+    </div>
 
-            {{#if onyomi}}
-            <dt>On'yomi</dt>
-            <dd class="kanji-reading">
-                {{#each onyomi}}
-                {{.}}{{#unless @last}}, {{/unless}}
-                {{/each}}
-            </dd>
-            {{/if}}
-        </dl>
+    <div class="kanji-glossary">
+        <ol>
+            {{#each glossary}}
+            <li><span>{{.}}</span></li>
+            {{/each}}
+        </ol>
     </div>
 </div>
diff --git a/tmpl/term.html b/tmpl/term.html
index 620b5ace..ca96ab24 100644
--- a/tmpl/term.html
+++ b/tmpl/term.html
@@ -17,21 +17,17 @@
     <div class="term-expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>
     {{/if}}
 
-    {{#if rules}}
     <div class="term-rules">
         {{#each rules}}
         <span class="rule">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
         {{/each}}
     </div>
-    {{/if}}
 
-    {{#if tags}}
     <div class="term-tags">
         {{#each tags}}
         <span class="tag tag-{{class}}" title="{{desc}}">{{name}}</span>
         {{/each}}
     </div>
-    {{/if}}
 
     <div class="term-glossary">
         <ol>
-- 
cgit v1.2.3