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 409 additions and 77 deletions
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>
layouts/shortcodes/we-are-not-stuwerk.html
View file @ 485ce623
<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>
static/css/main.css
View file @ 485ce623
......@@ -362,10 +362,14 @@ header .subtitle,
color: #FFF;
text-shadow: 0px 0px 1px rgba(0,0,0,0.8);
}
.wifi header h1 {
text-shadow: 0px 0px 4px rgba(0,0,0,0.8);
}
header h1 {
margin: 0 auto 15px auto;
padding: 50px 0;
font-size: 2.4em;
}
.big-hero header {
......@@ -461,7 +465,8 @@ header .subtitle {
width: 25%;
}
.two-columns .column:last-child > *:first-child {
.two-columns .column:last-child > *:first-child,
.two-columns .column:last-child > .flex-item:first-child > * {
margin-top: 0em;
}
......@@ -514,7 +519,7 @@ h2 {
margin-top: 2rem;
}
h3 {
font-size: 1.3rem;
font-size: 1.1rem;
}
h4 {
font-size: 0.707rem;
......@@ -526,7 +531,7 @@ h6 {
font-size: 0.3535rem;
}
h2 + h3 {
margin-top: 0.3rem;
margin-top: 0.5rem;
}
article {
......@@ -537,11 +542,22 @@ article {
flex: 1 1 0;
}
address {
font-style: normal;
}
p, ul, ol {
line-height: 1.5rem;
margin-top: 0.5rem;
margin-bottom: 0;
}
ul, ol {
line-height: 1.5rem;
margin-top: 0.5rem;
margin-bottom: 0;
padding: 0 8px;
list-style-position: inside;
}
ul li,
ol li {
margin-left: 0;
......@@ -557,10 +573,34 @@ ol ol {
dl {
line-height: 1.2;
display: flex;
flex-wrap: wrap;
}
dt {
font-weight: bold;
flex: 0 0 30%;
max-width: 30%;
margin: 0.5em 0 0;
}
dd {
flex: 0 0 70%;
max-width: 70%;
margin: 0.5em 0 0;
}
dt:first-of-type,
dd:first-of-type {
margin-top: 0;
}
dd dl dt {
font-weight: normal;
max-width: 40%;
flex: 0 0 40%;
margin: 0;
}
dd dl dd {
max-width: 60%;
flex: 0 0 60%;
margin: 0 0 0.5em;
}
hr {
......@@ -594,6 +634,10 @@ table th {
text-align: left;
}
.wifi table th:first-child {
width: 10em;
}
table td {
vertical-align: top;
border-top: 1px solid #dee2e6;
......@@ -617,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;
......@@ -633,17 +680,143 @@ 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;
}
div.alert,
div.warn,
div.success {
position: relative;
padding: .5rem .8rem;
margin: .5rem 0;
line-height: 1.5;
border: 1px solid #dee2e6;
border-radius: .25rem;
}
div.alert {
color: #721c24;
background: #f8d7da;
border-color: #f5c6cb;
}
div.warn {
color: #856404;
background: #fff3cd;
border-color: #f2d376;
}
div.success {
background: #e1f6e1;
border-color: #a9deaa;
}
.callout {
padding: 20px;
margin: 20px 0;
border: 1px solid #eee;
border-left-width: 0.25rem;
border-radius: 0.25rem;
}
.callout:after {
content: "";
clear: both;
display: table;
}
.callout img.router {
max-width: 40%;
float: right;
}
.callout img.router.small {
max-width: 33%;
}
.callout ul {
list-style-position: outside;
}
.callout ul {
list-style: none;
padding: 0;
}
.callout li {
padding: 0.2em;
padding-left: 2.2em;
}
.callout li i.fa {
text-align: center;
display: inline-block;
margin-left: -2em;
width: 2em;
}
.callout h3,
.callout h4 {
margin-top: 0;
margin-bottom: 5px;
display: inline;
}
.callout p:last-child {
margin-bottom: 0;
}
.callout code {
border-radius: 3px;
}
.callout+.callout {
margin-top: -5px;
}
.callout-default {
border-left-color: #777;
}
.callout-default h4 {
color: #777;
}
.callout-primary {
border-left-color: #428bca;
}
.callout-primary h4 {
color: #428bca;
}
.callout-success {
border-left-color: #5cb85c;
}
.callout-success h4 {
color: #5cb85c;
}
.callout-danger {
border-left-color: #d9534f;
}
.callout-danger h4 {
color: #d9534f;
}
.callout-warning {
border-left-color: #f0ad4e;
}
.callout-warning h4 {
color: #f0ad4e;
}
.callout-info {
border-left-color: #5bc0de;
}
.callout-info h4 {
color: #5bc0de;
}
footer {
background: #363636;
flex-shrink: 0;
......@@ -656,26 +829,31 @@ footer .container {
}
footer .editPage {
padding: 15px;
padding: 15px 15px 15px 0;
flex: 1 1 0;
text-overflow: clip;
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;
/*flex: 1 1 0;*/
padding: 14px 0 16px 15px;
text-align: right;
}
......@@ -689,7 +867,6 @@ footer .lang-dropdown {
border-radius: 2px;
margin: 5px 0;
padding: 10px 10px 7px 10px;
background: #ffdbdb;
line-height: 1.25;
color: red;
}
......@@ -698,10 +875,6 @@ footer .lang-dropdown {
font-style: italic;
}
.vorstand ul {
padding-left: 0;
}
@media (max-width: 720px) {
main {
padding: 25px 0;
......@@ -725,7 +898,8 @@ footer .lang-dropdown {
display: block;
}
.menu, #top-bar .lang-dropdown {
.menu,
#top-bar .lang-dropdown {
display: none;
}
......@@ -795,12 +969,51 @@ footer .lang-dropdown {
height: 32px;
}
.two-columns .column:first-child {
float: none;
width: 100%;
dl {
display: block;
}
dt,
dd dl dt,
dd dl dd {
flex: 1;
max-width: 100%;
}
dd {
flex: 1;
margin: 0.8em 1em 1.6em;
}
dd dl dd {
margin: 0.25em 0 1em;
}
.two-columns .column {
float: none !important;
width: 100% !important;
}
.two-columns .column:last-child {
display: none;
margin-top: 2rem;
display: flex;
flex-wrap: wrap;
}
.two-columns .flex-item {
flex: 1;
}
.two-columns .flex-item:first-child {
margin-right: 1.5rem;
}
.two-columns .flex-item:last-child {
margin-left: 1.5rem;
}
.two-columns .flex-item h2 {
margin-top: 0;
}
.wifi table th:first-child {
width: 8em;
}
}
static/figures/router_full.jpg 0 → 100644
View file @ 485ce623
static/figures/router_full.jpg

82.6 KiB