Skip to content

Commit 28c676f

Browse files
white-geckowhite-gecko
committed
Rework layout
1 parent b652d04 commit 28c676f

9 files changed

+274
-142
lines changed

‎_includes/filter.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="segment">
1+
<div class="segment" style="padding-top: 1em">
22
<span class="he">
33
<dd><input type="text" id="inputFilter" /></dd>
44
<div class="alphabet">
@@ -33,7 +33,7 @@
3333
</div>
3434
</span>
3535
<span class="en">
36-
<p>Filter</p>
36+
<p class="proplabel">Filter</p>
3737
</span>
3838
<div class="clearfix"></div>
3939
</div>

‎_includes/representation.html

+12-16
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22
{% assign vocalized = representation | rdf_property: "heb_schema:vocalizedRepresentation" %}
33
{% assign unvocalized = representation | rdf_property: "heb_schema:unvocalizedRepresentation" %}
44

5-
<dl>
6-
{% if orthographic %}
7-
<dt>Orthographic Representation</dt>
8-
<dd class="representation">{{ orthographic }}</dd>
9-
{% endif %}
10-
11-
{% if vocalized %}
12-
<dt>Vocalized Representation</dt>
13-
<dd class="representation">{{ vocalized }}</dd>
14-
{% endif %}
15-
16-
{% if unvocalized %}
17-
<dt>Unvocalized Representation</dt>
18-
<dd class="representation">{{ unvocalized }}</dd>
19-
{% endif %}
20-
</dl>
5+
{% if orthographic %}
6+
<p class="he representation">{{ orthographic }}</p>
7+
<p class="en proplabel">Orthographic Representation</p>
8+
{% endif %}
9+
{% if vocalized %}
10+
<p class="he representation">{{ vocalized }}</p>
11+
<p class="en proplabel">Vocalized Representation</p>
12+
{% endif %}
13+
{% if unvocalized %}
14+
<p class="he representation">{{ unvocalized }}</p>
15+
<p class="en proplabel">Unvocalized Representation</p>
16+
{% endif %}

‎_includes/sense.html

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{% assign definition = sense | rdf_property: "mmoon:senseDefinition" %}
22
{% assign language = sense | rdf_property: "dc:language" %}
33

4-
<dl>
5-
{% if definition %}
6-
<dt>Definition {% if language %}({{ language }}){% endif %}</dt>
7-
<dd>{{ definition }}</dd>
8-
{% endif %}
9-
</dl>
4+
{% if definition %}
5+
<dt class="proplabel">Definition {% if language %}({{ language }}){% endif %}</dt>
6+
<dd>{{ definition }}</dd>
7+
{% endif %}

‎_layouts/binyan.html

+19-13
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,31 @@
44
title: "Binyan"
55
---
66

7-
<div class="post">
8-
<header class="post-header">
9-
<h1>{{ page.rdf | rdf_property: "rdfs:label", nil, true | join: ", " }}</h1>
10-
</header>
11-
12-
{% include filter.html %}
13-
147
{% capture word_query %}
158
SELECT ?word ?label WHERE {
169
?word mmoon:consistsOfMorph ?resourceUri ;
1710
rdfs:label ?label .
1811
} ORDER BY ?label
1912
{% endcapture %}
2013

21-
{% assign results = page.rdf | sparql_query: word_query %}
22-
<ul>
23-
{% for row in results %}
24-
<li><a href="{{ row.word.page_url | prepend: site.baseurl }}">{{ row.label }}</a></li>
25-
{% endfor %}
26-
</ul>
14+
<div class="segment">
15+
<div class="he">
16+
<h1>{{ page.rdf | rdf_property: "rdfs:label", "he", true | join: ", " }}</h1>
17+
</div>
18+
<div class="en">
19+
<h1>{{ page.rdf | rdf_property: "rdfs:label", "en", true | join: ", " }}</h1>
20+
</div>
21+
<div class="clearfix"></div>
22+
</div>
23+
24+
{% include filter.html %}
2725

26+
{% assign results = page.rdf | sparql_query: word_query %}
27+
<div class="segment">
28+
<ul class="he">
29+
{% for row in results %}
30+
<li><a href="{{ row.word.page_url | prepend: site.baseurl }}">{{ row.label }}</a></li>
31+
{% endfor %}
32+
</div>
33+
<div class="clearfix"></div>
2834
</div>

‎_layouts/lexeme.html

+132-52
Original file line numberDiff line numberDiff line change
@@ -4,82 +4,162 @@
44
title: "Lexeme"
55
---
66

7-
{% assign inflections = page.rdf | rdf_property: "mmoon:hasInflectionalCategory", nil, true %}
8-
{% assign representations = page.rdf | rdf_property: "mmoon:hasRepresentation", nil, true %}
9-
{% assign senses = page.rdf | rdf_property: "mmoon:hasSense", nil, true %}
107
{% assign wordclasses = page.rdf | rdf_property: "mmoon:hasWordclassAffiliation", nil, true %}
8+
{% assign inflections = page.rdf | rdf_property: "mmoon:hasInflectionalCategory", nil, true %}
119
{% assign mmoon_morphs = page.rdf | rdf_property: "mmoon:consistsOfMorph", nil, true %}
1210
{% assign heb_schema_morphs = page.rdf | rdf_property: "heb_schema:consistsOfMorph", nil, true %}
11+
{% assign representations = page.rdf | rdf_property: "mmoon:hasRepresentation", nil, true %}
12+
{% assign senses = page.rdf | rdf_property: "mmoon:hasSense", nil, true %}
1313

14-
{% assign lemon_sense = page.rdf | rdf_property: "lemon:sense", nil, true %}
1514
{% assign seeAlso = page.rdf | rdf_property: "rdfs:seeAlso", nil, true %}
15+
{% assign lemon_sense = page.rdf | rdf_property: "lemon:sense", nil, true %}
1616

17-
<div class="post">
18-
<header class="post-header">
19-
{% if wordclasses.first %}
20-
<div>
21-
<em>Wordclass Affiliation: </em>
17+
18+
<div class="segment">
19+
<h1 class="he">{{ page.rdf | rdf_property: "rdfs:label" }}</h1>
20+
<div class="clearfix"></div>
21+
</div>
22+
23+
{% if wordclasses.first %}
24+
<div class="segment">
25+
<div class="he">
26+
<p class="proplabel propheading">חלק דיבר</p>
27+
{% for class in wordclasses %}
28+
<p>{{ class | rdf_property: "rdfs:label", "he" }}</p>
29+
{% endfor %}
30+
</div>
31+
<div class="en">
32+
<p class="proplabel propheading">Wordclass Affiliation (mmoon:hasWordclassAffiliation)</p>
33+
<p>
2234
{% for class in wordclasses %}
23-
<strong>{{ class | rdf_property: "rdfs:label", "en" }}/{{ class | rdf_property: "rdfs:label", "he" }}</strong>
35+
{{ class | rdf_property: "rdfs:label", "en" }}
2436
{% endfor %}
25-
</div>
26-
{% endif %}
27-
<h1>{{ page.rdf | rdf_property: "rdfs:label" }}</h1>
28-
</header>
37+
</p>
38+
</div>
39+
<div class="clearfix"></div>
40+
</div>
41+
{% endif %}
2942

3043
{% if inflections.first %}
31-
<div>
32-
{% for category in inflections %}
33-
<strong>{{ category | rdf_property: "rdfs:label", "en" }}/{{ category | rdf_property: "rdfs:label", "he" }}</strong>
34-
{% endfor %}
35-
<em>Inflection Category</em>
44+
<div class="segment">
45+
<div class="he">
46+
<p class="proplabel propheading"></p>
47+
</div>
48+
<div class="en">
49+
<p class="proplabel propheading">Inflection Category (mmoon:hasInflectionalCategory)</p>
50+
</div>
51+
<div class="clearfix"></div>
52+
<div class="he">
53+
<p>
54+
{% for category in inflections %}
55+
{{ category | rdf_property: "rdfs:label", "he" }}
56+
{% endfor %}
57+
</p>
58+
</div>
59+
<div class="en">
60+
<p>
61+
{% for category in inflections %}
62+
{{ category | rdf_property: "rdfs:label", "en" }}
63+
{% endfor %}
64+
</p>
65+
</div>
66+
<div class="clearfix"></div>
3667
</div>
3768
{% endif %}
3869

3970
{% if mmoon_morphs.first or heb_schema_morphs.first %}
40-
<div>
41-
<dt>Morph (heb_schema:consistsOfMorph and mmoon:consistsOfMorph)</dt>
71+
<div class="segment">
72+
<div class="he">
73+
<ul>
4274
{% for morph in mmoon_morphs %}
43-
<dd class="representation"><a href="{{ morph.page_url | prepend: site.baseurl }}">{{ morph | rdf_property: "rdfs:label", "he" }}</a></dd>
75+
<li class="representation"><a href="{{ morph.page_url | prepend: site.baseurl }}">{{ morph | rdf_property: "rdfs:label", "he" }}</a></li>
4476
{% endfor %}
4577
{% for morph in heb_schema_morphs %}
46-
<dd class="representation"><a href="{{ morph.page_url | prepend: site.baseurl }}">{{ morph | rdf_property: "rdfs:label" }}</a></dd>
78+
<li class="representation"><a href="{{ morph.page_url | prepend: site.baseurl }}">{{ morph | rdf_property: "rdfs:label", "he" }}</a></li>
4779
{% endfor %}
80+
</ul>
81+
</div>
82+
<div class="en">
83+
<p class="proplabel propheading">Morphs (heb_schema:consistsOfMorph and mmoon:consistsOfMorph)</p>
84+
</div>
85+
<div class="clearfix"></div>
4886
</div>
4987
{% endif %}
5088

89+
{% if representations.first %}
90+
<div class="segment">
91+
<div class="he">
92+
<p class="proplabel propheading"></p>
93+
</div>
94+
<div class="en">
95+
<p class="proplabel propheading">Representations (mmoon:hasRepresentation)</p>
96+
</div>
97+
<div class="clearfix"></div>
98+
{% for representation in representations %}
99+
{% include representation.html representation=representation %}
100+
<div class="clearfix"></div>
101+
{% endfor %}
102+
</div>
103+
{% endif %}
51104

105+
{% if senses.first %}
106+
<div class="segment">
107+
<div class="he">
108+
<p class="proplabel propheading"></p>
109+
</div>
110+
<div class="en">
111+
<p class="proplabel propheading">Sense (mmoon:hasSense)</p>
112+
</div>
113+
<div class="clearfix"></div>
114+
<div class="he">
115+
</div>
116+
<div class="en">
117+
{% for sense in senses %}
52118
<dl>
53-
{% if representations.first %}
54-
<dt>Representation</dt>
55-
{% for representation in representations %}
56-
<dd>{% include representation.html representation=representation %}</dd>
57-
{% endfor %}
58-
{% endif %}
59-
60-
{% if senses.first %}
61-
<dt>Sense</dt>
62-
{% for sense in senses %}
63-
<dd>{% include sense.html sense=sense %}</dd>
64-
{% endfor %}
65-
{% endif %}
66-
67-
{% if seeAlso.first %}
68-
<dt>See Also</dt>
69-
{% for link in seeAlso %}
70-
<a href="{{link}}">{{ link | url_decode }}</a>,
71-
{% endfor %}
72-
{% endif %}
73-
74-
{% if lemon_sense.first %}
75-
<dt>Lemon Links</dt>
76-
{% for lemon_link in lemon_sense %}
77-
<a href="{{ lemon_link }}">{{ lemon_link | url_decode }}</a>,
78-
{% endfor %}
79-
{% endif %}
80-
119+
{% include sense.html sense=sense %}
81120
</dl>
121+
{% endfor %}
122+
</div>
123+
<div class="clearfix"></div>
124+
</div>
125+
{% endif %}
82126

127+
{% if seeAlso.first %}
128+
<div class="segment">
129+
<div class="he">
130+
<p class="proplabel propheading"></p>
131+
</div>
132+
<div class="en">
133+
<p class="proplabel propheading">See Also (rdfs:seeAlso)</p>
134+
</div>
135+
<div class="clearfix"></div>
136+
<div class="he">
137+
</div>
138+
<div class="en">
139+
{% for link in seeAlso %}
140+
<a href="{{link}}">{{ link | url_decode }}</a>{% unless forloop.last %}, {% endunless %}
141+
{% endfor %}
142+
</div>
143+
<div class="clearfix"></div>
144+
</div>
145+
{% endif %}
83146

84-
147+
{% if lemon_sense.first %}
148+
<div class="segment">
149+
<div class="he">
150+
<p class="proplabel propheading"></p>
151+
</div>
152+
<div class="en">
153+
<p class="proplabel propheading">Lemon Links (lemon:sense)</p>
154+
</div>
155+
<div class="clearfix"></div>
156+
<div class="he">
157+
</div>
158+
<div class="en">
159+
{% for lemon_link in lemon_sense %}
160+
<a href="{{ lemon_link }}">{{ lemon_link | url_decode }}</a>{% unless forloop.last %}, {% endunless %}
161+
{% endfor %}
162+
</div>
163+
<div class="clearfix"></div>
85164
</div>
165+
{% endif %}

0 commit comments

Comments
 (0)