Compare revisions

485ce623 · 485ce623 · 485ce623 · 485ce623 · 485ce623 · 485ce623
--- a/i18n/en.toml
+++ b/i18n/en.toml
+[activeUsers]
+other = "Active Users"
+
+[date]
+other = "Date"
+
 [editPage]
 other = "Edit this Page"

 [imprint]
 other = "Imprint"

+[internetConnection]
+other = "Internet Connection"
+
+[paidEmployees]
+other = "Paid Employees"
+
+[servers]
+other = "Servers"
+
+[time]
+other = "Time"
+
 [toHomepage]
-other = "To Homepage"
\ No newline at end of file
+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
@@ -3,7 +3,8 @@
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{ if .Title }}{{ .Title }} | {{ end }}{{ .Site.Title }}</title>
    {{ if .Params.Description }}
    <meta name="description" content="{{ .Params.Description }}" />
    {{ end }}
@@ -12,6 +13,7 @@
    <meta name="robots" content="noindex">
    {{ end }}
    <link href='/css/main.css' rel='stylesheet' type="text/css" />
+    <link href='/css/font-awesome.min.css' rel='stylesheet' type="text/css" />
    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
    <link rel="icon" type="image/png" href="/favicon16.png" sizes="16x16" />
    <link rel="icon" type="image/png" href="/favicon32.png" sizes="32x32" />
@@ -24,7 +26,7 @@
    {{- end }}
    {{- end }}
  </head>
-  <body>
+  <body class="{{ .Params.Color | default "blue" }}{{ with .Params.Class }} {{ . }}{{ end }}">
    <nav id="top-bar">
      <div class="container">
        <div class="logo">
@@ -33,7 +35,9 @@
        <ul class="menu">
          {{ $currentPage := . }}
          {{ range .Site.Menus.main }}
-            <li><a class="menu-item{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} active{{end}}" href="{{ .URL }}" title="{{ .Title }}">{{ .Name }}</a></li>
+            <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 }}
        </ul>
        {{ $.Scratch.Set "nav-orientation" "" }}
@@ -41,7 +45,6 @@
      </div>
    </nav>

-
    <nav class="hamburger">
      <input type="checkbox" />

@@ -54,7 +57,9 @@
    <ul>
        {{ $currentPage := . }}
        {{ range .Site.Menus.main }}
-          <li><a class="menu-item{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} active{{end}}" href="{{ .URL }}" title="{{ .Title }}">{{ .Name }}</a></li>
+          <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 }}
        <li class="fatty"></li>
        {{ if .Site.IsMultiLingual }}
@@ -78,28 +83,35 @@
      </ul>
    </nav>

-    <article>
-      <header class="{{ .Params.Color | default "blue" }}">
-        <h1>{{.Title}}</h1>
-        {{ with .Params.subtitle }}
-        <span class="subtitle">{{.}}</span>
-        {{ end }}
+    <article{{ if .Params.Hero }} class="big-hero"{{ end }}>
+      <header{{ if .Params.HeaderImage }} style="background-image: url(/{{ .Params.HeaderImage }});"{{ end }}>
+        <div class="container">
+          <h1>{{ .Params.Header | default .Title }}</h1>
+          {{ with .Params.SubHeader }}
+          <span class="subtitle">{{.}}</span>
+          {{ end }}
+          {{ if .Params.HeaderStats }}{{ partial "header-stats.html" . }}{{ end }}
+        </div>
      </header>
-      <div class="container">
+      <div class="container" id="main">
        {{ block "main" . }}{{.Content}}{{ end }}
      </div>
    </article>

    <footer>
-      <div class="editPage">
-        <a href="{{ .Site.Params.gitEditBaseUrl }}{{ .File.Path }}" title="{{ i18n "editPage" }}">{{ i18n "editPage" }}</a>
-      </div>
-      <div class="center">
-        <a href="{{ ref . "impressum.md" }}">{{ i18n "imprint" }}</a>
-      </div>
-      <div class="lang-dropdown-container">
-        {{ $.Scratch.Set "nav-orientation" "up" }}
-        {{ partial "lang-dropdown.html" . }}
+      <div class="container">
+        <!--<div class="editPage">
+          <i class="fa fa-pencil"></i>
+          <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">
+          {{ $.Scratch.Set "nav-orientation" "up" }}
+          {{ partial "lang-dropdown.html" . }}
+        </div>
      </div>
    </footer>
  </body>

--- 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/partials/header-stats.html
+++ b/layouts/partials/header-stats.html
+{{ $servers := (int (index (index (index (index (getJSON "https://stustanet.de/api/servers.json") "cargoquery") 0) "title") "servers")) }}
+<div id="stats">
+    <div><i class="fa fa-users" aria-hidden="true"></i><span>{{ .Site.Data.Stats.Users }}</span>{{ i18n "activeUsers" }}</div>
+    <div><i class="fa fa-server" aria-hidden="true"></i><span>{{ $servers }}</span>{{ i18n "servers" }}</div>
+    <div><i class="fa fa-tachometer" aria-hidden="true"></i><span>{{ .Site.Data.Stats.Internet }} Gbit/s</span>{{ i18n "internetConnection" }}</div>
+    <div><i class="fa fa-id-card-o" aria-hidden="true"></i><span>0</span>{{ i18n "paidEmployees" }}</div>
+</div>
--- a/layouts/partials/lang-dropdown.html
+++ b/layouts/partials/lang-dropdown.html
 <div class="lang-dropdown {{ default "" ($.Scratch.Get "nav-orientation") }}">
-    <span><i class="globe"></i>{{ .Site.Language.Lang }}</span>
+    <span><i class="fa fa-globe"></i>{{ .Site.Language.Lang }}</span>
    <ul>
    {{ if .Site.IsMultiLingual }}
        {{ $lang := .Site.Language }}
@@ -14,10 +14,10 @@
                {{ $.Scratch.Set "url" (delimit (slice "/" .) "") }}
            {{ end }}
            <a href="{{ $.Scratch.Get "url" }}" class="lang">
-                <span class="shorthand">{{ .Lang }}</span>{{ .LanguageName }}
+                <span class="shorthand" aria-hidden="true">{{ .Lang }}</span>{{ .LanguageName }}
            </a>
        </li>
        {{ end }}
    {{ end }}
    </ul>
-</div>
\ No newline at end of file
+</div>
--- 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/column.html
+++ b/layouts/shortcodes/column.html
+<div class="column">{{ .Inner  }}</div>
--- a/layouts/shortcodes/dl.html
+++ b/layouts/shortcodes/dl.html
 <dl>
    <dt>{{ .Get "title" }}</dt>
    <dd>
-        {{ .Inner }}
+        {{ trim .Inner "\n" | safeHTML }}
    </dd>
-</dl>
\ No newline at end of file
+</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
-<ul>
-{{ range getJSON "https://sprechstunden.stusta.de/appointments.json"}}
- <li>{{ dateFormat "Monday, Jan 2, 2006 15:04" (int .start) }} – {{ dateFormat "15:04" (int .end) }}</li>
+<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 }}
-</ul>
+</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/two-columns.html
+++ b/layouts/shortcodes/two-columns.html
+<div class="two-columns">{{ .Inner  }}</div>
--- a/layouts/shortcodes/users.html
+++ b/layouts/shortcodes/users.html
+{{ .Site.Data.Stats.Users }}
No results found