summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2016-04-24 19:23:13 -0700
committerAlex Yatskov <alex@foosoft.net>2016-04-24 19:23:13 -0700
commit6908d9e7e345f46e2b4c635fbfe1fbed924ab5bd (patch)
treead62798e5ab9df57849a7fb6c01fa4b8bc267a40
parent8292be0243c3478845a851aadcbf476660d86d7f (diff)
WIP
Diffstat
-rw-r--r--ext/bg/js/templates.js75
-rw-r--r--ext/fg/css/frame.css4
-rw-r--r--util/tmpl/kanji-list.html4
-rw-r--r--util/tmpl/kanji.html36
-rw-r--r--util/tmpl/term-list.html4
-rw-r--r--util/tmpl/term.html52
6 files changed, 106 insertions, 69 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 1133e41a..f61cc52b 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -14,18 +14,38 @@ templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c
+ container.escapeExpression(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"root","hash":{},"data":data}) : helper)))
+ "/css/frame.css\">\n </head>\n <body>\n";
},"useData":true});
-templates['kanji.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
- var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) {
+ var stack1;
+
+ return " <dl>\n <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 : "")
+ + " </dl>\n";
+},"2":function(container,depth0,helpers,partials,data) {
+ return " <dd>"
+ + container.escapeExpression(container.lambda(depth0, depth0))
+ + "</dd>\n";
+},"4":function(container,depth0,helpers,partials,data) {
+ var stack1;
+
+ return " <dl>\n <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 : "")
+ + " </dl>\n";
+},"6":function(container,depth0,helpers,partials,data) {
+ return " <li><span>"
+ + container.escapeExpression(container.lambda(depth0, depth0))
+ + "</span></li>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+ var stack1, helper, alias1=depth0 != null ? depth0 : {};
- return "<div class=\"kanji\">"
- + alias4(((helper = (helper = helpers.character || (depth0 != null ? depth0.character : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"character","hash":{},"data":data}) : helper)))
- + "</div>\n\n<div class=\"reading\">\n "
- + alias4(((helper = (helper = helpers.kunyomi || (depth0 != null ? depth0.kunyomi : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"kunyomi","hash":{},"data":data}) : helper)))
- + "\n</div>\n\n<div class=\"reading\">\n "
- + alias4(((helper = (helper = helpers.onyomi || (depth0 != null ? depth0.onyomi : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"onyomi","hash":{},"data":data}) : helper)))
- + "\n</div>\n\n<div class=\"glossary\">\n "
- + alias4(((helper = (helper = helpers.glossary || (depth0 != null ? depth0.glossary : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"glossary","hash":{},"data":data}) : helper)))
- + "\n</div>\n";
+ return "<div class=\"definition\">\n <div class=\"kanji\">"
+ + 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 class=\"readings\">\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 : "")
+ + " </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 : "")
+ + " </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) {
var helper;
@@ -37,9 +57,7 @@ templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":functi
templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,partials,data) {
var stack1;
- return "<div class=\"definition\">\n"
- + ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
- + "</div>\n";
+ return ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
var stack1;
@@ -49,7 +67,7 @@ templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,p
},"usePartial":true,"useData":true});
templates['term.html'] = template({"1":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer =
- "<div class=\"term\"><ruby>";
+ " <div class=\"term\"><ruby>";
stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper));
if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
@@ -62,7 +80,7 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"expression","hash":{},"data":data}) : helper)));
},"4":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
- "<div class=\"term\">";
+ " <div class=\"term\">";
stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
@@ -70,13 +88,13 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
},"6":function(container,depth0,helpers,partials,data) {
var stack1;
- return "<div class=\"rules\">\n"
+ return " <div class=\"rules\">\n"
+ ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.rules : depth0),{"name":"each","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + "</div>\n";
+ + " </div>\n";
},"7":function(container,depth0,helpers,partials,data) {
var stack1;
- return " <span class=\"rule\">"
+ return " <span class=\"rule\">"
+ container.escapeExpression(container.lambda(depth0, depth0))
+ "</span> "
+ ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -86,13 +104,13 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
},"10":function(container,depth0,helpers,partials,data) {
var stack1;
- return "<div class=\"tags\">\n"
+ return " <div class=\"tags\">\n"
+ ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + "</div>\n";
+ + " </div>\n";
},"11":function(container,depth0,helpers,partials,data) {
var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
- return " <span class=\"tag tag-"
+ return " <span class=\"tag tag-"
+ alias4(((helper = (helper = helpers["class"] || (depth0 != null ? depth0["class"] : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"class","hash":{},"data":data}) : helper)))
+ "\" title=\""
+ alias4(((helper = (helper = helpers.desc || (depth0 != null ? depth0.desc : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"desc","hash":{},"data":data}) : helper)))
@@ -100,27 +118,26 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
+ alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+ "</span>\n";
},"13":function(container,depth0,helpers,partials,data) {
- return " <li><span>"
+ return " <li><span>"
+ container.escapeExpression(container.lambda(depth0, depth0))
+ "</span></li>\n";
},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
var stack1, alias1=depth0 != null ? depth0 : {};
- return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
+ return "<div class=\"definition\">\n"
+ + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
+ "\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"if","hash":{},"fn":container.program(6, 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(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + "\n<div class=\"glossary\">\n <ol>\n"
+ + "\n <div class=\"glossary\">\n <ol>\n"
+ ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + " </ol>\n</div>\n";
+ + " </ol>\n </div>\n</div>\n";
},"useData":true});
templates['term-list.html'] = template({"1":function(container,depth0,helpers,partials,data) {
var stack1;
- return "<div class=\"definition\">\n"
- + ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
- + "</div>\n";
+ return ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
var stack1;
diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css
index 893f4e4a..d9ffde84 100644
--- a/ext/fg/css/frame.css
+++ b/ext/fg/css/frame.css
@@ -43,6 +43,10 @@ body {
display: inline-block;
}
+.kanji {
+ font-size: 82px;
+}
+
.tag {
border-radius: 0.25em;
color: #fff;
diff --git a/util/tmpl/kanji-list.html b/util/tmpl/kanji-list.html
index b0e43634..542a5e2f 100644
--- a/util/tmpl/kanji-list.html
+++ b/util/tmpl/kanji-list.html
@@ -1,7 +1,5 @@
{{> header.html}}
{{#each defs}}
-<div class="definition">
- {{> kanji.html}}
-</div>
+{{> kanji.html}}
{{/each}}
{{> footer.html}}
diff --git a/util/tmpl/kanji.html b/util/tmpl/kanji.html
index 66e4647e..0e85e966 100644
--- a/util/tmpl/kanji.html
+++ b/util/tmpl/kanji.html
@@ -1,13 +1,31 @@
-<div class="kanji">{{character}}</div>
+<div class="definition">
+ <div class="kanji">{{character}}</div>
-<div class="reading">
- {{kunyomi}}
-</div>
+ <div class="readings">
+ {{#if kunyomi}}
+ <dl>
+ <dt>Kunyomi</dt>
+ {{#each kunyomi}}
+ <dd>{{.}}</dd>
+ {{/each}}
+ </dl>
+ {{/if}}
-<div class="reading">
- {{onyomi}}
-</div>
+ {{#if onyomi}}
+ <dl>
+ <dt>Onyomi</dt>
+ {{#each onyomi}}
+ <dd>{{.}}</dd>
+ {{/each}}
+ </dl>
+ {{/if}}
+ </div>
-<div class="glossary">
- {{glossary}}
+ <div class="glossary">
+ <ol>
+ {{#each glossary}}
+ <li><span>{{.}}</span></li>
+ {{/each}}
+ </ol>
+ </div>
</div>
diff --git a/util/tmpl/term-list.html b/util/tmpl/term-list.html
index 9e55a80e..6206f323 100644
--- a/util/tmpl/term-list.html
+++ b/util/tmpl/term-list.html
@@ -1,7 +1,5 @@
{{> header.html}}
{{#each defs}}
-<div class="definition">
- {{> term.html}}
-</div>
+{{> term.html}}
{{/each}}
{{> footer.html}}
diff --git a/util/tmpl/term.html b/util/tmpl/term.html
index 054f7510..00a9d156 100644
--- a/util/tmpl/term.html
+++ b/util/tmpl/term.html
@@ -1,29 +1,31 @@
-{{#if reading}}
-<div class="term"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div>
-{{else}}
-<div class="term">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>
-{{/if}}
+<div class="definition">
+ {{#if reading}}
+ <div class="term"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div>
+ {{else}}
+ <div class="term">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>
+ {{/if}}
-{{#if rules}}
-<div class="rules">
- {{#each rules}}
- <span class="rule">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
- {{/each}}
-</div>
-{{/if}}
-
-{{#if tags}}
-<div class="tags">
- {{#each tags}}
- <span class="tag tag-{{class}}" title="{{desc}}">{{name}}</span>
- {{/each}}
-</div>
-{{/if}}
+ {{#if rules}}
+ <div class="rules">
+ {{#each rules}}
+ <span class="rule">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
+ {{/each}}
+ </div>
+ {{/if}}
-<div class="glossary">
- <ol>
- {{#each glossary}}
- <li><span>{{.}}</span></li>
+ {{#if tags}}
+ <div class="tags">
+ {{#each tags}}
+ <span class="tag tag-{{class}}" title="{{desc}}">{{name}}</span>
{{/each}}
- </ol>
+ </div>
+ {{/if}}
+
+ <div class="glossary">
+ <ol>
+ {{#each glossary}}
+ <li><span>{{.}}</span></li>
+ {{/each}}
+ </ol>
+ </div>
</div>