From 1573ebfd9602c81fcc636ef24b84cbf4dec67ecc Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 9 Jun 2021 22:09:36 +0200 Subject: [PATCH 1/5] Update LICENCE Website --- content/licence/contents.lr | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/content/licence/contents.lr b/content/licence/contents.lr index 3d4b78b4..47561bf0 100644 --- a/content/licence/contents.lr +++ b/content/licence/contents.lr @@ -4,6 +4,34 @@ title: Lizenz --- body: -This is a website that was made with the Lektor quickstart. +Diese Webseite wurde mit [Lektor](https://getlektor.com/) gebaut. -And it does not contain a lot of information. +Diese Webseite wurde in dem Git-Repo auf [https://git.wtf-eg.de/ag_kommunikation/webseite.git](https://git.wtf-eg.de/ag_kommunikation/webseite.git) gespeichert und Entwickelt. + +Sofern nicht explizit anders angegeben, steht diese Webseite unter der [MIT Lizenz](https://git.wtf-eg.de/ag_kommunikation/webseite/src/branch/main/LICENCE). + +```license +MIT License + +Copyright (c) 2021 WTF Kooperative eG and Members +Copyright (c) 2021 L3D +Copyright (c) 2021 muli + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` From facba359f6ac6919924333a25ab595d9c97feb1a Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 9 Jun 2021 22:15:21 +0200 Subject: [PATCH 2/5] add hint --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c75e7241..8d8eab5a 100644 --- a/README.md +++ b/README.md @@ -64,3 +64,4 @@ Wir verwenden LFS zum Speichern von großen Dateien wie den Podcast, Bilder und export GIT_LFS_SKIP_SMUDGE=1 git clone ``` +*(Da das Rendern der Startseite die Bilder benötigt, willst du dann im lektor direkt auf eine andere Unterseite wechseln. Die Seite [http://localhost:5000/admin/](http://localhost:5000/admin/) sollte nützlich sein!)* From b96bf92bd55871b7f5746f56ea5f86a1284d5d34 Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 9 Jun 2021 22:16:32 +0200 Subject: [PATCH 3/5] Update README --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 8d8eab5a..9c3e5802 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,6 @@ Das Git Repository zur Webseite ist auf [git.wtf-eg.de/ag_kommunikation/webseite](https://git.wtf-eg.de/ag_kommunikation/webseite.git). -## Status - -Release Party am Mittwoch, den 14.04 ## Lokales entwickeln From e3f603a2db7b935884f372492a0fe9d3329b6955 Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 9 Jun 2021 22:33:40 +0200 Subject: [PATCH 4/5] update layout --- templates/layout.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/layout.html b/templates/layout.html index 69fa8222..b8e573ae 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -63,6 +63,9 @@ __ ____________________ {% if 'manifest.json'|asseturl is defined -%} {%- endif %} + {% if this._path == '/' -%} + Mastodon + {%- endif %}
From 6ea31828f207ae6f0960a4f61da3fde566238d6b Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 9 Jun 2021 22:43:44 +0200 Subject: [PATCH 5/5] fix mastodon --- templates/layout.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/templates/layout.html b/templates/layout.html index b8e573ae..0758d2c0 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -63,9 +63,6 @@ __ ____________________ {% if 'manifest.json'|asseturl is defined -%} {%- endif %} - {% if this._path == '/' -%} - Mastodon - {%- endif %}
@@ -84,7 +81,7 @@ __ ____________________