Skip to content
Snippets Groups Projects
Commit a7efd948 authored by Lukas Ruge's avatar Lukas Ruge
Browse files

avoinding problem with the double uid check

parent f4295ef2
No related branches found
No related tags found
No related merge requests found
Pipeline #23593 passed
--- ---
layout: briefing layout: briefing
inventory_uid: 3fe2ca58-932a-440a-8c1f-b0f9f8db6ade inventory_id: 3fe2ca58-932a-440a-8c1f-b0f9f8db6ade
size-on-poster: 420 size-on-poster: 420
--- ---
......
--- ---
layout: briefing layout: briefing
inventory_uid: 10992f1f-fb14-491f-9e68-6b1b84154674 inventory_id: 10992f1f-fb14-491f-9e68-6b1b84154674
size-on-poster: 400 size-on-poster: 400
--- ---
......
--- ---
layout: briefing layout: briefing
inventory_uid: 637ee8d8-105c-418b-b81d-96d8afce596f inventory_id: 637ee8d8-105c-418b-b81d-96d8afce596f
size-on-poster: 520 size-on-poster: 520
--- ---
......
{% for briefing in site.briefing -%} {% for briefing in site.briefing -%}
{% if briefing.inventory_uid == tuid -%} {% if briefing.inventory_id == 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; "> <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> <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> </div>
......
<section class="section typeset"> <section class="section typeset">
<ul class="list list--posts"> <ul class="list list--posts">
{%- capture nowunix %}{{'now' | date: '%s'}}{% endcapture -%}
{% assign tagArray = "" | split: ',' -%} {% assign tagArray = "" | split: ',' -%}
{% assign relevant_posts = site.posts | where_exp: "rpost", "rpost.categories contains 'project'" -%} {% assign relevant_posts = site.posts | where_exp: "rpost", "rpost.categories contains 'project'" -%}
{% assign posts = relevant_posts | sort: 'date' %} {% assign posts = relevant_posts | sort: 'date' %}
...@@ -13,6 +15,8 @@ ...@@ -13,6 +15,8 @@
{% endfor -%} {% endfor -%}
{% endif -%} {% endif -%}
{% endfor -%} {% endfor -%}
{% assign tagArray = tagArray | uniq %}
{% for project_tag in tagArray %} {% for project_tag in tagArray %}
{% for project in site.projects -%} {% for project in site.projects -%}
...@@ -25,22 +29,25 @@ ...@@ -25,22 +29,25 @@
{% endif -%} {% endif -%}
{% endfor -%} {% endfor -%}
<article class="article article--post"> {%- capture lastupdateventplus %}{{lastUpdate | date: '%s' | plus: 94608000 }}{%- endcapture -%}
<h2><a href="{{ site.baseurl }}{{ project.url }}">{{ project.name | markdownify | remove: '<p>' | remove: '</p>' }}</a></h2> {% if lastupdateventplus > nowunix -%}
{% if project.image -%} <article class="article article--post">
{% if project.image contains '://' -%} <h2><a href="{{ site.baseurl }}{{ project.url }}">{{ project.name | markdownify | remove: '<p>' | remove: '</p>' }}</a></h2>
<a href="{{ site.baseurl }}{{ project.url }}"><div class=projectthumbnail style="background-image: url({{project.image}}); height: 200px; width: 100%; margin-right: auto; margin-left: auto; margin-top: 10px;"> {% if project.image -%}
</div></a> {% if project.image contains '://' -%}
{% else -%} <a href="{{ site.baseurl }}{{ project.url }}"><div class=projectthumbnail style="background-image: url({{project.image}}); height: 200px; width: 100%; margin-right: auto; margin-left: auto; margin-top: 10px;">
<a href="{{ site.baseurl }}{{ project.url }}"><div class=projectthumbnail style="background-image: url({{site.baseurl}}/images/thumbnails/{{project.image}}); height: 200px; width: 100%; margin-right: auto; margin-left: auto; margin-top: 10px;"> </div></a>
</div></a> {% else -%}
{% endif -%} <a href="{{ site.baseurl }}{{ project.url }}"><div class=projectthumbnail style="background-image: url({{site.baseurl}}/images/thumbnails/{{project.image}}); height: 200px; width: 100%; margin-right: auto; margin-left: auto; margin-top: 10px;">
{% endif -%} </div></a>
<small class="small post-meta">Letztes Update: <time datetime="{{ page.date | date_to_xmlschema }}" class="time">{{lastUpdate}}</time></small> {% endif -%}
<div class="teaser"> {% endif -%}
{{ project.excerpt | strip_html | markdownify | truncatewords: 60 }} <small class="small post-meta">Letztes Update: <time datetime="{{ page.date | date_to_xmlschema }}" class="time">{{lastUpdate}}</time></small>
</div> <div class="teaser">
</article> {{ project.excerpt | strip_html | markdownify | truncatewords: 60 }}
</div>
</article>
{% endif -%}
{% endif -%} {% endif -%}
{% endfor -%} {% endfor -%}
{% endfor -%} {% endfor -%}
......
...@@ -33,7 +33,7 @@ layout: default ...@@ -33,7 +33,7 @@ layout: default
{% endif -%} {% endif -%}
{% for briefing in site.briefing -%} {% for briefing in site.briefing -%}
{% if briefing.inventory_uid == page.uid -%} {% if briefing.inventory_id == page.uid -%}
<div class="only-in-print" style="min-height: {{briefing.size-on-poster}}px; max-height: {{briefing.size-on-poster}}px; overflow: hidden;"> <div class="only-in-print" style="min-height: {{briefing.size-on-poster}}px; max-height: {{briefing.size-on-poster}}px; overflow: hidden;">
<div class="two-columns" style="overflow: hidden;"> <div class="two-columns" style="overflow: hidden;">
{{ briefing.excerpt | markdownify }} {{ briefing.excerpt | markdownify }}
......
...@@ -111,7 +111,7 @@ So eine Datei kann so aussehen: ...@@ -111,7 +111,7 @@ So eine Datei kann so aussehen:
``` ```
--- ---
layout: briefing layout: briefing
inventory_uid: 10992f1f-fb14-491f-9e68-6b1b84154674 inventory_id: 10992f1f-fb14-491f-9e68-6b1b84154674
size-on-poster: 400 size-on-poster: 400
--- ---
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment