wip

2 files changed, 10 insertions, 11 deletions

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 4320acb7..dc5df96a 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -61,17 +61,17 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.frequencies : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n    <table class=\"table table-condensed glyph-data\">\n        <tr>\n            <th>Glossary</th>\n            <th>On'Yomi</th>\n            <th>Kun'Yomi</th>\n        </tr>\n        <tr>\n            <td class=\"glossary\">\n"
+    + "\n    <table class=\"table table-condensed glyph-data\">\n        <tr>\n            <th>Glossary</th>\n            <th>Readings</th>\n            <th>Stats</th>\n        </tr>\n        <tr>\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(21, data, 0),"inverse":container.program(24, data, 0),"data":data})) != null ? stack1 : "")
     + "            </td>\n            <td class=\"reading\">\n                <dl>"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(26, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</dl>\n            </td>\n            <td class=\"reading\">\n                <dl>"
+    + "</dl>\n                <dl>"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(26, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</dl>\n            </td>\n        </tr>\n        <tr>\n            <th>Stats</th>\n            <th>Query</th>\n            <th>Code</th>\n        </tr>\n        <tr>\n            <td>"
+    + "</dl>\n            </td>\n            <td>"
     + ((stack1 = container.invokePartial(partials.table,depth0,{"name":"table","hash":{"data":((stack1 = (depth0 != null ? depth0.stats : depth0)) != null ? stack1.misc : stack1)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
-    + "</td>\n            <td>"
+    + "</td>\n        </tr>\n        <tr>\n            <th>Query</th>\n            <th></th>\n            <th>Code</th>\n        </tr>\n        <tr>\n            <td>"
     + ((stack1 = container.invokePartial(partials.table,depth0,{"name":"table","hash":{"data":((stack1 = (depth0 != null ? depth0.stats : depth0)) != null ? stack1.query : stack1)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
-    + "</td>\n            <td>"
+    + "</td>\n            <td></td>\n            <td>"
     + ((stack1 = container.invokePartial(partials.table,depth0,{"name":"table","hash":{"data":((stack1 = (depth0 != null ? depth0.stats : depth0)) != null ? stack1.code : stack1)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "</td>\n        </tr>\n        <tr>\n            <th colspan=\"3\">Dictionary Indices</th>\n        </tr>\n        <tr>\n            <td colspan=\"3\">"
     + ((stack1 = container.invokePartial(partials.table,depth0,{"name":"table","hash":{"data":((stack1 = (depth0 != null ? depth0.stats : depth0)) != null ? stack1.index : stack1)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index 7c801355..405e0d0e 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -47,8 +47,8 @@ No data found
     <table class="table table-condensed glyph-data">
         <tr>
             <th>Glossary</th>
-            <th>On'Yomi</th>
-            <th>Kun'Yomi</th>
+            <th>Readings</th>
+            <th>Stats</th>
         </tr>
         <tr>
             <td class="glossary">
@@ -60,19 +60,18 @@ No data found
             </td>
             <td class="reading">
                 <dl>{{#each onyomi}}<dd>{{.}}</dd>{{/each}}</dl>
-            </td>
-            <td class="reading">
                 <dl>{{#each kunyomi}}<dd>{{.}}</dd>{{/each}}</dl>
             </td>
+            <td>{{> table data=stats.misc}}</td>
         </tr>
         <tr>
-            <th>Stats</th>
             <th>Query</th>
+            <th></th>
             <th>Code</th>
         </tr>
         <tr>
-            <td>{{> table data=stats.misc}}</td>
             <td>{{> table data=stats.query}}</td>
+            <td></td>
             <td>{{> table data=stats.code}}</td>
         </tr>
         <tr>