From 46a2f0e87b8467cb5efa1924a977bce2dbd7c819 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 24 Apr 2016 19:50:04 -0700
Subject: WIP

---
 ext/bg/js/templates.js | 19 ++++++++++++-------
 ext/fg/css/frame.css   |  4 ++++
 util/tmpl/kanji.html   |  8 ++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 7896a35c..f3b1ba87 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -17,18 +17,23 @@ templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c
 templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "            <dt>Kunyomi</dt>\n"
+  return "            <dt>Kunyomi:</dt>\n"
     + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"2":function(container,depth0,helpers,partials,data) {
-    return "            <dd>"
+    var stack1;
+
+  return "            <dd>"
     + container.escapeExpression(container.lambda(depth0, depth0))
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</dd>\n";
-},"4":function(container,depth0,helpers,partials,data) {
+},"3":function(container,depth0,helpers,partials,data) {
+    return ", ";
+},"5":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "            <dt>Onyomi</dt>\n"
+  return "            <dt>Onyomi:</dt>\n"
     + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"6":function(container,depth0,helpers,partials,data) {
+},"7":function(container,depth0,helpers,partials,data) {
     return "            <li><span>"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</span></li>\n";
@@ -40,9 +45,9 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + "</div>\n\n    <div class=\"readings\">\n        <dl>\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.onyomi : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.onyomi : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "        </dl>\n    </div>\n\n    <div class=\"glossary\">\n        <ol>\n"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "        </ol>\n    </div>\n</div>\n";
 },"useData":true});
 templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css
index 3f8e3116..6341beb6 100644
--- a/ext/fg/css/frame.css
+++ b/ext/fg/css/frame.css
@@ -97,3 +97,7 @@ li {
 li span {
     color: #000;
 }
+
+dt {
+    font-weight: bold;
+}
diff --git a/util/tmpl/kanji.html b/util/tmpl/kanji.html
index 0e5c8573..d9e7ffcf 100644
--- a/util/tmpl/kanji.html
+++ b/util/tmpl/kanji.html
@@ -4,16 +4,16 @@
     <div class="readings">
         <dl>
             {{#if kunyomi}}
-            <dt>Kunyomi</dt>
+            <dt>Kunyomi:</dt>
             {{#each kunyomi}}
-            <dd>{{.}}</dd>
+            <dd>{{.}}{{#unless @last}}, {{/unless}}</dd>
             {{/each}}
             {{/if}}
 
             {{#if onyomi}}
-            <dt>Onyomi</dt>
+            <dt>Onyomi:</dt>
             {{#each onyomi}}
-            <dd>{{.}}</dd>
+            <dd>{{.}}{{#unless @last}}, {{/unless}}</dd>
             {{/each}}
             {{/if}}
         </dl>
-- 
cgit v1.2.3