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 181 additions and 69 deletions
layouts/_default/baseof.html
View file @ 485ce623
......@@ -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 }}{{ with .File }}{{ .Path }}{{ end }}" title="{{ i18n "editPage" }}">{{ i18n "editPage" }}</a>
</div>
<div class="center">
</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/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 (trim .Inner "\n") "\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/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>
<dl>
<dt>Vorsitzender Vorstand:</dt>
<dd>{{ .Site.Data.Vorstand.VV }}</dd>
<dt>Schatzmeister:</dt>
<dd>{{ .Site.Data.Vorstand.CC }}</dt>
<dt>1. Technischer Vorstand:</dt>
<dd>{{ .Site.Data.Vorstand.TV1 }}</dt>
<dt>2. Technischer Vorstand:</dt>
<dd>{{ .Site.Data.Vorstand.TV2 }}</dt>
<dt>3. Technischer Vorstand:</dt>
<dd>{{ .Site.Data.Vorstand.TV3 }}</dt>
</dl>
<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>
static/css/main.css
View file @ 485ce623
......@@ -542,6 +542,10 @@ article {
flex: 1 1 0;
}
address {
font-style: normal;
}
p, ul, ol {
line-height: 1.5rem;
margin-top: 0.5rem;
......@@ -576,12 +580,16 @@ dt {
font-weight: bold;
flex: 0 0 30%;
max-width: 30%;
margin: 0;
margin: 0.5em 0 0;
}
dd {
flex: 0 0 70%;
max-width: 70%;
margin: 0;
margin: 0.5em 0 0;
}
dt:first-of-type,
dd:first-of-type {
margin-top: 0;
}
dd dl dt {
font-weight: normal;
......@@ -653,15 +661,18 @@ a {
text-decoration: none;
}
a:hover, a:active {
a:hover,
a:active {
text-decoration: underline;
}
a.button {
.button {
display: inline-block;
padding: 5px 10px;
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;
......@@ -669,12 +680,25 @@ a.button {
text-align: center;
text-decoration: none;
}
a.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;
}
.button-container {
text-align: center;
margin: 0.8em 0 2em;
}
.button-container .button {
min-width: 40%;
}
#main {
margin-top: 30px;
......@@ -811,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;
}
......@@ -846,10 +875,6 @@ footer .lang-dropdown {
font-style: italic;
}
.vorstand ul {
padding-left: 0;
}
@media (max-width: 720px) {
main {
padding: 25px 0;
......
static/robots.txt
View file @ 485ce623
User-agent: *
Disallow: /mail/
Disallow: /de/impressum/
Disallow: /en/impressum/
static/support/routerproblem/ipconfigcmd.png 100644 → 100755
View replaced file @ e1feec0f View file @ 485ce623
static/support/routerproblem/ipconfigcmd.png

14.2 KiB | W: 0px | H: 0px

static/support/routerproblem/ipconfigcmd.png

16.4 KiB | W: 0px | H: 0px

static/support/routerproblem/ipconfigcmd.png
static/support/routerproblem/ipconfigcmd.png
static/support/routerproblem/ipconfigcmd.png
static/support/routerproblem/ipconfigcmd.png
  • 2-up
  • Swipe
  • Onion skin
static/support/routerproblem/newips_interface_settings.png 0 → 100644
View file @ 485ce623
static/support/routerproblem/newips_interface_settings.png

52.6 KiB

static/support/routerproblem/newips_network_settings.png 0 → 100644
View file @ 485ce623
static/support/routerproblem/newips_network_settings.png

153 KiB

static/support/selftest/selftestblock.png 0 → 100755
View file @ 485ce623
static/support/selftest/selftestblock.png

129 KiB