layouts/shortcodes/key.html

+{{ .Inner }}
\ No newline at end of file

layouts/shortcodes/officehours.html

-{{/*
 <table>
 <thead>
 <tr>
@@ -26,12 +25,3 @@
 {{ end }}
 </tbody>
 </table>
-*/}}
-<div class="warn">{{ if (eq $.Site.Language.Lang "de") }}
-<p>Aufgrund der aktuellen Situation rund um COVID-19 werden bis auf Weiteres keine Sprechstunden angeboten.</p>
-<p>Im Gegenzug wird der Zahlungszeitraum bei Mitgliedsanträgen nach Registrierung unter <a href="https://reg.stustanet.de/">reg.stustanet.de</a> auf zwei Monate verlängert, sodass nach erfolgreicher Registrierung der Internetzugang uneingeschränkt für zwei Monate genutzt werden kann.</p>
-{{ else }}
-<p>Due to the current situation concerning COVID-19, no office hours are offered for the time being.</p>
-<p>In return, the payment period for membership applications will be extended to two months after registration at <a href="https://reg.stustanet.de/">reg.stustanet.de</a>, which means that after successful registration, the Internet access can be used without restrictions for two months.</p>
-{{ end }}
-</div>

layouts/shortcodes/redirect.html

+<meta http-equiv="refresh" content="0; url={{.Get 0}}"/>
\ No newline at end of file

layouts/shortcodes/vorstand.html

 <dl class="vorstand">
     <dt>{{ i18n "chairman" }}:</dt>
-    <dd>{{ .Site.Data.Vorstand.VV }}</dd>
+    <dd>{{ .Site.Data.Vorstand.VV -}}
+    {{ if and (fileExists "keys/board/vv.md") 
+            ((time (.Page.Sites.First.GetPage "keys/board/vv.md").ExpiryDate).After now) 
+            (gt (len (.Page.Sites.First.GetPage "keys/board/vv.md").Content) 10) -}}
+        &nbsp;[
+        <a href="{{ ref . (dict "path" "/keys/board/vv.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.VV }}.asc">PGP key</a>
+        {{ if (.Page.Sites.First.GetPage "keys/board/vv.md").Param "fingerprint" -}}
+            ,
+            <a href="{{ ref . (dict "path" "/keys/board/fingerprints/vv.md" "lang" "de") }}">Fingerprint</a>
+        {{- end }}
+        ]
+    {{- end }}
+    </dd>
     <dt>{{ i18n "treasurer" }}:</dt>
-    <dd>{{ .Site.Data.Vorstand.CC }}</dt>
+    <dd>{{ .Site.Data.Vorstand.CC -}}
+    {{ if and (fileExists "keys/board/cc.md") 
+            ((time (.Page.Sites.First.GetPage "keys/board/cc.md").ExpiryDate).After now) 
+            (gt (len (.Page.Sites.First.GetPage "keys/board/cc.md").Content) 10) -}}
+        &nbsp;[
+        <a href="{{ ref . (dict "path" "/keys/board/cc.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.CC }}.asc">PGP key</a>
+        {{ if (.Page.Sites.First.GetPage "keys/board/cc.md").Param "fingerprint" -}}
+            ,
+            <a href="{{ ref . (dict "path" "/keys/board/fingerprints/cc.md" "lang" "de") }}">Fingerprint</a>
+        {{- end }}
+        ]
+    {{- end }}
+    </dd>
     <dt>{{ i18n "1stcto" }}:</dt>
-    <dd>{{ .Site.Data.Vorstand.TV1 }}</dt>
+    <dd>{{ .Site.Data.Vorstand.TV1 -}}
+    {{ if and (fileExists "keys/board/tv1.md") 
+            ((time (.Page.Sites.First.GetPage "keys/board/tv1.md").ExpiryDate).After now) 
+            (gt (len (.Page.Sites.First.GetPage "keys/board/tv1.md").Content) 10) }}
+        &nbsp;[
+        <a href="{{ ref . (dict "path" "/keys/board/tv1.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.TV1 }}.asc">PGP key</a>
+        {{ if (.Page.Sites.First.GetPage "keys/board/tv1.md").Param "fingerprint" -}}
+            ,
+            <a href="{{ ref . (dict "path" "/keys/board/fingerprints/tv1.md" "lang" "de") }}">Fingerprint</a>
+        {{- end }}
+        ]
+    {{- end }}
+    </dd>
     <dt>{{ i18n "2ndcto" }}:</dt>
-    <dd>{{ .Site.Data.Vorstand.TV2 }}</dt>
+    <dd>{{ .Site.Data.Vorstand.TV2 -}}
+    {{ if and (fileExists "keys/board/tv2.md") 
+            ((time (.Page.Sites.First.GetPage "keys/board/tv2.md").ExpiryDate).After now) 
+            (gt (len (.Page.Sites.First.GetPage "keys/board/tv2.md").Content) 10) -}}
+        &nbsp;[
+        <a href="{{ ref . (dict "path" "/keys/board/tv2.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.TV2 }}.asc">PGP key</a>
+        {{ if (.Page.Sites.First.GetPage "keys/board/tv2.md").Param "fingerprint" -}}
+            ,
+            <a href="{{ ref . (dict "path" "/keys/board/fingerprints/tv2.md" "lang" "de") }}">Fingerprint</a>
+        {{- end }}
+        ]
+    {{- end }}
+    </dd>
     <dt>{{ i18n "3rdcto" }}:</dt>
-    <dd>{{ .Site.Data.Vorstand.TV3 }}</dt>
+    <dd>{{ .Site.Data.Vorstand.TV3 -}}
+    {{ if and (fileExists "keys/board/tv3.md") 
+            ((time (.Page.Sites.First.GetPage "keys/board/tv3.md").ExpiryDate).After now) 
+            (gt (len (.Page.Sites.First.GetPage "keys/board/tv3.md").Content) 10) -}}
+        &nbsp;[
+        <a href="{{ ref . (dict "path" "/keys/board/tv3.md" "lang" "de") }}" download="{{ .Site.Data.Vorstand.TV3 }}.asc">PGP key</a>
+        {{ if (.Page.Sites.First.GetPage "keys/board/tv3.md").Param "fingerprint" -}}
+            ,
+            <a href="{{ ref . (dict "path" "/keys/board/fingerprints/tv3.md" "lang" "de") }}">Fingerprint</a>
+        {{- end }}
+        ]
+    {{- end }}
+    </dd>
 </dl>
 <p>
     <i>{{ i18n "validity" }}: {{ .Site.Data.Vorstand.Valid }}</i>

static/css/main.css

@@ -551,13 +551,20 @@ p, ul, ol {
     margin-top: 0.5rem;
     margin-bottom: 0;
 }
-ul, ol {
+ul {
     line-height: 1.5rem;
     margin-top: 0.5rem;
     margin-bottom: 0;
     padding: 0 8px;
     list-style-position: inside;
 }
+ol {
+    line-height: 1.5rem;
+    margin-top: 0.5rem;
+    margin-bottom: 0;
+    padding: 0 8px;
+    list-style-position: outside;
+}
 ul li,
 ol li {
     margin-left: 0;
@@ -835,20 +842,25 @@ footer .editPage {
     overflow: hidden;
 }
 
+footer .spacer {
+    flex: 1;
+}
+
 footer .container,
 footer .container a {
     color: #EDEDED;
 }
 
-footer .center {
+footer .links {
     padding: 15px;
-    text-align: center;
-    flex: 1 1 0;
+    /*text-align: center;*/
+    /*flex: 1 1 0;*/
+    text-align: right;
 }
 
 footer .lang-dropdown-container {
-    flex: 1 1 0;
-    padding: 15px 0 15px 15px;
+    /*flex: 1 1 0;*/
+    padding: 14px 0 16px 15px;
     text-align: right;
 }