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

add video link to menu

parent 96b5915c
No related branches found
No related tags found
No related merge requests found
Pipeline #15790 passed
Stage: build
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
_config.yml
+ 2
− 2
View file @ ad5e2ef7
......@@ -70,7 +70,7 @@ collections:
media:
title: Media
output: true
nofeature: true
feature_image: "https://chaotikum.org/assets/bgvideo.png"
permalink: media/:path/
inventory:
title: Geräte
......@@ -127,7 +127,7 @@ navigation_header:
Nobreakspace: /nobreakspace/
Aktivitäten: /projects/
Kalender: /events/
#Media: /media/
Video: /media/
Wiki: https://wiki.chaotikum.org/start
Merch: /verein/merch/
......
_includes/media-in-list.html
+ 18
− 4
View file @ ad5e2ef7
{% if video.event and video.event != '' -%}
{% for e in site.events -%}
{% if e.uid == video.event -%}
{% assign event = e -%}
{% endif -%}
{% endfor -%}
{% endif -%}
{% if video.recording_date and recording_date.event != ''-%}
{% assign recording_date = video.recording_date -%}
{% elsif event -%}
{% assign recording_date = event.eventdate -%}
{% endif -%}
<li class="item item--post">
<article class="article article--post">
<article class="article article--post" style="min-height: 210px;">
{%- assign realslug = video.url | split:'/' | last -%}
<img src="https://video.chaotikum.net/thumbnails/{{realslug}}.jpg" alt="" width=50% height=50% style="float: right; margin: 0 0 0 15px;"/>
<h2><a href="{{ site.baseurl }}{{ video.url }}">{{ title | markdownify | remove: '<p>' | remove: '</p>' | strip_newlines }}</a></h2>
<a href="{{ site.baseurl }}{{ video.url }}"><img class="mediaimage" src="https://video.chaotikum.net/thumbnails/{{realslug}}.jpg" alt="" width=30% height=30% style="float: left; margin-right: 15px;"/></a>
<h4 ><a href="{{ site.baseurl }}{{ video.url }}">{{ title | markdownify | remove: '<p>' | remove: '</p>' | strip_newlines }}</a></h4>
<spann class="fa fa-eye" aria-hidden="true"></spann><i> {{ recording_date | date: "%-d.%m.%Y" }}</i><br>
<spann class="fa fa-upload" aria-hidden="true"></spann><i> {{ video.release_date | date: "%-d.%m.%Y" }}</i>
<div class="teaser">
{{ video.excerpt | strip_html | markdownify | truncatewords: 60 }}
{{ video.excerpt | strip_html | markdownify | truncatewords: 30 }}
</div>
</article>
<div class="dotted-line">
......
_includes/site-feature.html
+ 22
− 18
View file @ ad5e2ef7
......@@ -34,26 +34,30 @@
{% if nofeature %}
{% else %}
{% if feature_text or feature_image -%}
{% if feature_image contains 'http' -%}
<div class="feature"{% if feature_image %} style="background-image: url({{ feature_image }})"{% endif %}>
<div class="container typeset">
{{ feature_text | markdownify }}
</div>
</div>
{% if page.layout == "video" -%}
{% else %}
{% if feature_text or feature_image -%}
{% if feature_image contains 'http' -%}
<div class="feature"{% if feature_image %} style="background-image: url({{ feature_image }})"{% endif %}>
<div class="container typeset">
{{ feature_text | markdownify }}
</div>
</div>
{% else -%}
<div class="feature"{% if feature_image %} style="background-image: url({{site.baseurl}}{{ feature_image }})"{% endif %}>
<div class="container typeset">
{{ feature_text | markdownify }}
</div>
</div>
{% endif -%}
{% else -%}
<div class="feature"{% if feature_image %} style="background-image: url({{site.baseurl}}{{ feature_image }})"{% endif %}>
<div class="container typeset">
{{ feature_text | markdownify }}
</div>
{% assign feature_image = site.default-feature -%}
<div class="feature"{% if feature_image %} style="background-image: url({{site.baseurl}}{{ feature_image }})"{% endif %}>
<div class="container typeset">
{{ feature_text | markdownify }}
</div>
{% endif -%}
{% else -%}
{% assign feature_image = site.default-feature -%}
<div class="feature"{% if feature_image %} style="background-image: url({{site.baseurl}}{{ feature_image }})"{% endif %}>
<div class="container typeset">
{{ feature_text | markdownify }}
</div>
</div>
{% endif -%}
{% endif -%}
{% endif -%}
_layouts/media.html
+ 1
− 2
View file @ ad5e2ef7
---
layout: default
nofeature: true
---
{% include site-header.html %}
<main class="main container">
<div class="content">
<div class="calendar-container">
{% include media-list.html %}
......
_layouts/video.html
+ 15
− 2
View file @ ad5e2ef7
......@@ -30,6 +30,19 @@ layout: default
{% endfor -%}
{% endcapture -%}
{% if page.event and page.event != '' -%}
{% for e in site.events -%}
{% if e.uid == page.event -%}
{% assign event = e -%}
{% endif -%}
{% endfor -%}
{% endif -%}
{% if page.recording_date and recording_date.event != ''-%}
{% assign recording_date = page.recording_date -%}
{% elsif event -%}
{% assign recording_date = event.eventdate -%}
{% endif -%}
<main class="main container">
<div class="content">
......@@ -53,7 +66,7 @@ layout: default
{% endfor -%}
<div class="mediaflex1" style="display: flex; margin-top: 5px; min-width: 100%; position: relative;">
<div ><img src="{{logo}}" alt="" class="gravatar"> </div>
<div style="padding-left: 20px; height: 100%; max-width: 65%"> von <b>{{persons}}</b></div>
<div style="padding-left: 20px; min-height: 50px; max-width: 65%; padding-top: 15px"> von <b>{{persons}}</b></div>
{% if page.file and page.file != ''-%}
<div style="color:000000; background-color:#eeeeee; border-radius: 10px; margin-left: 10px; padding: 5px; position: absolute; right: 0; max-width: 20%">
<a href="{{ page.file}}" style="color:000000;"><spann class="fa fa-download" aria-hidden="true"></spann> Download</a>
......@@ -85,7 +98,7 @@ layout: default
<p>Zu diesem Talk wurde noch kein Video veröffentlicht.<p>
{% endif -%}
<div style="width: 100%; background-color:#f2f2f2; border-radius: 10px;">
<p style="padding: 5px; margin-left: 10px; margin-top: 10px: text-align: justify">Veröffentlicht: <b>{{ page.release_date | date: "%-d.%m.%Y" }}</b><br>{{content | replace: "<p>", "" | replace: "</p>", "<br>" }}
<p style="padding: 5px; margin-left: 10px; margin-top: 10px: text-align: justify"><spann class="fa fa-eye" aria-hidden="true"></spann><i> {{ recording_date | date: "%-d.%m.%Y" }}</i><br><spann class="fa fa-upload" aria-hidden="true"></spann><i> {{ page.release_date | date: "%-d.%m.%Y" }}</i><br>{{content | replace: "<p>", "" | replace: "</p>", "<br>" }}
{% if page.slides and page.slides != '' -%}
<br><b><a href="{{page.slides}}"> Download Slides</a></b><br>
{% endif -%}
......
_sass/_normalize.scss
+ 3
− 3
View file @ ad5e2ef7
......@@ -145,14 +145,14 @@ figcaption {
top: 0;
left: 0;
position: relative;
border-radius: 30px;
border-radius: 10px;
}
.vimage2 {
top: 0;
left: 0;
position: absolute;
border-radius: 30px;
border-radius: 10px;
opacity: 0.7;
}
......@@ -160,7 +160,7 @@ figcaption {
top: 0;
left: 0;
position: absolute;
border-radius: 30px;
border-radius: 10px;
opacity: 0.2;
}
......
assets/styles.scss
+ 8
− 0
View file @ ad5e2ef7
......@@ -47,6 +47,14 @@ body {
}
}
.mediaimage {
border-radius: 10px;
}
.mediaimage:hover {
border-radius: 0px;
}
.feature {
padding-bottom: .4rem;
margin-bottom: 1.6rem;
......
media.md
+ 0
− 1
View file @ ad5e2ef7
---
layout: media
collectionpage: media
nofeature: true
aside: false
---
\ No newline at end of file
media_ext.xml 0 → 100644
+ 76
− 0
View file @ ad5e2ef7
---
layout: null
---
<?xml version="1.0" encoding="UTF-8"?>
<channel>
<title>Chaotikm Video Realses</title>
<description>Chaotikm Video Realses</description>
{% assign sorted = site.media | sort: 'release_date' | reverse %}
{% capture nowunix %}{{'now' | date: '%s'}}{% endcapture %}
{% for video in sorted %}
{% capture releasedate %}{{video.release_date | date: '%s'}}{% endcapture %}
{% assign optout = false -%}
{% if video.optout and video.optout != '' -%}
{% assign optout = true -%}
{% endif -%}
{% capture persons -%}
{% for person in video.persons %}{{person}}{% unless forloop.last %}, {% endunless %}
{% endfor -%}
{% endcapture -%}
{% if video.event and video.event != '' -%}
{% for e in site.events -%}
{% if e.uid == video.event -%}
{% assign event = e -%}
{% endif -%}
{% endfor -%}
{% endif -%}
{% if video.recording_date and recording_date.event != ''-%}
{% assign recording_date = video.recording_date -%}
{% elsif event -%}
{% assign recording_date = event.eventdate -%}
{% endif -%}
{% if releasedate < nowunix and optout == false and video.file and video.file != '' %}
<item>
{% assign name_before_title = false -%}
{% for conf in video.conferences -%}
{% for c in site.conferences -%}
{% if conf == c.acronym and c.name_before_title -%}
{% assign name_before_title = true -%}
{% endif -%}
{% endfor -%}
{% endfor -%}
<title>{% if video.persons and name_before_title -%}{{persons}}: {% endif -%}{{video.title| xml_escape }}
{% for conf in video.conferences -%}
{% for c in site.conferences -%}
{% if conf == c.acronym -%}
{% if c.ecki -%}[{{c.title| xml_escape}}]{% endif -%}
{% endif -%}
{% endfor -%}
{% endfor -%}</title>
<description>{{ video.content | strip_html | xml_escape }}</description>
<recDate>{{ recording_date | date_to_rfc822 }}</recDate>
<pubDate>{{ video.date | date_to_rfc822 }}</pubDate>
<persons>{{persons}}</persons>
<link>{{ video.url | prepend: site.baseurl | prepend: site.url }}</link>
{% if video.file -%}
<download>{{video.file}}</download>
{% endif -%}
{% if video.archive -%}
<archive>{{video.archive}}</archive>
{% endif -%}
{% if video.mccc -%}
<mccc>{{video.mccc}}</mccc>
{% endif -%}
{% if video.yt -%}
<yt>{{video.yt}}</yt>
{% endif -%}
<guid isPermaLink="true">{{ video.url | prepend: site.baseurl | prepend: site.url }}</guid>
</item>
{% endif %}
{% endfor %}
</channel>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Hosted with love by Chaotikum e.V. Support us if you can