Commit 44f95552 authored by gijs's avatar gijs
Browse files

Bugfixes, started new version of the homepage

parent d3ef51d0
......@@ -234,7 +234,8 @@ def generate ():
output(os.path.join(outputdir, 'activities.html'), 'activities.html', { 'events': sorted(events.models, key=datesorter, reverse=True) })
output(os.path.join(outputdir, 'index.html'), 'index.html', { 'events': sorted(events.models, key=datesorter, reverse=True) })
output(os.path.join(outputdir, 'index.new.html'), 'index.new.html', { 'events': sorted(events.models, key=datesorter, reverse=True) })
with open(os.path.join(outputdir, 'debug.html'), 'w', encoding='utf-8') as w:
w.write(make_index(models))
......
......@@ -50,7 +50,7 @@
{% endif %}
{% endblock %}
{% block sidebar-class %}programme-items{% endblock %}
{% block sidebar_class %}programme-items{% endblock %}
{% block sidebar %}
<ul class="programme-item-list">
......
{% extends "page_structure.html" %}
{% block body_classes %}two-columns{% endblock %}
{% block main %}
<main>
<main class="{% block content_class %}{% endblock %}">
{% block content %}
{% endblock %}
</main>
<aside class="{% block sidebar-class %}{% endblock %}">
<aside class="{% block sidebar_class %}{% endblock %}">
{% block sidebar %}
{% endblock %}
</aside>
......
{% extends "generator_base_two_columns.html" %}
{% load generator_utils %}
{% block title %}Caveat{% endblock %}
{% if event.image %}
{% block sidebar_image %}{{ event.image }}{% endblock %}
{% endif %}
{% block content_class %}home event-list{% endblock %}
{% block content %}
{% for event in events %}
<article id="{{ event.key }}" class="event presentation" data-image="{{ event.image }}">
<time datetime="2019-05-24" class="date-header">{{ event.date }}</time>
<h2 class="event-title">{{ event }}</h2>
{{ event.summary }}
{% if event.programmeItems %}
<p><a href="{{ event.link }}" class="read-further">See programme ({{ event.programmeItems.value|length }} events)</a></p>
{% endif %}
</article>
{% endfor %}
{% endblock %}
{% block sidebar_class %}home event-detail{% endblock %}
{% block sidebar %}
{% endblock %}
\ No newline at end of file
......@@ -46,6 +46,7 @@
<section class="long-text">
<h1>{{ note.title }}</h1>
{% with item=note %}{% include "snippets/metadata.html" %}{% endwith %}
{{ note.content }}
</section>
{% endblock %}
......
......@@ -5,6 +5,7 @@
{% block content %}
<section class="long-text">
<h1>{{ page.title }}</h1>
{% with item=page %}{% include "snippets/metadata.html" %}{% endwith %}
{{ page.content }}
</section>
{% endblock %}
\ No newline at end of file
......@@ -73,17 +73,29 @@
{% endfor %}
</ul>
{% endif %}
{% if produser.notes %}
<h2>Notes</h2>
<ul class="simplelist">
{% for note in produser.notes.targets %}
<li>
<a href="{{ note.link }}" class="note">{{ note }}</a>
</li>
{% endfor %}
</ul>
<h2>Notes</h2>
<ul class="simplelist">
{% for note in produser.notes.targets %}
<li>
<a href="{{ note.link }}" class="note">{{ note }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
{% if produser.reflections %}
<h2>Reflections</h2>
<ul class="simplelist">
{% for reflection in produser.reflections.targets %}
<li>
<a href="{{ reflection.link }}" class="reflection">{{ reflection }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
{% if produser.events_participant %}
<h2>Activities (participant)</h2>
<ul class="simplelist">
......
......@@ -12,6 +12,7 @@
</nav>
<section class="long-text">
<h1>{{ reflection.title }}</h1>
{% with item=reflection %}{% include "snippets/metadata.html" %}{% endwith %}
{{ reflection.content }}
</section>
{% endblock %}
\ No newline at end of file
{% if item.tags and item.tags.targets %}
<section class="item--metadata item--tags">
<h4>Tags</h4>
<ul class="inlinelist">
{% for tag in item.tags.targets %}
<li><a href="{{ tag.link }}" class="tag">{{ tag }}</a></li>
{% endfor %}
</ul>
</section>
{% endif %}
{% if item.participant and item.participant.targets or item.produser and item.produser.targets %}
<section class="item--produsers item--metadata ">
<h4>Produsers & Participants</h4>
<ul class="inlinelist">
{% for produser in item.produser.targets %}
<li><a class="produser" href="{{ produser.link }}">{{ produser }}</a></li>
{% endfor %}
{% for participant in item.participant.targets %}
<li><a class="produser" href="{{ participant.link }}">{{ participant }}</a></li>
{% endfor %}
</ul>
</section>
{% endif %}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="39.291061"
height="20.414204"
viewBox="0 0 36.835368 19.138316"
id="svg6298"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="jump-arrow.svg">
<defs
id="defs6300">
<inkscape:path-effect
effect="spiro"
id="path-effect825"
is_visible="true" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6"
inkscape:cx="19.584939"
inkscape:cy="6.8519876"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
borderlayer="true"
inkscape:showpageshadow="false"
fit-margin-top="3"
fit-margin-left="3"
fit-margin-right="1"
fit-margin-bottom="6"
inkscape:window-width="1366"
inkscape:window-height="713"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
units="px"
inkscape:snap-global="false">
<sodipodi:guide
position="-61.91072,198.38076"
orientation="0,1"
id="guide6382"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata6303">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-213.3393,-145.17609)">
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.35052645;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 264.1637,158.74841 c 0.13433,-1.32255 0.73716,-2.59276 1.67679,-3.53313 0.93963,-0.94037 2.20936,-1.5442 3.53181,-1.67957 1.51974,-0.15557 3.09418,0.31578 4.27842,1.28086 1.18424,0.96508 1.96367,2.41198 2.11804,3.93184 -0.11536,-2.43779 0.84921,-4.90715 2.5864,-6.62131 1.73718,-1.71416 4.21918,-2.6457 6.65522,-2.49783 1.76075,0.10688 3.48421,0.76341 4.8698,1.85509 1.3856,1.09168 2.42719,2.61367 2.94311,4.30052"
id="path823"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cacac"
inkscape:path-effect="#path-effect825"
inkscape:original-d="m 264.1637,158.74841 c 0,0 2.75546,-5.08747 5.2086,-5.2127 2.74691,-0.14023 6.39646,5.2127 6.39646,5.2127 0,0 4.92056,-8.87816 9.24162,-9.11914 3.31036,-0.18462 7.81291,6.15561 7.81291,6.15561"
transform="matrix(1.0832889,0,0,1.0832889,-69.286048,-9.604908)" />
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.46301031;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 245.3614,157.87274 c 0,0 0.65476,0.17938 0.96177,0.3206 0.56612,0.26037 1.60297,0.96177 1.60297,0.96177"
id="path827"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cac" />
<path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.46301031;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 247.92614,159.15511 c 0,0 0.24941,-1.24113 0.3847,-1.85945 0.0609,-0.27855 0.19236,-0.83353 0.19236,-0.83353"
id="path829"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cac" />
</g>
</svg>
......@@ -72,10 +72,10 @@
--rose-pale: #ffe1e4;
--red-question: #ff3f00;
--font-size: 1.4em;
--font-size: 15pt;
--font-size-small: 80%;
--font-size-extra-small: 70%;
--line-height: 1.2em;
--line-height: 18.5pt;
}
body {
......@@ -163,7 +163,7 @@ h1.produser:before {
} */
h1 {
font-family: "Junicode-Condensed";
line-height: calc(var(--line-height) * .8);
line-height: .8em;
font-size: 3em;
margin-bottom: 3px;
-webkit-text-stroke-width: 1.5px;
......@@ -176,7 +176,7 @@ h1 {
.breadcrumbs + h1 {
-webkit-text-stroke-width: 0px;
color: var(--bleu-bille);
}
}
h2, h4 {
font-family: "U001";
text-transform: uppercase;
......@@ -256,28 +256,33 @@ main p {
p {
margin-bottom: calc( 0 * var(--line-height));
}
p.page-intro {
font-family: "Junicode-Condensed";
font-size: 1.7em;
line-height: 1em;
margin-bottom: calc(1.5 * var(--line-height));
}
.event-title {
color: red;
font-size: .8em;
line-height: 1.25em;
text-transform: uppercase;
font-weight: bold;
letter-spacing: 0.025em;
font-family: "U001";
margin: 0;
}
.event-title {
font-size: 0.8em;
line-height: 1.3em;
text-transform: uppercase;
font-weight: bold;
letter-spacing: 0.025em;
font-family: "U001";
margin: 0;
.date-header {
font-size: 1.6em;
font-weight: bold;
font-family: "Junicode-Condensed";
line-height: 1.2em;
}
.event-title + p {
margin-top: var(--line-height);
margin-top: calc(.5 * var(--line-height));
}
/*section.event-summary a::before {
content: '';
......@@ -461,7 +466,16 @@ footer p {
margin-bottom: 0;
}
.item--metadata {
margin-bottom: var(--line-height);
}
.item--metadata .inlinelist {
font-size: 90%;
}
ul.simplelist, ul.simplelist > li {
list-style-type: none;
margin-left: 0;
padding-left: 0;
border-bottom: none;
......@@ -472,6 +486,25 @@ ul.simplelist > li:before {
margin: 0;
}
ul.inlinelist, ul.inlinelist > li {
margin: 0;
padding: 0;
}
ul.inlinelist > li {
display: inline-block;
}
ul.inlinelist > li:before {
content: "";
margin: 0;
}
ul.inlinelist > li:after {
content: ',';
display: inline-block;
}
main img, main figure {
width: 33%;
float: left;
......@@ -643,10 +676,9 @@ a.tag {
font-size: 180%;
font-weight: bolder;
line-height: 1em;
-webkit-text-stroke-width: 0.9px;
-webkit-text-stroke-color: var(--red-question);
-webkit-text-stroke: 0.9px var(--red-question);
color: white;
margin: 10px 1em;
margin: calc(0.5 * var(--line-height));
display: block;
}
......@@ -767,15 +799,15 @@ section.audio {
padding-bottom: 20px;
margin-left: 7px;
}
.read-further:hover:after {
background: url(images/jump-arrow-orange.svg) no-repeat;
}
.read-further {
margin-top: .5em;
/*! display: block; */
margin-top: calc(0.5 * var(--line-height));
display: inline-block;
/*! float: right; */
position: absolute;
}
.trajectory-list .read-further {
position: absolute;
right: .5em;
bottom: .5em;
}
......@@ -786,4 +818,30 @@ section.audio {
main > :last-child {
margin-bottom: calc(3 * var(--line-height));
}
\ No newline at end of file
}
main.event-list {
padding: 0;
}
.event-list .event {
border-bottom: 2px solid currentColor;
padding: calc(.5 * var(--line-height)) 1em var(--line-height) 1em;
cursor: pointer;
}
.event-list .event.active,
.event-list .event:hover {
background-color: var(--bleu-bille);
color: white;
}
.event:hover .read-further:after {
background: url(images/jump-arrow-white.svg) no-repeat;
}
.read-further:hover:after,
.event:hover .read-further:hover:after {
background: url(images/jump-arrow-orange.svg) no-repeat;
}
......@@ -95,5 +95,16 @@
{% endfor %}
</ul>
{% endif %}
{% if tag.pages %}
<h3>Notes</h3>
<ul class="simplelist">
{% for link, _, page in tag.pages|link_iterator %}
<li>
<a href="{{ page.link }}#{{ link.id }}" class="page">{% if link.label %}<span class="tag">{{ link.label }}</span> → {% endif %}{{ page }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
{% endblock %}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment