Compare revisions

485ce623 · 485ce623 · 485ce623 · 485ce623 · 485ce623 · 485ce623
--- a/layouts/shortcodes/vorstand.html
+++ b/layouts/shortcodes/vorstand.html
 <dl class="vorstand">
-    <dt>Vorstandsmitglieder</dt>
-    <dd>
-        <ul>
-            <li>Vorsitzender Vorstand: {{ .Site.Data.Vorstand.VV }}</li>
-            <li>Schatzmeister: {{ .Site.Data.Vorstand.CC }}</li>
-            <li>1. Technischer Vorstand: {{ .Site.Data.Vorstand.TV1 }}</li>
-            <li>2. Technischer Vorstand: {{ .Site.Data.Vorstand.TV2 }}</li>
-        </ul>
-        <p>
-            <i>Gültig: {{ .Site.Data.Vorstand.Valid }}</i>
-        </p>
+    <dt>{{ i18n "chairman" }}:</dt>
+    <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 -}}
+    {{ 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 -}}
+    {{ 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 -}}
+    {{ 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 -}}
+    {{ 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>
+</p>
--- a/layouts/shortcodes/warn.html
+++ b/layouts/shortcodes/warn.html
+<div class="warn">{{ .Inner | markdownify }}</div>
--- a/layouts/shortcodes/we-are-not-stuwerk.html
+++ b/layouts/shortcodes/we-are-not-stuwerk.html
 <div class="we-are-not-stuwerk">
-    <b>HINWEIS</b>: Diese Adresse kann bei Wohnungsanfragen <b>NICHT</b> helfen. 
+    <b>HINWEIS</b>: Diese Adresse kann bei Wohnungsanfragen <b>NICHT</b> helfen.
    <a href="http://www.studentenwerk-muenchen.de/wohnen/bewerbung/">Hier ist die richtige Adresse</a>.
    <br />
-    <b>NOTE</b>: This contact <b>CANNOT HELP</b> you get an appartment.
-    Please see <a href="http://www.studentenwerk-muenchen.de/en/student-accommodation/application/">this page</a>.
-</div>
\ No newline at end of file
+    <b>NOTE</b>: This contact <b>CANNOT</b> help you to get an appartment.
+    Please see <a href="http://www.studentenwerk-muenchen.de/en/student-accommodation/application/">this page instead</a>.
+</div>
--- a/static/css/font-awesome.css
+++ b/static/css/font-awesome.css
--- a/static/css/font-awesome.min.css
+++ b/static/css/font-awesome.min.css
--- a/static/styles.css
+++ b/static/styles.css
--- a/static/figures/router_full.jpg
+++ b/static/figures/router_full.jpg
--- a/static/figures/router_m.jpg
+++ b/static/figures/router_m.jpg
--- a/static/fonts/FontAwesome.otf
+++ b/static/fonts/FontAwesome.otf
--- a/static/fonts/fontawesome-webfont.eot
+++ b/static/fonts/fontawesome-webfont.eot
--- a/static/fonts/fontawesome-webfont.svg
+++ b/static/fonts/fontawesome-webfont.svg
--- a/static/fonts/fontawesome-webfont.ttf
+++ b/static/fonts/fontawesome-webfont.ttf
--- a/static/fonts/fontawesome-webfont.woff
+++ b/static/fonts/fontawesome-webfont.woff
--- a/static/fonts/fontawesome-webfont.woff2
+++ b/static/fonts/fontawesome-webfont.woff2
--- a/static/globe.svg
+++ b/static/globe.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 760 760">
+  <path
+     d="m760 380a380 380 0 1 1 -760 0 380 380 0 1 1 760 0z"
+     class="land"
+     style="fill:#1b54ac" />
+  <path
+     d="m10 380c0 69 19 133 52 188l5-90c-42-59-52-84-53-154-3 18-4 37-4 56zm87-238 50-17c33-43 99-94 166-94-26 8-101 44-107 67 28-18 51-21 79-21l61-34-20-29c-92 13-172 60-229 128zm49 239c0 22 22 68 48 68h64l8 13c20 0 20 14 20 32 0 24 30 28 30 66 0 10-12 14-12 30 0 14 37 86 60 86 40 0 84-36 84-52 0-38 34-28 34-54 0-118 48-62 66-164l-41 16c-44-37-70-91-70-111 13 0 53 60 67 96 34-14 69-39 78-75l-18-8-6-12-14 18c-5 0-28-17-35-41 32 21 47 21 103 21 26 0 41 75 66 88 0-41 3-74 18-107 14 0 37 23 53 68-9-164-125-300-280-338l23 19h-25c0 53-16 35-52 75 0-10 0-14 8-19-15-9-29-12-39-12-15 0-56 26-68 52l21-2 8 18c18-11 12-47 39-47 0 8-11 11-11 25l25-1c-23 26-35 32-66 32l-5-16c-9 23-36 35-58 37 0 12-1 19-8 30l-26-5-17 38 33 7c15-24 33-37 58-42l32 35c0 4-6 7-20 7l12 8 18-22c-16-9-22-19-22-31 38 11 29 50 46 53 0-45 31-4 31-58 22 0 60 13 60 29-57 0-73 2-73 20 0 9 49-5 49 42-40 0-58 0-80-12l-7 20c-24-7-49-20-49-48l-58 9-16-10c-40 50-86 44-86 129zm106-217 15-3 7-14c-14 0-21 9-22 17zm9 11 32-5-5-39c-19 10 3 25-27 44zm2-72c13 0 24-2 24-11l-19-4zm218 98c27 0 46 33 46 47l-24-2c0-16-9-33-22-45zm10 431c24 0 48-37 48-77l-38 32z"
+     class="see"
+     style="fill:#ffffff" />
+</svg>
--- a/static/globe.up.svg
+++ b/static/globe.up.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 760 760">
+  <path
+     d="m760 380a380 380 0 1 1 -760 0 380 380 0 1 1 760 0z"
+     class="land"
+     style="fill:#FFFFFF" />
+  <path
+     d="m10 380c0 69 19 133 52 188l5-90c-42-59-52-84-53-154-3 18-4 37-4 56zm87-238 50-17c33-43 99-94 166-94-26 8-101 44-107 67 28-18 51-21 79-21l61-34-20-29c-92 13-172 60-229 128zm49 239c0 22 22 68 48 68h64l8 13c20 0 20 14 20 32 0 24 30 28 30 66 0 10-12 14-12 30 0 14 37 86 60 86 40 0 84-36 84-52 0-38 34-28 34-54 0-118 48-62 66-164l-41 16c-44-37-70-91-70-111 13 0 53 60 67 96 34-14 69-39 78-75l-18-8-6-12-14 18c-5 0-28-17-35-41 32 21 47 21 103 21 26 0 41 75 66 88 0-41 3-74 18-107 14 0 37 23 53 68-9-164-125-300-280-338l23 19h-25c0 53-16 35-52 75 0-10 0-14 8-19-15-9-29-12-39-12-15 0-56 26-68 52l21-2 8 18c18-11 12-47 39-47 0 8-11 11-11 25l25-1c-23 26-35 32-66 32l-5-16c-9 23-36 35-58 37 0 12-1 19-8 30l-26-5-17 38 33 7c15-24 33-37 58-42l32 35c0 4-6 7-20 7l12 8 18-22c-16-9-22-19-22-31 38 11 29 50 46 53 0-45 31-4 31-58 22 0 60 13 60 29-57 0-73 2-73 20 0 9 49-5 49 42-40 0-58 0-80-12l-7 20c-24-7-49-20-49-48l-58 9-16-10c-40 50-86 44-86 129zm106-217 15-3 7-14c-14 0-21 9-22 17zm9 11 32-5-5-39c-19 10 3 25-27 44zm2-72c13 0 24-2 24-11l-19-4zm218 98c27 0 46 33 46 47l-24-2c0-16-9-33-22-45zm10 431c24 0 48-37 48-77l-38 32z"
+     class="see"
+     style="fill:#363636" />
+</svg>
--- a/static/header.jpg
+++ b/static/header.jpg
--- a/static/headers/home.jpg
+++ b/static/headers/home.jpg
--- a/static/headers/imprint.jpg
+++ b/static/headers/imprint.jpg
--- a/static/headers/keyboard.jpg
+++ b/static/headers/keyboard.jpg
No results found