Compare commits

...

10 Commits

15 changed files with 129 additions and 74 deletions

View File

@ -279,13 +279,12 @@ header {
.header__slim_box {
margin-top: -0.75rem;
padding-bottom: 6em;
background-image: url("../images/wtf-header-bg.jpg");
background-repeat: no-repeat;
background-size: cover;
display: grid;
grid-template-rows: 46px 18px;
grid-template-rows: 46px auto auto;
grid-template-columns: 15% 82px auto 96px 22.5%;
z-index: 0;
}
@ -294,6 +293,7 @@ header {
grid-row: 2 / span 1;
grid-column: 1 / span 3;
background-color: var(--wtf-light-blue);
margin-bottom: 6rem;
z-index: 5;
}
@ -334,7 +334,39 @@ header {
background-size: auto 115%;
background-repeat: no-repeat;
z-index: 10;
margin-bottom: -6em;
padding: 5rem;
}
.slim_box__submenu {
grid-row: 3 / span 1;
grid-column: 1 / span 5;
background-color: var(--wtf-nearly-white);
height: 3.5rem;
text-align: right;
color: var(--wtf-nearly-black);
padding-right: 1rem;
font-size: 3rem;
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-end;
}
.slim_box__submenu a {
font-family: "Noto Serif";
font-size: 2.5rem;
color: black;
margin: 0 0 0.75rem 2rem;
}
.slim_box__submenu a:hover {
text-decoration: underline;
}
.slim_box__submenu a img {
height: 2.25rem;
position: relative;
top: 0.25rem;
}
.bg_box__big_bg {
@ -880,6 +912,12 @@ hr.-even {
box-shadow: 0px -0.25rem 0.5rem -0.25rem var(--wtf-nearly-black);
}
.pod_ctrl_box audio {
width: 100%;
height: auto;
margin-bottom: 1rem;
}
.card__link p {
text-align: right;
margin: 0;

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 44 44" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(0.061147,0,0,0.061147,-14.4442,-14.4442)">
<path d="M944.882,367.809C944.882,295.183 885.919,236.22 813.293,236.22L367.809,236.22C295.183,236.22 236.22,295.183 236.22,367.809L236.22,813.293C236.22,885.919 295.183,944.882 367.809,944.882L813.293,944.882C885.919,944.882 944.882,885.919 944.882,813.293L944.882,367.809ZM668.018,691.942C668.018,711.598 666.076,734.11 662.19,759.479C655.105,808.617 648.82,844.386 643.335,866.783C638.307,887.353 620.937,897.638 591.226,897.638C561.514,897.638 544.144,887.353 539.116,866.783C533.631,844.386 527.346,808.617 520.261,759.479C516.375,734.339 514.433,711.826 514.433,691.942C514.433,653.546 540.03,634.348 591.226,634.348C642.421,634.348 668.018,653.546 668.018,691.942ZM853.83,546.584C853.83,601.437 838.517,651.032 807.891,695.371C777.266,739.71 737.269,771.707 687.902,791.362C686.074,792.048 684.36,791.705 682.76,790.333C681.16,788.962 680.474,787.248 680.703,785.191C682.303,774.221 683.446,766.678 684.131,762.565C685.045,755.251 685.731,749.88 686.188,746.452C686.417,744.395 687.445,743.023 689.274,742.338C725.613,723.825 754.81,697.085 776.866,662.117C798.921,627.148 809.948,588.638 809.948,546.584C809.948,505.445 799.549,467.677 778.751,433.281C757.953,398.884 729.727,372.086 694.073,352.888C658.419,333.69 619.909,325.233 578.541,327.519C550.201,329.119 523.118,336.09 497.291,348.431C471.465,360.773 449.353,376.829 430.955,396.598C412.556,416.368 397.929,439.451 387.073,465.849C376.217,492.247 370.903,519.73 371.132,548.299C371.36,590.352 382.673,628.805 405.071,663.659C427.469,698.513 456.838,724.968 493.177,743.023C494.777,743.709 495.806,745.08 496.263,747.137C496.949,751.937 497.634,757.079 498.32,762.565C498.548,764.621 499.12,768.335 500.034,773.706C500.948,779.077 501.634,783.134 502.091,785.877C502.319,787.934 501.577,789.648 499.863,791.019C498.148,792.39 496.377,792.619 494.549,791.705C460.723,778.449 430.897,759.079 405.071,733.596C379.245,708.112 359.418,677.944 345.591,643.09C331.764,608.236 325.764,571.725 327.593,533.557C329.193,500.874 336.735,469.62 350.219,439.794C363.704,409.968 381.359,384.028 403.186,361.973C425.012,339.918 450.724,321.919 480.322,307.978C509.919,294.036 541.059,286.037 573.741,283.98C611.224,281.695 647.278,287.008 681.903,299.921C716.528,312.835 746.354,331.176 771.38,354.945C796.407,378.714 816.405,407.34 831.375,440.823C846.345,474.305 853.83,509.559 853.83,546.584ZM766.752,546.584C766.752,574.468 760.639,600.579 748.411,624.92C736.184,649.261 719.442,669.545 698.187,685.772C696.359,687.143 694.53,687.371 692.702,686.457C690.874,685.543 689.731,683.943 689.274,681.658C687.902,669.773 684.588,659.26 679.332,650.118C677.732,647.832 678.075,645.547 680.36,643.261C693.616,630.92 704.015,616.407 711.557,599.722C719.099,583.038 722.871,565.326 722.871,546.584C722.871,521.215 716.185,497.903 702.815,476.648C689.445,455.393 671.447,439.223 648.82,428.138C626.194,417.054 601.967,412.882 576.141,415.625C545.744,419.053 519.575,431.966 497.634,454.364C475.693,476.762 463.237,503.16 460.266,533.557C457.981,554.584 460.666,574.696 468.323,593.894C475.979,613.093 487.235,629.548 502.091,643.261C504.376,645.547 504.719,647.832 503.119,650.118C497.634,659.488 494.32,670.116 493.177,682.001C492.72,684.057 491.578,685.543 489.749,686.457C487.921,687.371 486.092,687.143 484.264,685.772C462.552,668.859 445.582,647.947 433.354,623.035C421.127,598.123 415.242,571.382 415.699,542.813C416.385,512.873 424.27,484.99 439.354,459.164C454.438,433.338 474.665,412.597 500.034,396.941C525.403,381.285 552.943,372.772 582.655,371.401C615.566,369.801 646.192,376.657 674.532,391.97C702.872,407.283 725.327,428.71 741.897,456.25C758.467,483.79 766.752,513.902 766.752,546.584ZM668.018,535.614C668.018,556.869 660.533,574.982 645.563,589.952C630.593,604.922 612.481,612.407 591.226,612.407C569.97,612.407 551.858,604.922 536.888,589.952C521.918,574.982 514.433,556.869 514.433,535.614C514.433,514.359 521.918,496.246 536.888,481.276C551.858,466.306 569.97,458.821 591.226,458.821C612.481,458.821 630.593,466.306 645.563,481.276C660.533,496.246 668.018,514.359 668.018,535.614Z" style="fill:rgb(239,125,31);"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 44 44" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(3.62946,0,0,3.62946,0,0)">
<path d="M4,9C4,8.724 3.902,8.488 3.707,8.293C3.512,8.098 3.276,8 3,8C2.724,8 2.488,8.098 2.293,8.293C2.098,8.488 2,8.724 2,9C2,9.276 2.098,9.512 2.293,9.707C2.488,9.902 2.724,10 3,10C3.276,10 3.512,9.902 3.707,9.707C3.902,9.512 4,9.276 4,9ZM6.742,9.734C6.674,8.521 6.215,7.488 5.363,6.637C4.512,5.785 3.479,5.326 2.266,5.258C2.193,5.253 2.13,5.276 2.078,5.328C2.026,5.38 2,5.44 2,5.508L2,6.508C2,6.576 2.022,6.633 2.066,6.68C2.111,6.727 2.167,6.753 2.234,6.758C3.036,6.815 3.724,7.13 4.297,7.703C4.87,8.276 5.185,8.964 5.242,9.766C5.247,9.833 5.273,9.889 5.32,9.934C5.367,9.978 5.424,10 5.492,10L6.492,10C6.56,10 6.62,9.974 6.672,9.922C6.724,9.87 6.747,9.807 6.742,9.734ZM9.742,9.742C9.716,8.94 9.57,8.165 9.305,7.418C9.039,6.671 8.676,5.993 8.215,5.387C7.754,4.78 7.22,4.246 6.613,3.785C6.007,3.324 5.329,2.961 4.582,2.695C3.835,2.43 3.06,2.284 2.258,2.258C2.185,2.253 2.125,2.276 2.078,2.328C2.026,2.38 2,2.44 2,2.508L2,3.508C2,3.576 2.023,3.633 2.07,3.68C2.117,3.727 2.174,3.753 2.242,3.758C3.305,3.794 4.289,4.085 5.195,4.629C6.102,5.173 6.827,5.898 7.371,6.805C7.915,7.711 8.206,8.695 8.242,9.758C8.247,9.826 8.273,9.883 8.32,9.93C8.367,9.977 8.424,10 8.492,10L9.492,10C9.56,10 9.62,9.974 9.672,9.922C9.729,9.875 9.753,9.815 9.742,9.742ZM12,2.25L12,9.75C12,10.37 11.78,10.9 11.34,11.34C10.9,11.78 10.37,12 9.75,12L2.25,12C1.63,12 1.1,11.78 0.66,11.34C0.22,10.9 0,10.37 0,9.75L0,2.25C0,1.63 0.22,1.1 0.66,0.66C1.1,0.22 1.63,0 2.25,0L9.75,0C10.37,0 10.9,0.22 11.34,0.66C11.78,1.1 12,1.63 12,2.25Z" style="fill:rgb(239,125,31);fill-rule:nonzero;"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -1,5 +1,8 @@
_model: aggregator_page
---
# Title und Body werden aktuell nicht gerendert.
title: Aktuelles
---
body: Die neusten Blogposts und Podcastepisoden siehst Du hier, die vollständige Historie findest Du unter [Blog](/blog) und [Podcast](/podcast).

BIN
content/cccamp19.jpg (Stored with Git LFS)

Binary file not shown.

View File

@ -1,14 +0,0 @@
_model: contact_page
---
title: Kontakt
---
body:
WTF Kooperative eG<br>
Forsmannstr. 14 b<br>
22303 Hamburg
**E-Mail:** office@wtf-eg.de
**GnuPG Key:**
[1129A9F509FE1B36287202A2FE8772F9FB5D572F](/gnupg/1129A9F509FE1B36287202A2FE8772F9FB5D572F.asc)

BIN
content/nasa-space-shuttle.jpg (Stored with Git LFS)

Binary file not shown.

View File

@ -1,7 +0,0 @@
_model: image
---
description: STS-57 Endeavour, OV-105, framed by Florida vegetation, lifts off from KSC LC
---
photographer: Unbekannt
---
copyright: 1993, Public domain by NASA

BIN
content/wtf-geld.jpg (Stored with Git LFS)

Binary file not shown.

BIN
content/wtf_camp_2020.jpg (Stored with Git LFS)

Binary file not shown.

View File

@ -1,38 +1,30 @@
{
"Services": {
"href": "/services",
"Was wir tun": {
"href": "/about",
"visible": true,
"list_childs": true,
"list_childs": false,
"items": {
"Kompetenzen": "/services/kompetenzen"
"Kompetenzen": "/about/kompetenzen"
}
},
"Mitglieder": {
"Was geht ab?": {
"href": "/aktuelles",
"visible": true,
"list_childs": false,
"items": {
"Blog": "/blog",
"Podcast": "/podcast"
}
},
"Mitglied werden": {
"href": "/mitglieder",
"visible": true,
"list_childs": true,
"list_childs": false,
"items": {
"Satzung": "/mitglieder/satzung",
"Charta": "/mitglieder/charta",
"Mitglied werden": "/mitglieder/beitreten",
"Meetup": "/mitglieder/meetup"
}
},
"Aktuelles": {
"href": "/aktuelles",
"visible": true,
"list_childs": true,
"items": {
"Blog": "/blog",
"Podcast": "/podcast"
}
},
"Kontakt": {
"href": "/kontakt",
"list_childs": true,
"items": {
"Impressum": "/impressum",
"Datenschutz": "/datenschutz"
}
}
}

View File

@ -1,4 +1,4 @@
{% extends "header_slim.html" %}
{% extends "header_slim_submenu.html" %}
{%- block title -%}{{ this.title }}{%- endblock -%}
{%- block meta_description -%}
{%- if this.meta_description is defined and this.meta_description != "" -%}
@ -8,19 +8,6 @@
{%- endif -%}
{%- endblock -%}
{% block body %}
<div class="content__box">
<div class="content__inner_box">
<h1>{{ this.title }}</h1>
</div>
</div>
<section class="content -odd">
<div class="content__box">
<div class="content__inner_box">
{{ this.body }}
</div>
</div>
</section>
<section class="card_grid -no_pad">
{% set blog_posts = site.get('/blog').children.order_by('-pub_date').limit(3) %}
{% set episodes = site.get('/podcast').children.order_by('-pub_date').limit(3) %}
@ -60,7 +47,18 @@
</div>
<div class="card__body">
<div>
<p>{{ episode.podcast_teaser }} {{ loop.index }}</p>
<p>{{ episode.podcast_teaser }}</p>
</div>
<div class="pod_ctrl_box">
<audio controls class="pod_ctrl_box__audio_controls">
{% if episode.podcastogg -%}
<source src="{{ episode|url(alt='de')}}{{ episode.podcastogg }}" type="audio/ogg">
{%- endif %}
{% if episode.podcastmp3 -%}
<source src="{{ episode|url(alt='de') }}{{ episode.podcastmp3 }}" type="audio/mpeg">
{%- endif %}
Your browser does not support the audio element.
</audio>
</div>
<div class="card__link">
<p><a href="{{ episode.path|url }}">Zur Episode mit Shownotes …</a></a></p>

View File

@ -0,0 +1,43 @@
{% extends "layout.html" %}
{% block header %}
<div class="header__top_box">
<div class="header__logo_box">
<a class="header__homelink" href="{{ '/'|url }}" title="Startseite">
{% if '/images/wtf_logo.svg'|asseturl is defined -%}
<img class="header__logo" src="{{ '/images/wtf_logo.svg'|asseturl }}" style="height: 7rem;">
{%- endif %}
</a>
</div>
<nav class="header__secondary_nav">
<ul class="secondary_nav__navlist">
{% for alt in get_alts(this) %}
{%- if this.alt != alt and not (this.record.path == '/blog' or this.record.path == '/podcast') %}
<li class="secondary_nav__navitem">
<a class="secondary_nav__navlink" href="{{ '.'|url(alt=alt) }}">{{ alt|title|upper }}</a>
</li>
{% endif -%}
{% endfor %}
<li class="secondary_nav__navitem">
<a class="secondary_nav__navlink" href="https://forum.wtf-eg.de/">Login</a>
</li>
</ul>
</nav>
</div>
<div class="header__slim_box">
{% include "blocks/navigation.html" %}
<div class="slim_box__top_bar_left"></div>
<div class="slim_box__top_bar_middle"></div>
<div class="slim_box__top_bar_right"></div>
<div class="slim_box__unicorns"></div>
<div class="slim_box__submenu">
{# TODO: Links für Submenü aus navigation.json ziehen. #}
<a href="/blog">
Blog&nbsp;<img src="{{ 'images/rss_logo_rounded_square.svg'|asseturl }}" alt="Square orange RSS logo with rounded corners" aria-hidden="true">
</a>
<a href="/podcast">
Podcast&nbsp;<img src="{{ 'images/podcast_logo_rounded_square.svg'|asseturl }}" alt="Square orange podcast logo with rounded corners" aria-hidden="true">
</a>
</div>
</div>
{% endblock %}