Compare revisions

485ce623 · 485ce623 · 485ce623 · 485ce623 · 485ce623 · 485ce623
--- a/data/Vorstand.toml
+++ b/data/Vorstand.toml
-VV = "Simon Naab"
-CC = "Manuel Simon"
-TV1 = "Johannes Walcher"
-TV2 = "Julien Schmidt"
-TV3 = "Marinus Enzinger"
-Valid = "01.07.2018 – 30.06.2019"
+VV = "Mohni A. Sarabjit Kaur"
+CC = "Iniyan Surendran"
+TV1 = "Jonas Jostan"
+TV2 = "Egon von Brüning"
+TV3 = "Abhijeet Sutar"
+Valid = "01.07.2024 – 30.06.2025"
--- a/i18n/de.toml
+++ b/i18n/de.toml
@@ -27,3 +27,21 @@ other = "Zur Startseite"

 [weekday]
 other = "Wochentag"
+
+[chairman]
+other = "Vorsitzender Vorstand"
+
+[treasurer]
+other = "Schatzmeister"
+
+[1stcto]
+other = "1. Technischer Vorstand"
+
+[2ndcto]
+other = "2. Technischer Vorstand"
+
+[3rdcto]
+other = "3. Technischer Vorstand"
+
+[validity]
+other = "Gültigkeit"
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -27,3 +27,21 @@ other = "To Homepage"

 [weekday]
 other = "Weekday"
+
+[chairman]
+other = "Chairman"
+
+[treasurer]
+other = "Treasurer"
+
+[1stcto]
+other = "1st Technical Director"
+
+[2ndcto]
+other = "2nd Technical Director"
+
+[3rdcto]
+other = "3rd Technical Director"
+
+[validity]
+other = "Validity"
--- a/layouts/404.html
+++ b/layouts/404.html
+{{ define "main"}}
+<h1 id="title">Oops! Page not found.</h1>
+<p><a class="button" href="{{ "/" | relURL }}">Go to the Homepage</a></p>
+{{ end }}
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -26,7 +26,7 @@
    {{- end }}
    {{- end }}
  </head>
-  <body class="{{ .Params.Color | default "blue" }}">
+  <body class="{{ .Params.Color | default "blue" }}{{ with .Params.Class }} {{ . }}{{ end }}">
    <nav id="top-bar">
      <div class="container">
        <div class="logo">
@@ -35,7 +35,7 @@
        <ul class="menu">
          {{ $currentPage := . }}
          {{ range .Site.Menus.main }}
-            <li{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) (eq .URL $.URL) }} class="active"{{end}}>
+            <li{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) (eq .URL $.RelPermalink) }} class="active"{{end}}>
              <a class="menu-item" href="{{ .URL }}" title="{{ .Title }}">{{ .Name }}</a>
            </li>
          {{ end }}
@@ -57,7 +57,7 @@
    <ul>
        {{ $currentPage := . }}
        {{ range .Site.Menus.main }}
-          <li{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) (eq .URL $.URL)}} class="active"{{end}}>
+          <li{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) (eq .URL $.RelPermalink)}} class="active"{{end}}>
            <a class="menu-item" href="{{ .URL }}" title="{{ .Title }}">{{ .Name }}</a>
          </li>
        {{ end }}
@@ -100,11 +100,12 @@

    <footer>
      <div class="container">
-        <div class="editPage">
+        <!--<div class="editPage">
          <i class="fa fa-pencil"></i>
-          <a href="{{ .Site.Params.gitEditBaseUrl }}{{ .File.Path }}" title="{{ i18n "editPage" }}">{{ i18n "editPage" }}</a>
-        </div>
-        <div class="center">
+          <a href="{{ .Site.Params.gitEditBaseUrl }}{{ with .File }}{{ .Path }}{{ end }}" title="{{ i18n "editPage" }}">{{ i18n "editPage" }}</a>
+        </div>-->
+        <div class="spacer"></div>
+        <div class="links">
          <a href="/impressum">{{ i18n "imprint" }}</a>
        </div>
        <div class="lang-dropdown-container">

--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
+{{ define "main" }}{{.Content}}{{ end }}
\ No newline at end of file
--- a/layouts/keys/list.html
+++ b/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
--- a/layouts/keys/single.html
+++ b/layouts/keys/single.html
+{{ .Content }}
\ No newline at end of file
--- a/layouts/shortcodes/address.html
+++ b/layouts/shortcodes/address.html
+<address>
+    {{ replace (trim .Inner "\n") "\n" "<br/>" | safeHTML }}
+</address>
--- a/layouts/shortcodes/alert.html
+++ b/layouts/shortcodes/alert.html
+<div class="alert">{{ .Inner | markdownify }}</div>
--- a/layouts/shortcodes/button.html
+++ b/layouts/shortcodes/button.html
+<p class="button-container"><a class="button" href="{{ if .Get "ref" }}{{ ref . ( .Get "ref" ) }}{{ else }}{{ .Get "href" }}{{ end }}">{{ .Get "label" }}</a></p>
--- a/layouts/shortcodes/dl.html
+++ b/layouts/shortcodes/dl.html
 <dl>
    <dt>{{ .Get "title" }}</dt>
    <dd>
-        {{ replace .Inner "\n" "<br/>" | safeHTML }}
+        {{ trim .Inner "\n" | safeHTML }}
    </dd>
 </dl>
--- a/layouts/shortcodes/fingerprint.html
+++ b/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
--- a/layouts/shortcodes/flex-item.html
+++ b/layouts/shortcodes/flex-item.html
+<div class="flex-item">{{ .Inner  }}</div>
--- a/layouts/shortcodes/key.html
+++ b/layouts/shortcodes/key.html
+{{ .Inner }}
\ No newline at end of file
--- a/layouts/shortcodes/officehours.html
+++ b/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>
-
-
--- a/layouts/shortcodes/redirect.html
+++ b/layouts/shortcodes/redirect.html
+<meta http-equiv="refresh" content="0; url={{.Get 0}}"/>
\ No newline at end of file
--- 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>
-            <li>3. Technischer Vorstand: {{ .Site.Data.Vorstand.TV3 }}</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>
No results found