Merge branch 'main' into sondernewsletter-oktober-2023
All checks were successful
continuous-integration/drone/pr Build is passing

This commit is contained in:
muli 2023-11-21 21:55:58 +01:00
commit 0646dcc92e
16 changed files with 210 additions and 31 deletions

View File

@ -879,6 +879,27 @@ hr.-even {
}
/* services_cards - end */
/* portfolio_cards - start */
.portfolio_box {
display: grid;
grid-template-columns: 1fr 3fr;
grid-template-rows: 1fr;
grid-template-areas: "heading cards";
margin-bottom: 3rem;
}
.portfolio_box h1 {
margin-right: 1.5rem;
color: transparent;
background-image: url("../images/headings/portfolio.svg");
background-repeat: no-repeat;
background-size: contain;
background-position: left;
grid-area: heading;
}
/* portfolio_cards - end */
/* bubble_gird - start */
.bubble_grid {
margin: 0 1.5rem 0 1.5rem;
@ -1436,12 +1457,12 @@ footer {
padding-top: 0;
}
.services_box {
.services_box, .portfolio_box {
display: block;
margin: 0 1.5rem 3rem 1.5rem;
}
.services_box h1 {
.services_box h1, .portfolio_box h1 {
color: var(--wtf-orange);
background-image: unset;
margin-bottom: 1rem;
@ -1653,12 +1674,12 @@ footer {
padding-top: 0;
}
.services_box {
.services_box, .portfolio_box {
display: block;
margin: 0 1.5rem 3rem 1.5rem;
}
.services_box h1 {
.services_box h1, .portfolio_box h1 {
color: var(--wtf-orange);
background-image: unset;
margin-bottom: 1rem;
@ -1970,12 +1991,12 @@ footer {
margin-top: 1.5rem;
}
.services_box {
.services_box, .portfolio_box {
display: block;
margin: 0 1.5rem 3rem 1.5rem;
}
.services_box h1 {
.services_box h1, .portfolio_box h1 {
color: var(--wtf-orange);
background-image: unset;
margin-bottom: 1rem;

BIN
assets/dokumente/wtf-go-aufsichtsrat.pdf (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/dokumente/wtf-go-vorstand.pdf (Stored with Git LFS) Normal file

Binary file not shown.

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 98 509" 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(6.12323e-17,-1,1,6.12323e-17,-168.718,532.817)">
<text x="20px" y="264.971px" style="font-family:'NotoSerif', 'Noto Serif', serif;font-size:125px;fill:rgb(239,124,33);">Portfolio</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 679 B

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 512 591" 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(1,0,0,1,-39.5594,1.13687e-13)">
<path d="M295.276,-0L550.992,147.638L550.992,442.913L295.276,590.551L39.559,442.913L39.559,147.638L295.276,-0ZM295.276,111.031C282.25,111.031 228.398,138.235 190.806,143.364C182.231,143.322 166.019,191.921 130.987,208.188L185.4,267.532L185.4,287.221C178.271,287.098 171.994,290.131 167.526,294.31C162.884,298.651 159.794,304.204 159.213,310.395L159.083,311.779L159.451,313.122C159.451,313.122 162.622,324.754 167.351,336.329C169.715,342.116 172.409,347.9 175.748,352.667C177.417,355.051 179.223,357.229 181.736,359.026C182.338,359.456 183.203,359.711 183.938,360.075C184.636,363.474 186.345,372.007 189.597,385.611C193.435,401.662 197.783,419.027 202.716,428.742L203.082,429.461L203.588,430.086C203.588,430.086 217.156,446.876 234.964,463.741C243.869,472.174 253.848,480.67 264.032,487.241C274.215,493.813 284.577,498.743 295.276,498.743C305.974,498.743 316.336,493.813 326.52,487.241C336.703,480.67 346.682,472.174 355.586,463.741C373.394,446.876 386.964,430.086 386.964,430.086L387.47,429.461L387.834,428.742C392.767,419.027 397.117,401.662 400.954,385.611C404.206,372.007 405.916,363.474 406.613,360.075C407.348,359.711 408.214,359.456 408.816,359.026C411.329,357.229 413.133,355.051 414.802,352.667C418.141,347.9 420.837,342.116 423.201,336.329C427.929,324.754 431.1,313.122 431.1,313.122L431.468,311.779L431.337,310.395C430.756,304.204 427.667,298.651 423.025,294.31C418.557,290.131 412.279,287.098 405.151,287.221L405.151,267.532L459.564,208.188C424.533,191.921 408.321,143.322 399.745,143.364C362.153,138.235 308.302,111.031 295.276,111.031ZM184.876,302.453C185.049,302.451 185.224,302.454 185.4,302.462L185.4,302.488C185.4,302.488 232.179,333.456 295.276,333.456C358.372,333.456 405.151,302.488 405.151,302.488L405.151,302.462C407.96,302.33 410.509,303.466 412.619,305.439C414.421,307.125 415.448,309.301 415.856,310.908C415.181,313.277 412.795,321.499 409.091,330.566C406.954,335.797 404.451,340.879 402.319,343.923C401.418,345.21 400.743,345.837 400.318,346.212L394.223,344.894L392.693,352.466C392.693,352.466 389.894,366.323 386.13,382.069C382.429,397.548 377.368,415.245 374.431,421.294C373.457,422.489 361.384,437.256 345.104,452.674C336.631,460.699 327.199,468.662 318.255,474.434C309.311,480.206 300.829,483.502 295.276,483.502C289.722,483.502 281.24,480.206 272.295,474.434C263.351,468.662 253.92,460.699 245.446,452.674C229.166,437.256 217.093,422.489 216.119,421.294C213.182,415.245 208.121,397.548 204.42,382.069C200.656,366.323 197.857,352.466 197.857,352.466L196.328,344.894L190.233,346.212C189.808,345.837 189.133,345.21 188.232,343.923C186.101,340.879 183.597,335.797 181.46,330.566C177.756,321.499 175.371,313.277 174.696,310.908C175.103,309.301 176.13,307.125 177.933,305.439C179.91,303.59 182.274,302.476 184.876,302.452L184.876,302.453ZM189.027,316.507L205.455,333.232C205.455,333.232 217.46,334.869 218.184,341.079C208.305,340.691 225.202,390.909 225.202,390.909C228.547,411.441 280.262,385.621 280.262,385.621C286.484,385.311 291.845,358.41 284.865,356.583C284.988,353.146 288.691,353.823 296.228,353.823C303.764,353.823 307.468,353.146 307.591,356.583C300.611,358.41 305.971,385.311 312.194,385.621C312.194,385.621 363.909,411.441 367.255,390.909C367.255,390.909 384.151,340.691 374.272,341.079C374.996,334.869 387.001,333.232 387.001,333.232L403.428,316.507C403.428,316.507 346.174,346.563 296.228,346.563C246.282,346.563 189.027,316.507 189.027,316.507ZM333.486,253.13C370.166,257.349 389.909,266.578 389.909,266.578L389.909,295.157C389.909,295.157 372.36,287.538 339.731,283.277L333.486,253.13ZM257.017,253.36L250.766,283.539C219.401,287.843 202.555,295.157 202.555,295.157L202.555,266.578C202.555,266.578 221.593,257.676 257.017,253.36ZM295.276,148.41C312.506,148.41 323.852,163.059 323.852,176.967C323.852,190.566 313.806,200.045 307.495,202.79L323.852,281.745C323.852,281.745 310.816,280.469 295.276,280.469C279.735,280.469 266.7,281.745 266.7,281.745L283.056,202.79C276.745,200.045 266.7,190.566 266.7,176.967C266.7,163.059 278.046,148.41 295.276,148.41Z" style="fill:rgb(102,0,255);"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.4 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -30,6 +30,35 @@ card_title: Operations
card_image: icon_connected_servers.svg
----
card_text: After the project, we do not leave you out in the cold with the result, but offer you services for the operation of the completed project and the administration of the infrastructure beyond the project.
#### flow_portfolio_cards ####
card_title: Agent Shredder
----
card_image: agent_shredder_lila.svg
----
card_text:
Journalists sometimes have a dangerous job and a high responsibility. With Agent Shredder, they can encrypt their data quickly and easily at any time on the go, to prevent them from getting into the wrong hands. Powered by strong cryptography and powered by WTF eG.
[More about Agent Shredder](https://agent-shredder.com/tabs/info)
#### flow_portfolio_cards ####
card_title: Balkonsolar
----
card_image: solar_lila.svg
----
card_text:
When a lot of balcony power plants discovered the light of day last year, many had to learn that some were doubtfully secured. We at WTF eG thought that this urgently needed to be changed and improved upon and so we did.
[More about Balkonsolar](https://solar.wtf.coop)
#### flow_portfolio_cards ####
card_title: BricksTronix
----
card_image: bricks_tronix_lila.svg
----
card_text:
Your Breadboard has flaky contacts? Your soldering skills are a bit rusty or you are missing a steady hand?
Connect prototypes as easy as staking building blocks, which is possible with BricksTronix from the WTF eG. From use as teaching material for up and coming electronics person to solid prototypes, everything is possible.
#### flow_icon_bubbles ####
icon_path: Python_logo_and_wordmark.svg
----

View File

@ -30,6 +30,36 @@ card_title: Betrieb
card_image: icon_connected_servers.svg
----
card_text: Nach dem Projekt lassen wir Dich nicht mit dem Ergebnis im Regen stehen, sondern bieten Dir auch über das Projekt hinaus Services für den Betrieb des abgeschlossenen Projekts und die Administration der Infrastruktur.
#### flow_portfolio_cards ####
card_title: Agent Shredder
----
card_image: agent_shredder_lila.svg
----
card_text:
Journalist\*innen haben bisweilen einen gefährlichen Job und eine hohe Verantwortung. Mit Agent Shredder können sie ihre Daten unterwegs jederzeit schnell und unkompliziert verschlüsseln, damit sie nicht in die falschen Hände gelangen. Powered by starker Kryptografie und powered by WTF eG.
[Mehr zu Agent Shredder](https://agent-shredder.com/tabs/info)
#### flow_portfolio_cards ####
card_title: Balkonsolar
----
card_image: solar_lila.svg
----
card_text:
Als im letzten Jahr jede Menge Balkonkraftwerke das Licht der Welt entdeckten, mussten viele lernen, dass einige davon zweifelhaft abgesichert waren. Das muss sich dringend ändern und besser werden, dachten wir von der WTF eG, und haben das besser gemacht.
[Mehr zu Balkonsolar](https://solar.wtf.coop)
#### flow_portfolio_cards ####
card_title: BricksTronix
----
card_image: bricks_tronix_lila.svg
----
card_text:
Dein Breadboard hat Wackelkontakte? Deine Lötkünste sind eingerostet oder Dir fehlt die ruhige Hand?
Prototypen so einfach zusammenstecken wie Klemmbausteine, das geht mit BricksTronix von der WTF eG. Vom Einsatz als Lehrmaterial für angehende Hardwerker*innen bis hin zu soliden Prototypen ist hiermit alles möglich.
#### flow_icon_bubbles ####
icon_path: Python_logo_and_wordmark.svg
----

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 512 591" 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(1,0,0,1,-39.5594,1.13687e-13)">
<path d="M295.276,-0L550.992,147.638L550.992,442.913L295.276,590.551L39.559,442.913L39.559,147.638L295.276,-0ZM275.111,456.591L275.111,476.756C275.111,487.885 284.147,496.92 295.276,496.92C306.405,496.92 315.44,487.885 315.44,476.756L315.44,456.591C315.44,445.462 306.405,436.427 295.276,436.427C284.147,436.427 275.111,445.462 275.111,456.591ZM395.706,424.305L412.121,440.64C420.01,448.49 432.788,448.459 440.638,440.57C448.488,432.681 448.457,419.903 440.568,412.053L424.152,395.718C416.263,387.868 403.485,387.899 395.635,395.788C387.785,403.677 387.817,416.455 395.706,424.305ZM166.4,395.718L149.983,412.053C142.094,419.903 142.063,432.681 149.913,440.57C157.763,448.459 170.541,448.49 178.43,440.64L194.846,424.305C202.735,416.455 202.766,403.677 194.916,395.788C187.067,387.899 174.289,387.868 166.4,395.718ZM396.098,295.276C396.098,239.593 350.957,194.453 295.276,194.453C239.593,194.453 194.453,239.593 194.453,295.276C194.453,350.957 239.593,396.098 295.276,396.098C350.957,396.098 396.098,350.957 396.098,295.276ZM355.769,295.276C355.769,328.685 328.685,355.769 295.276,355.769C261.866,355.769 234.782,328.685 234.782,295.276C234.782,261.866 261.866,234.782 295.276,234.782C328.685,234.782 355.769,261.866 355.769,295.276ZM133.96,275.111L113.795,275.111C102.666,275.111 93.631,284.147 93.631,295.276C93.631,306.405 102.666,315.44 113.795,315.44L133.96,315.44C145.089,315.44 154.124,306.405 154.124,295.276C154.124,284.147 145.089,275.111 133.96,275.111ZM476.756,275.111L456.591,275.111C445.462,275.111 436.427,284.147 436.427,295.276C436.427,306.405 445.462,315.44 456.591,315.44L476.756,315.44C487.885,315.44 496.92,306.405 496.92,295.276C496.92,284.147 487.885,275.111 476.756,275.111ZM194.881,166.364L178.465,149.948C170.595,142.079 157.817,142.079 149.948,149.948C142.079,157.817 142.079,170.595 149.948,178.465L166.364,194.881C174.234,202.751 187.012,202.751 194.881,194.881C202.751,187.012 202.751,174.234 194.881,166.364ZM424.187,194.881L440.603,178.465C448.473,170.595 448.473,157.817 440.603,149.948C432.733,142.078 419.955,142.079 412.086,149.948L395.67,166.364C387.801,174.234 387.801,187.012 395.671,194.881C403.54,202.751 416.318,202.751 424.187,194.881ZM275.111,113.795L275.111,133.96C275.111,145.089 284.147,154.124 295.276,154.124C306.405,154.124 315.44,145.089 315.44,133.96L315.44,113.795C315.44,102.666 306.405,93.631 295.276,93.631C284.147,93.631 275.111,102.666 275.111,113.795Z" style="fill:rgb(102,0,255);"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -0,0 +1,25 @@
_model: page
---
title: Documents
---
body:
Overview of the available documents concerning the cooperative:
| | | |
| --: | -- | -- |
| **Statute:** | &nbsp; | [wtf-satzung.pdf](/dokumente/wtf-satzung.pdf) |
| **General Rules of Procedure:** | &nbsp; | [wtf-ago.pdf](/dokumente/wtf-ago.pdf) |
| **Rules of Procedure of the Executive Board:** | &nbsp; | [wtf-go-vorstand.pdf](/dokumente/wtf-go-aufsichtsrat.pdf) |
| **Rules of Procedure of the Supervisory Board:** | &nbsp; | [wtf-go-aufsichtsrat.pdf](/dokumente/wtf-go-aufsichtsrat.pdf) |
| **Contribution regulations:** | &nbsp; | [wtf-beitragsordnung.pdf](/dokumente/wtf-beitragsordnung.pdf) |
| **Application for membership:**| &nbsp; | [onboarding.wtf-eg.de](https://onboarding.wtf-eg.de) |
<br/>
-----------------
**How do I become a member of the cooperative?**
Find out on the page [become a member](/mitglieder/).
---
meta_description: Documents of the WTF eG

View File

@ -10,6 +10,8 @@ body:
| --: | -- | -- |
| **Satzung:** | &nbsp; | [wtf-satzung.pdf](/dokumente/wtf-satzung.pdf) |
| **Allgemeine Geschäftsordnung (AGO):** | &nbsp; | [wtf-ago.pdf](/dokumente/wtf-ago.pdf) |
| **Geschäftsordnung des Vorstandes:** | &nbsp; | [wtf-go-vorstand.pdf](/dokumente/wtf-go-aufsichtsrat.pdf) |
| **Geschäftsordnung des Aufsichtsrats:** | &nbsp; | [wtf-go-aufsichtsrat.pdf](/dokumente/wtf-go-aufsichtsrat.pdf) |
| **Beitragsordnung:** | &nbsp; | [wtf-beitragsordnung.pdf](/dokumente/wtf-beitragsordnung.pdf) |
| **Beitrittserklärung:**| &nbsp; | [onboarding.wtf-eg.de](https://onboarding.wtf-eg.de) |

View File

@ -46,6 +46,9 @@ Write in the subject of the transfer: *Acceptance application - clear name - nic
| | | |
| --: | -- | -- |
| **Statute:** | &nbsp; | [wtf-satzung.pdf](/dokumente/wtf-satzung.pdf) |
| **General Rules of Procedure:** | &nbsp; | [wtf-ago.pdf](/dokumente/wtf-ago.pdf) |
| **Rules of Procedure of the Executive Board:** | &nbsp; | [wtf-go-vorstand.pdf](/dokumente/wtf-go-aufsichtsrat.pdf) |
| **Rules of Procedure of the Supervisory Board:** | &nbsp; | [wtf-go-aufsichtsrat.pdf](/dokumente/wtf-go-aufsichtsrat.pdf) |
| **Contribution regulations:** | &nbsp; | [wtf-beitragsordnung.pdf](/dokumente/wtf-beitragsordnung.pdf) |
| **Application for membership:**| &nbsp; | [onboarding.wtf-eg.de](https://onboarding.wtf-eg.de) |

View File

@ -46,6 +46,9 @@ Schreibe im Verwendungszweck der Überweisung: *Aufnahmeantrag Klarname
| | | |
| --: | -- | -- |
| **Satzung:** | &nbsp; | [wtf-satzung.pdf](/dokumente/wtf-satzung.pdf) |
| **Allgemeine Geschäftsordnung (AGO):** | &nbsp; | [wtf-ago.pdf](/dokumente/wtf-ago.pdf) |
| **Geschäftsordnung des Vorstandes:** | &nbsp; | [wtf-go-vorstand.pdf](/dokumente/wtf-go-aufsichtsrat.pdf) |
| **Geschäftsordnung des Aufsichtsrats:** | &nbsp; | [wtf-go-aufsichtsrat.pdf](/dokumente/wtf-go-aufsichtsrat.pdf) |
| **Beitragsordnung:** | &nbsp; | [wtf-beitragsordnung.pdf](/dokumente/wtf-beitragsordnung.pdf) |
| **Beitrittserklärung:**| &nbsp; | [onboarding.wtf-eg.de](https://onboarding.wtf-eg.de) |

View File

@ -0,0 +1,20 @@
[block]
name = Portfolio Card
button_label = Add Portfolio Card
label = {{ this.card_title }}
[fields.card_title]
label = Card Titel
type = string
width = 1/2
[fields.card_image]
label = Card Icon
description = Lade ein Bild hoch und wähle es hier aus
type = select
source = record.attachments.images
width = 1/2
[fields.card_text]
label = Card Text
type = markdown

View File

@ -21,7 +21,7 @@ type = string
[fields.section]
label = Sections
type = flow
flow_blocks = flow_services_cards, flow_icon_bubbles
flow_blocks = flow_portfolio_cards, flow_services_cards, flow_icon_bubbles
[fields.kompetenzen_heading]
label = Kompetenzen Überschrift

View File

@ -29,7 +29,42 @@
{% endfor %}
</div>
</div>
<div class="portfolio_box">
<h1>Portfolio</h1>
<div class="services_card_box">
{% for card in this.section.blocks %}
{% if card._flowblock == "flow_portfolio_cards" %}
{{ render_services_card(card, loop.index) }}
{% endif %}
{% endfor %}
</div>
</div>
</div>
</section>
<div class="content__box">
<div class="content__inner_box">
<h1 class="big_heading">{{ this.kompetenzen_heading }}</h1>
</div>
</div>
<section class="content">
<div class="content__box">
<div class="bubble_grid">
{% for icon_bubble in this.section.blocks %}
{% if icon_bubble._flowblock == "flow_icon_bubbles" %}
{{ icon_bubble }}
{% endif %}
{% endfor %}
<div class="bubble_grid__card">
{{ this.kompetenzen_body }}
</div>
</div>
</div>
</section>
<div class="contact__box" style="display: none">
<h1>{{ this.contact_form_heading }}</h1>
@ -87,27 +122,4 @@
</div>
</section>
</div>
<div class="content__box">
<div class="content__inner_box">
<h1 class="big_heading">{{ this.kompetenzen_heading }}</h1>
</div>
</div>
<section class="content">
<div class="content__box">
<div class="bubble_grid">
{% for icon_bubble in this.section.blocks %}
{% if icon_bubble._flowblock == "flow_icon_bubbles" %}
{{ icon_bubble }}
{% endif %}
{% endfor %}
<div class="bubble_grid__card">
{{ this.kompetenzen_body }}
</div>
</div>
</div>
</section>
{% endblock %}