style fixes

2 files changed, 12 insertions, 16 deletions

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 70af31ea..a8fc87b6 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -31,10 +31,10 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + container.escapeExpression(((helper = (helper = helpers.character || (depth0 != null ? depth0.character : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"character","hash":{},"data":data}) : helper)))
     + "</div>\n\n    <div>\n"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </div>\n\n    <table class=\"table table-condensed glyph-data\">\n        <tr>\n            <th>Readings</th>\n            <th>Glossary</th>\n            <th>Statistics</th>\n        </tr>\n        <tr>\n            <td class=\"reading\">\n"
+    + "    </div>\n\n    <table class=\"table table-condensed glyph-data\">\n        <tr>\n            <th>Readings</th>\n            <th>Glossary</th>\n            <th>Statistics</th>\n        </tr>\n        <tr>\n            <td class=\"reading\">\n                <dl>\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"if","hash":{},"fn":container.program(8, 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(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "            </td>\n            <td class=\"glossary\">\n"
+    + "                </dl>\n            </td>\n            <td class=\"glossary\">\n"
     + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(13, data, 0),"inverse":container.program(16, data, 0),"data":data})) != null ? stack1 : "")
     + "            </td>\n            <td></td>\n        </tr>\n    </table>\n\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.debug : depth0),{"name":"if","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -56,9 +56,8 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 },"8":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "                <dl>\n                    <dt>Kun</dt>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "                </dl>\n";
+  return "                    <dt>Kun-Yomi</dt>\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"9":function(container,depth0,helpers,partials,data) {
     return "                    <dd>"
     + container.escapeExpression(container.lambda(depth0, depth0))
@@ -66,9 +65,8 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 },"11":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "                <dl>\n                    <dt>On</dt>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "                </dl>\n";
+  return "                    <dt>On-Yomi</dt>\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"13":function(container,depth0,helpers,partials,data) {
     var stack1;
 
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index f66b707e..9ab5b2a8 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -27,22 +27,20 @@
         </tr>
         <tr>
             <td class="reading">
-                {{#if kunyomi}}
                 <dl>
-                    <dt>Kun</dt>
+                    {{#if kunyomi}}
+                    <dt>Kun-Yomi</dt>
                     {{#each kunyomi}}
                     <dd>{{.}}</dd>
                     {{/each}}
-                </dl>
-                {{/if}}
-                {{#if onyomi}}
-                <dl>
-                    <dt>On</dt>
+                    {{/if}}
+                    {{#if onyomi}}
+                    <dt>On-Yomi</dt>
                     {{#each onyomi}}
                     <dd>{{.}}</dd>
                     {{/each}}
+                    {{/if}}
                 </dl>
-                {{/if}}
             </td>
             <td class="glossary">
                 {{#if glossary.[1]}}