layouts/keys/list.html

+{{ .Content }}
+{{ range where .Pages "Type" "vorstands_key" -}}
+    {{ if (gt (len .Content) 10) -}}
+        <h3>PGP Key {{ .Title }}</h3>
+        <a href="{{ .Permalink }}" download="{{.Title}}.asc">Download</a><br>
+        {{ if .Param "fingerprint" -}}
+            Fingerprint: <code>{{ .Param "fingerprint" }}</code><br>
+        {{- end }}
+        Key Dump:
+        <pre>
+        {{ .Content }}
+        </pre>
+    {{- end }}
+{{- end }}
\ No newline at end of file

layouts/keys/single.html

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

layouts/shortcodes/fingerprint.html

+<pre>
+{{ if and (eq (.Get 0) "vv") ((time (.Site.GetPage "keys/board/vv.md").ExpiryDate).After now) }}
+    {{ (.Site.GetPage "keys/board/vv.md").Param "fingerprint" }}
+{{ else if and (eq (.Get 0) "cc") ((time (.Site.GetPage "keys/board/cc.md").ExpiryDate).After now) }}
+    {{ (.Site.GetPage "keys/board/cc.md").Param "fingerprint" }}
+{{ else if and (eq (.Get 0) "tv1") ((time (.Site.GetPage "keys/board/tv1.md").ExpiryDate).After now) }}
+    {{ (.Site.GetPage "keys/board/tv1.md").Param "fingerprint" }}
+{{ else if and (eq (.Get 0) "tv2") ((time (.Site.GetPage "keys/board/tv2.md").ExpiryDate).After now) }}
+    {{ (.Site.GetPage "keys/board/tv2.md").Param "fingerprint" }}
+{{ else if and (eq (.Get 0) "tv3") ((time (.Site.GetPage "keys/board/tv3.md").ExpiryDate).After now) }}
+    {{ (.Site.GetPage "keys/board/tv3.md").Param "fingerprint" }}
+{{ end }}
+</pre>
\ No newline at end of file

layouts/shortcodes/key.html

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

layouts/shortcodes/officehours.html

 <table>
-    <thead>
-        <tr>
-            <th>{{ i18n "weekday" }}</th>
-            <th class="right">{{ i18n "date" }}</th>
-            <th class="right">{{ i18n "time" }}</th>
-        </tr>
-    </thead>
-    <tbody>
-    {{ $appointments := getJSON "https://stustanet.de/api/officehours.json" }}
-    {{ range first 5 $appointments }}
-        <tr>
-            <td>{{ if (eq $.Site.Language.Lang "de") }}
-                {{ index $.Site.Data.DE.Wochentage (sub (time (int .start)).Weekday 1) }}
-            {{ else }}
-                {{ dateFormat "Monday" (int .start) }}
-            {{ end }}</td>
-            <td class="right">{{ if (eq $.Site.Language.Lang "de") }}
-                {{ (time (int .start)).Day }}. {{ index $.Site.Data.DE.Monate (sub (time (int .start)).Month 1) }} {{ (time (int .start)).Year }}
-            {{ else }}
-                {{ dateFormat "January 2, 2006" (int .start) }}
-            {{ end }}</td>
-            <td class="right">{{ dateFormat "15:04" (int .start) }} – {{ dateFormat "15:04" (int .end) }}</td>
-        </tr>
-    {{ end }}
-    </tbody>
+<thead>
+<tr>
+<th>{{ i18n "weekday" }}</th>
+<th class="right">{{ i18n "date" }}</th>
+<th class="right">{{ i18n "time" }}</th>
+</tr>
+</thead>
+<tbody>
+{{ $appointments := getJSON "https://stustanet.de/api/officehours.json" }}
+{{ range first 5 $appointments }}
+<tr>
+<td>{{ if (eq $.Site.Language.Lang "de") }}
+{{ index $.Site.Data.DE.Wochentage (sub (time (int .start)).Weekday 1) }}
+{{ else }}
+{{ dateFormat "Monday" (int .start) }}
+{{ end }}</td>
+<td class="right">{{ if (eq $.Site.Language.Lang "de") }}
+{{ (time (int .start)).Day }}. {{ index $.Site.Data.DE.Monate (sub (time (int .start)).Month 1) }} {{ (time (int .start)).Year }}
+{{ else }}
+{{ dateFormat "January 2, 2006" (int .start) }}
+{{ end }}</td>
+<td class="right">{{ dateFormat "15:04" (int .start) }} – {{ dateFormat "15:04" (int .end) }}</td>
+</tr>
+{{ end }}
+</tbody>
 </table>

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

@@ -666,11 +666,13 @@ a:active {
     text-decoration: underline;
 }
 
-a.button {
+.button {
     display: inline-block;
-    padding: 4px 8px;
-    border: 1px solid #1b54ac;
+    padding: 6px 8px 2px;
+    background: #4f76b1;
+    border: 1px solid #4f76b1;
     border-radius: 5px;
+    color: #fff;
     cursor: pointer;
     white-space: nowrap;
     line-height: 1.5;
@@ -678,22 +680,23 @@ a.button {
     text-align: center;
     text-decoration: none;
 }
-a.button:hover,
-p.button-container .button:hover {
+.button.outline {
+    background: #fff;
+    border: 1px solid #1b54ac;
+    color: #1b54ac;
+}
+.button:hover,
+.button-container .button:hover {
     background-color: #1b54ac;
     color: #fff;
     text-decoration: none;
 }
-p.button-container {
+.button-container {
     text-align: center;
     margin: 0.8em 0 2em;
 }
-p.button-container .button {
+.button-container .button {
     min-width: 40%;
-    padding: 6px 8px 2px;
-    background: #4f76b1;
-    border-color: #4f76b1;
-    color: #fff;
 }
 
 
@@ -832,20 +835,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;
 }