Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • 016967/stustanet-website
  • antodias/stustanet-website
  • ml/stustanet-website
  • 015250/stustanet-website
  • stustanet/stustanet-website
  • 010296/stustanet-website
  • 005438/stustanet-website
  • 011344/stustanet-website
  • michaelb/stustanet-website
  • 009834/stustanet-website
  • mariem/stustanet-website
  • 010699/stustanet-website
12 results
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 191 additions and 54 deletions
data/Stats.toml
View file @ 485ce623
Users = 2700
Internet = 6
Internet = 10
data/Vorstand.toml
View file @ 485ce623
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"
i18n/de.toml
View file @ 485ce623
......@@ -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"
i18n/en.toml
View file @ 485ce623
......@@ -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"
layouts/404.html 0 → 100644
View file @ 485ce623
{{ define "main"}}
<h1 id="title">Oops! Page not found.</h1>
<p><a class="button" href="{{ "/" | relURL }}">Go to the Homepage</a></p>
{{ end }}
layouts/_default/baseof.html
View file @ 485ce623
......@@ -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">
......
layouts/_default/list.html 0 → 100644
View file @ 485ce623
{{ define "main" }}{{.Content}}{{ end }}
\ No newline at end of file
layouts/keys/list.html 0 → 100644
View file @ 485ce623
{{ .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 0 → 100644
View file @ 485ce623
{{ .Content }}
\ No newline at end of file
layouts/shortcodes/address.html 0 → 100644
View file @ 485ce623
<address>
{{ replace (trim .Inner "\n") "\n" "<br/>" | safeHTML }}
</address>
layouts/shortcodes/alert.html 0 → 100644
View file @ 485ce623
<div class="alert">{{ .Inner | markdownify }}</div>
layouts/shortcodes/button.html 0 → 100644
View file @ 485ce623
<p class="button-container"><a class="button" href="{{ if .Get "ref" }}{{ ref . ( .Get "ref" ) }}{{ else }}{{ .Get "href" }}{{ end }}">{{ .Get "label" }}</a></p>
layouts/shortcodes/dl.html
View file @ 485ce623
<dl>
<dt>{{ .Get "title" }}</dt>
<dd>
{{ replace .Inner "\n" "<br/>" | safeHTML }}
{{ trim .Inner "\n" | safeHTML }}
</dd>
</dl>
layouts/shortcodes/fingerprint.html 0 → 100644
View file @ 485ce623
<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/flex-item.html 0 → 100644
View file @ 485ce623
<div class="flex-item">{{ .Inner }}</div>
layouts/shortcodes/key.html 0 → 100644
View file @ 485ce623
{{ .Inner }}
\ No newline at end of file
layouts/shortcodes/officehours.html
View file @ 485ce623
<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 0 → 100644
View file @ 485ce623
<meta http-equiv="refresh" content="0; url={{.Get 0}}"/>
\ No newline at end of file
layouts/shortcodes/vorstand.html
View file @ 485ce623
<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>
layouts/shortcodes/warn.html 0 → 100644
View file @ 485ce623
<div class="warn">{{ .Inner | markdownify }}</div>