Corrected gen_vor.php

master
Christoph 4 years ago
parent d127018890
commit 122043d1e6
  1. 7
      gen_vor.php
  2. 30
      layouts/partial/site-header.html~
  3. 32
      layouts/shortcodes/dat.html~
  4. 3
      layouts/shortcodes/past.html~
  5. 1
      layouts/shortcodes/tabref.html~
  6. 2
      layouts/shortcodes/vor.html~

@ -8,6 +8,13 @@ $fil = file($file_txt, FILE_IGNORE_NEW_LINES);
// Insert header
$arr = ['| | | |', '|:------|:------|:------|'];
$ts=(new DateTime('first day of this month'))->getTimeStamp();
$tues_ts = strtotime('fourth tuesday of this month + 1 day', $ts);
// Are we past the fourst Tuesday in the month?
if ((new DateTime())->getTimeStamp() >= $tues_ts) {
$ts = strtotime('+1 month', $ts);
}
foreach ($fil as $line) {
$fields = array_filter(explode('|', $line));
if (count($fields) == 2) {

@ -1,30 +0,0 @@
<header class="gblog-header">
<div class="container flex align-center justify-center">
<a class="gblog-header__link" rel="me" href="{{ .Site.BaseURL }}">
<span class="gblog-brand flex align-center justify-center">
<img class="gblog-brand__img" src="{{ (default "brand.svg" .Site.Params.logo) | relURL }}" alt="FraLUG" width=180 height=96>
{{ .Site.Title }}
</span>
{{ with .Site.Params.subtitle }}
<span class="gblog-brand__subtitle flex align-center justify-center">{{ . }}</span>
{{ end }}
</a>
</div>
</header>
<nav class="gblog-nav">
<input type="checkbox" id="menu-control" class="hidden">
<ul class="gblog-nav__list container flex flex-wrap justify-center menu-content">
{{ $currentPage := .RelPermalink }}
{{ range $name, $taxonomy := .Site.Taxonomies.tags }}
{{ with $.Site.GetPage (printf "/tags/%s" $name) }}
<li>
<a class="gblog-nav__entry {{ if eq $currentPage .RelPermalink }} is-active {{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a>
</li>
{{ end }}
{{ end }}
{{ if .Site.Data.menu.extra.header }}
{{ partial "menu-extra" (dict "current" . "source" .Site.Data.menu.extra.header "target" "header") }}
{{ end }}
</ul>
</nav>

@ -1,32 +0,0 @@
<div id="dat">
<script language="javascript" type="text/javascript" src="/js/datejs/date-de-DE.js"></script>
<script language="javascript" type="text/javascript">
function getNextMeetingDate() {
let today = Date.today();
// Are we past the fourth Tuesday of a month?
var secondMonday = today.second().monday();
var fourthTuesday = today.fourth().tuesday();
if (today > fourthTuesday) {
var nextDate = (1).months().fromNow().second().monday();
} else if (today <= secondMonday) {
// Are we before the second Monday?
var nextDate = secondMonday;
} else {
// Are we in between?
var nextDate = fourthTuesday;
}
return nextDate;
}
// Get the first parameter containing shortcode language ID
if ('{{ .Get 0 }}' == 'en') {
var lang = 'en-US';
} else {
var lang = 'de-DE';
}
Date.i18n.setLanguage(lang);
let date = getNextMeetingDate();
document.getElementById('dat').innerHTML = date.toString('D');
</script>
</div>

@ -1,3 +0,0 @@
<div id="vor">
{{ readFile "vor.md" | markdownify }}
</div>

@ -1 +0,0 @@
<a href="{{ .Get "href" }}" rel="noopener" target="_blank">{{ .Get "title" }}</a>

@ -1,2 +0,0 @@
<div id="vor">
{{ readFile "vor.md" | markdownify }}
Loading…
Cancel
Save