From 14270445a2af4478470341ac3456f0f15b7a726d Mon Sep 17 00:00:00 2001 From: tvluke <tvluke@chaotikum.org> Date: Wed, 14 Feb 2024 21:57:01 +0100 Subject: [PATCH] =?UTF-8?q?briefing=20vern=C3=BCnftig=20verlinkt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _briefing/fraese.md | 2 +- _briefing/kf16lvario.md | 2 +- _includes/einweisung.html | 10 +++++++--- _includes/tool-list.html | 5 +++-- _includes/tool.html | 3 ++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/_briefing/fraese.md b/_briefing/fraese.md index af0c8bd0..7809cc77 100644 --- a/_briefing/fraese.md +++ b/_briefing/fraese.md @@ -1,6 +1,6 @@ --- layout: briefing -uid: 3fe2ca58-932a-440a-8c1f-b0f9f8db6ade +inventory_uid: 3fe2ca58-932a-440a-8c1f-b0f9f8db6ade --- Hier stehen demnächst ein paar schlaue Sätze darüber, wie man eine CNC-Fräse bedient. \ No newline at end of file diff --git a/_briefing/kf16lvario.md b/_briefing/kf16lvario.md index 78e6d7ec..64337e0b 100644 --- a/_briefing/kf16lvario.md +++ b/_briefing/kf16lvario.md @@ -1,6 +1,6 @@ --- layout: briefing -uid: 10992f1f-fb14-491f-9e68-6b1b84154674 +inventory_uid: 10992f1f-fb14-491f-9e68-6b1b84154674 --- Hier stehen demnächst ein paar schlaue Sätze darüber, wie man eine Fräse bedient. \ No newline at end of file diff --git a/_includes/einweisung.html b/_includes/einweisung.html index b758aec2..3713bc75 100644 --- a/_includes/einweisung.html +++ b/_includes/einweisung.html @@ -1,3 +1,7 @@ -<div style="line-height: 18pt; margin:10px 0; width: 100%; background-color: #FFF8DC; border-width: thick; border-color: #e67206; border-radius: 10px; min-height: 40pt; "> - <span style="float: left; color: #e67206; font-size: 40pt; display:block; width: 50pt; height: 40pt; text-align:center; line-height: 40pt;">⚠</span><p style="vertical-align: middle;">Um dieses Gerät benutzen zu dürfen benötigst du eine <a href="{{ site.baseurl }}{{ tool.url }}briefing/">Einweisung</a>!</p> -</div> \ No newline at end of file +{% for briefing in site.briefing -%} + {% if briefing.inventory_uid == tuid -%} + <div style="line-height: 18pt; margin:10px 0; width: 100%; background-color: #FFF8DC; border-width: thick; border-color: #e67206; border-radius: 10px; min-height: 40pt; "> + <span style="float: left; color: #e67206; font-size: 40pt; display:block; width: 50pt; height: 40pt; text-align:center; line-height: 40pt;">⚠</span><p style="vertical-align: middle;">Um dieses Gerät benutzen zu dürfen benötigst du eine <a href="{{ site.baseurl }}{{ briefing.url}}">Einweisung</a>!</p> + </div> + {% endif -%} +{% endfor %} diff --git a/_includes/tool-list.html b/_includes/tool-list.html index c47f356b..0e4d7b24 100644 --- a/_includes/tool-list.html +++ b/_includes/tool-list.html @@ -1,7 +1,8 @@ -{% for tool in site.inventory %} +{% assign relevant_tools = site.inventory | where_exp: "rtools", "rtools.sets contains 'werkstatt'" -%} +{% for tool in relevant_tools %} {%- if tool.sets contains 'werkstatt' -%} -{% include {{site.toolinfo}} uid=tool.uid %} +{% include {{site.toolinfo}} %} <hr> {%- endif -%} {% endfor %} diff --git a/_includes/tool.html b/_includes/tool.html index 3990a067..da208b8c 100644 --- a/_includes/tool.html +++ b/_includes/tool.html @@ -1,5 +1,6 @@ <a href="{{ site.baseurl }}{{ tool.url }}"><h4 id="{{tool.uid}}">{{tool.name}}</h4></a> {% if tool.safetybriefing -%} - {% include {{site.einweisung}} %} + {% assign tuid = tool.uid %} + {% include {{site.einweisung}} tuid = tuid %} {% endif -%} {{ tool.excerpt | strip_html | markdownify | truncatewords: 60 }}<a href="{{ site.baseurl }}{{ tool.url }}">mehr</a> -- GitLab