alex/yomichan
1
Fork 0
Code Releases Activity

Kanji page cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2016-04-28 20:32:04 -07:00
parent 4ef620d74c
commit 240aca8415
3 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/bg/js/templates.js
View File

@ -19,13 +19,13 @@ templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c
templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) { templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) {
var stack1; var stack1;
return " <dt>Meanings</dt>\n <dd>\n" return " <dt>Meanings</dt>\n <dd>\n"
+ ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ " </dd>\n"; + " </dd>\n";
},"2":function(container,depth0,helpers,partials,data) { },"2":function(container,depth0,helpers,partials,data) {
var stack1; var stack1;
return " " return " "
+ container.escapeExpression(container.lambda(depth0, depth0)) + 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 : "") + ((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 : "")
+ "\n"; + "\n";
@ -34,27 +34,27 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
},"5":function(container,depth0,helpers,partials,data) { },"5":function(container,depth0,helpers,partials,data) {
var stack1; var stack1;
return " <dt>Kunyomi</dt>\n <dd>\n" return " <dt>Kunyomi</dt>\n <dd>\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 : "") + ((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 : "")
+ " </dd>\n"; + " </dd>\n";
},"7":function(container,depth0,helpers,partials,data) { },"7":function(container,depth0,helpers,partials,data) {
var stack1; var stack1;
return " <dt>Onyomi</dt>\n <dd>\n" return " <dt>Onyomi</dt>\n <dd>\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 : "") + ((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 : "")
+ " </dd>\n"; + " </dd>\n";
},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
var stack1, helper, alias1=depth0 != null ? depth0 : {}; var stack1, helper, alias1=depth0 != null ? depth0 : {};
return "<div class=\"definition\">\n <div class=\"kanji-info kanji-glyph\">" return "<div class=\"kanji-definition\">\n <div class=\"kanji-glyph\">"
+ 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))) + 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 <dl class=\"kanji-info\">\n" + "</div>\n <div class=\"kanji-info\">\n <dl>\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "\n" + "\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "\n" + "\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.onyomi : depth0),{"name":"if","hash":{},"fn":container.program(7, 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(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ " </dl>\n</div>\n</div>\n"; + " </dl>\n </div>\n</div>\n</div>\n";
},"useData":true}); },"useData":true});
templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
var helper; var helper;

39
ext/fg/css/frame.css
View File

@ -73,17 +73,6 @@ body {
background-color: #0275d8; background-color: #0275d8;
} }
.kanji-glyph {
font-family: "KanjiStrokeOrders";
font-size: 140px;
line-height: 140px;
vertical-align: top;
}
.kanji-info {
display: inline-block;
}
ol { ol {
padding-left: 1.2em; padding-left: 1.2em;
} }
@ -96,23 +85,25 @@ li span {
color: #000; color: #000;
} }
dl { .kanji-glyph {
padding: 0.5em; float: left;
font-family: "KanjiStrokeOrders";
font-size: 140px;
line-height: 140px;
padding: 0.01em;
vertical-align: top;
} }
dt { .kanji-info {
float: left; display: block;
clear: left; overflow: hidden;
width: 100px; }
text-align: right;
.kanji-info dt {
font-weight: bold; font-weight: bold;
} }
dt:after { .kanji-info dd {
content: ":"; margin-left: 1.2em;
} }
dd {
margin: 0 0 0 110px;
padding: 0 0 0.5em 0;
}

59
util/tmpl/kanji.html
View File

@ -1,33 +1,34 @@
<div class="definition"> <div class="kanji-definition">
<div class="kanji-info kanji-glyph">{{character}}</div> <div class="kanji-glyph">{{character}}</div>
<div class="kanji-info">
<dl>
{{#if glossary}}
<dt>Meanings</dt>
<dd>
{{#each glossary}}
{{.}}{{#unless @last}}, {{/unless}}
{{/each}}
</dd>
{{/if}}
<dl class="kanji-info"> {{#if kunyomi}}
{{#if glossary}} <dt>Kunyomi</dt>
<dt>Meanings</dt> <dd>
<dd> {{#each kunyomi}}
{{#each glossary}} {{.}}{{#unless @last}}, {{/unless}}
{{.}}{{#unless @last}}, {{/unless}} {{/each}}
{{/each}} </dd>
</dd> {{/if}}
{{/if}}
{{#if kunyomi}} {{#if onyomi}}
<dt>Kunyomi</dt> <dt>Onyomi</dt>
<dd> <dd>
{{#each kunyomi}} {{#each onyomi}}
{{.}}{{#unless @last}}, {{/unless}} {{.}}{{#unless @last}}, {{/unless}}
{{/each}} {{/each}}
</dd> </dd>
{{/if}} {{/if}}
</dl>
{{#if onyomi}} </div>
<dt>Onyomi</dt>
<dd>
{{#each onyomi}}
{{.}}{{#unless @last}}, {{/unless}}
{{/each}}
</dd>
{{/if}}
</dl>
</div> </div>
</div> </div>