Merge branch 'master' into testing

2 files changed, 0 insertions, 240 deletions

diff --git a/tmpl/kanji.html b/tmpl/kanji.html
deleted file mode 100644
index d205cda5..00000000
--- a/tmpl/kanji.html
+++ /dev/null
@@ -1,101 +0,0 @@
-{{#*inline "table"}}
-{{#if data}}
-<table class="info-output">
-    {{#each data}}
-    <tr>
-        <th>{{#if notes}}{{notes}}{{else}}{{name}}{{/if}}</th>
-        <td>{{value}}</td>
-    </tr>
-    {{/each}}
-</table>
-{{else}}
-No data found
-{{/if}}
-{{/inline}}
-
-{{#*inline "kanji"}}
-<div class="entry" data-type="kanji">
-    <div class="actions">
-        {{#if addable}}
-        <a href="#" class="action-view-note pending disabled"><img src="/mixed/img/view-note.svg" title="View added note (Alt + V)" alt></a>
-        <a href="#" class="action-add-note pending disabled" data-mode="kanji"><img src="/mixed/img/add-term-kanji.svg" title="Add Kanji (Alt + K)" alt></a>
-        {{/if}}
-        <img src="/mixed/img/entry-current.svg" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
-    </div>
-
-    <div class="glyph expression-scan-toggle">{{character}}</div>
-
-    {{#if frequencies}}
-    <div>
-        {{#each frequencies}}
-        <span class="label label-default tag-frequency">{{dictionary}}:{{frequency}}</span>
-        {{/each}}
-    </div>
-    {{/if}}
-
-    {{#if tags}}
-    <div>
-        {{#each tags}}
-        <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
-        {{/each}}
-    </div>
-    {{/if}}
-
-    <table class="table table-condensed glyph-data">
-        <tr>
-            <th>Glossary</th>
-            <th>Readings</th>
-            <th>Statistics</th>
-        </tr>
-        <tr>
-            <td class="glossary">
-                {{#if glossary.[1]}}
-                <ol>{{#each glossary}}<li><span class="glossary-item">{{.}}</span></li>{{/each}}</ol>
-                {{else}}
-                <span class="glossary-item">{{glossary.[0]}}</span>
-                {{/if}}
-            </td>
-            <td class="reading">
-                {{#if onyomi}}<dl>{{#each onyomi}}<dd>{{.}}</dd>{{/each}}</dl>{{/if}}
-                {{#if kunyomi}}<dl>{{#each kunyomi}}<dd>{{.}}</dd>{{/each}}</dl>{{/if}}
-            </td>
-            <td>{{> table data=stats.misc}}</td>
-        </tr>
-        <tr>
-            <th colspan="3">Classifications</th>
-        </tr>
-        <tr>
-            <td colspan="3">{{> table data=stats.class}}</td>
-        </tr>
-        <tr>
-            <th colspan="3">Codepoints</th>
-        </tr>
-        <tr>
-            <td colspan="3">{{> table data=stats.code}}</td>
-        </tr>
-        <tr>
-            <th colspan="3">Dictionary Indices</th>
-        </tr>
-        <tr>
-            <td colspan="3">{{> table data=stats.index}}</td>
-        </tr>
-    </table>
-
-    {{#if debug}}
-    <pre>{{#dumpObject}}{{{.}}}{{/dumpObject}}</pre>
-    {{/if}}
-</div>
-{{/inline}}
-
-{{#if definitions}}
-<div class="term-navigation">
-    <a href="#" {{#if source}}class="source-term"{{else}}class="source-term invisible"{{/if}}><img src="/mixed/img/source-term.svg" title="Source term (Alt + B)" alt></a>
-    <a href="#" {{#if next}}class="next-term"{{else}}class="next-term invisible"{{/if}}><img src="/mixed/img/source-term.svg" style="transform: scaleX(-1);" title="Next term (Alt + F)" alt></a>
-</div>
-{{#each definitions}}
-{{#unless @first}}<hr>{{/unless}}
-{{> kanji debug=../debug addable=../addable root=../root}}
-{{/each}}
-{{else}}
-<p class="note">No results found</p>
-{{/if}}
diff --git a/tmpl/terms.html b/tmpl/terms.html
deleted file mode 100644
index d0c142d9..00000000
--- a/tmpl/terms.html
+++ /dev/null
@@ -1,139 +0,0 @@
-{{#*inline "definition"}}
-<div class="dict-{{#sanitizeCssClass}}{{dictionary}}{{/sanitizeCssClass}}">
-    {{#if definitionTags}}
-    <div {{#if compactGlossaries}}class="compact-info"{{/if}}>
-        {{#each definitionTags}}
-        <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
-        {{/each}}
-    </div>
-    {{/if}}
-    {{#if only}}
-    <div {{#if compactGlossaries}}class="compact-info"{{/if}}>
-        (
-        {{~#each only~}}
-        {{{.}}}{{#unless @last}}, {{/unless}}
-        {{/each}}
-        only)
-    </div>
-    {{/if}}
-    {{#if glossary.[1]}}
-    <ul {{#if compactGlossaries}}class="compact-glossary"{{/if}}>
-        {{#each glossary}}
-        <li><span class="glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
-        {{/each}}
-    </ul>
-    {{else}}
-    <div class="glossary-item {{#if compactGlossaries}}compact-glossary{{/if}}">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
-    {{/if}}
-</div>
-{{/inline}}
-
-{{#*inline "term"}}
-<div class="entry" data-type="term">
-    <div class="actions">
-        {{#if addable}}
-        <a href="#" class="action-view-note pending disabled"><img src="/mixed/img/view-note.svg" title="View added note (Alt + V)" alt></a>
-        <a href="#" class="action-add-note pending disabled" data-mode="term-kanji"><img src="/mixed/img/add-term-kanji.svg" title="Add expression (Alt + E)" alt></a>
-        <a href="#" class="action-add-note pending disabled" data-mode="term-kana"><img src="/mixed/img/add-term-kana.svg" title="Add reading (Alt + R)" alt></a>
-        {{/if}}
-        {{#unless merged}}
-        {{#if playback}}
-        <a href="#" class="action-play-audio"><img src="/mixed/img/play-audio.svg" title="Play audio (Alt + P)" alt></a>
-        {{/if}}
-        {{/unless}}
-        <img src="/mixed/img/entry-current.svg" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
-    </div>
-
-    {{#if merged}}
-    {{~#each expressions~}}
-    <div class="expression expression-scan-toggle"><span class="expression-{{termFrequency}}">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</span><div class="peek-wrapper">
-            {{~#if ../playback~}}
-            <a href="#" class="action-play-audio"><img src="/mixed/img/play-audio.svg" title="Play audio" alt></a>
-            {{~/if~}}
-            {{~#if termTags~}}
-            <div class="tags">
-                {{~#each termTags}}
-                <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
-                {{/each~}}
-            </div>
-            {{~/if~}}
-            {{~#if frequencies~}}
-            <div class="frequencies">
-                {{~#each frequencies}}
-                <span class="label label-default tag-frequency">{{dictionary}}:{{frequency}}</span>
-                {{/each~}}
-            </div>
-            {{~/if~}}
-    </div><span class="{{#if @last}}invisible{{/if}}">、</span></div>
-    {{~/each~}}
-    {{else}}
-    <div class="expression expression-scan-toggle">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div>
-    {{#if termTags}}
-    <div style="display: inline-block;">
-        {{#each termTags}}
-        <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
-        {{/each}}
-    </div>
-    {{/if}}
-    {{/if}}
-
-    {{#if reasons}}
-    <div class="reasons">
-        {{#each reasons}}
-        <span class="reasons">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
-        {{/each}}
-    </div>
-    {{/if}}
-
-    {{#if frequencies}}
-    <div>
-        {{#each frequencies}}
-        <span class="label label-default tag-frequency">{{dictionary}}:{{frequency}}</span>
-        {{/each}}
-    </div>
-    {{/if}}
-
-    <div class="glossary">
-        {{#if grouped}}
-        {{#if definitions.[1]}}
-        <ol>
-            {{#each definitions}}
-            <li>{{> definition compactGlossaries=../compactGlossaries}}</li>
-            {{/each}}
-        </ol>
-        {{else}}
-        {{> definition definitions.[0] compactGlossaries=compactGlossaries}}
-        {{/if}}
-        {{else if merged}}
-        {{#if definitions.[1]}}
-        <ol>
-            {{#each definitions}}
-            <li>{{> definition compactGlossaries=../compactGlossaries}}</li>
-            {{/each}}
-        </ol>
-        {{else}}
-        {{> definition definitions.[0] compactGlossaries=compactGlossaries}}
-        {{/if}}
-        {{else}}
-        {{> definition compactGlossaries=compactGlossaries}}
-        {{/if}}
-    </div>
-
-    {{#if debug}}
-    <pre>{{#dumpObject}}{{{.}}}{{/dumpObject}}</pre>
-    {{/if}}
-</div>
-{{/inline}}
-
-{{#if definitions}}
-<div class="term-navigation">
-    <a href="#" {{#if source}}class="source-term"{{else}}class="source-term invisible"{{/if}}><img src="/mixed/img/source-term.svg" title="Source term (Alt + B)" alt></a>
-    <a href="#" {{#if next}}class="next-term"{{else}}class="next-term invisible"{{/if}}><img src="/mixed/img/source-term.svg" style="transform: scaleX(-1);" title="Next term (Alt + F)" alt></a>
-</div>
-{{#each definitions}}
-{{#unless @first}}<hr>{{/unless}}
-{{> term debug=../debug grouped=../grouped merged=../merged addable=../addable playback=../playback compactGlossaries=../compactGlossaries}}
-{{/each}}
-{{else}}
-<p class="note">No results found.</p>
-{{/if}}