layouts/shortcodes/users.html

+{{ .Site.Data.Stats.Users }}

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>
-        </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

+<div class="warn">{{ .Inner | markdownify }}</div>

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>
+    <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 newline at end of file

static/css/main.css

@@ -18,6 +18,7 @@ html, body {
     border: 0;
     width: 100%;
     height: 100%;
+    min-width: 400px;
 }
 
 body {
@@ -361,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 {
@@ -444,6 +449,54 @@ header .subtitle {
     width: 200px;
 }
 
+.two-columns:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.two-columns .column:first-child {
+    float: left;
+    width: 70%;
+}
+
+.two-columns .column:last-child {
+    float: right;
+    width: 25%;
+}
+
+.two-columns .column:last-child > *:first-child,
+.two-columns .column:last-child > .flex-item:first-child > * {
+    margin-top: 0em;
+}
+
+.two-columns .column:last-child ul {
+    list-style: none;
+    text-indent: 0;
+    margin: 0;
+    padding: 0;
+}
+
+.two-columns .column:last-child ul.right {
+    text-align: right;
+}
+
+.two-columns .column:last-child ul li {
+    margin: 0;
+    padding: 5px 0;
+    border-top: 1px solid #dee2e6;
+}
+
+.two-columns .column:last-child ul li:first-child {
+    border-top: none;
+}
+
+.two-columns .column:last-child ul li .fa {
+    width: 16px;
+    margin-right: 4px;
+    text-align: center;
+}
+
 h1,
 h2,
 h3,
@@ -466,7 +519,7 @@ h2 {
     margin-top: 2rem;
 }
 h3 {
-    font-size: 1.3rem;
+    font-size: 1.1rem;
 }
 h4 {
     font-size: 0.707rem;
@@ -478,7 +531,7 @@ h6 {
     font-size: 0.3535rem;
 }
 h2 + h3 {
-    margin-top: 0.3rem;
+    margin-top: 0.5rem;
 }
 
 article {
@@ -489,14 +542,25 @@ 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: 25px;
+    margin-left: 0;
     line-height: 1.5rem;
 }
 ul ul,
@@ -509,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 {
@@ -532,11 +620,35 @@ table {
     margin-top: 1.5rem;
     border-spacing: 0px;
     border-collapse: collapse;
+    width: 100%;
 }
 table td,
 table th {
-    padding: 0;
     line-height: 33px;
+    padding: .3em 1em;
+    vertical-align: top;
+}
+
+table th {
+    border-bottom: 2px solid #dee2e6;
+    text-align: left;
+}
+
+.wifi table th:first-child {
+    width: 10em;
+}
+
+table td {
+    vertical-align: top;
+    border-top: 1px solid #dee2e6;
+}
+
+.center {
+    text-align: center;
+}
+
+.right {
+    text-align: right;
 }
 
 code {
@@ -549,10 +661,162 @@ a {
     text-decoration: none;
 }
 
-a:hover, a:active {
+a:hover,
+a:active {
     text-decoration: underline;
 }
 
+.button {
+    display: inline-block;
+    padding: 6px 8px 2px;
+    background: #4f76b1;
+    border: 1px solid #4f76b1;
+    border-radius: 5px;
+    color: #fff;
+    cursor: pointer;
+    white-space: nowrap;
+    line-height: 1.5;
+    font-weight: 600;
+    text-align: center;
+    text-decoration: none;
+}
+.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;
@@ -565,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;
 }
 
@@ -598,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;
 }
@@ -607,10 +875,6 @@ footer .lang-dropdown {
     font-style: italic;
 }
 
-.vorstand ul {
-    padding-left: 0;
-}
-
 @media (max-width: 720px) {
     main {
         padding: 25px 0;
@@ -634,12 +898,15 @@ footer .lang-dropdown {
         display: block;
     }
 
-    .menu, #top-bar .lang-dropdown {
+    .menu,
+    #top-bar .lang-dropdown {
         display: none;
     }
 
     .big-hero header {
         background-size: auto 250px;
+        background-position: 50% 50%;
+        background-attachment: inherit;
         height: 250px;
     }
 
@@ -650,8 +917,7 @@ footer .lang-dropdown {
     }
 
     .big-hero header h1 {
-        background-position: 50% 50%;
-        padding: 80px 0 0;
+        padding: 25px 0 0;
     }
 
     article > *,
@@ -660,7 +926,94 @@ footer .lang-dropdown {
         padding: 0 25px;
     }
 
+    header {
+        padding: 0;
+    }
+
     footer .editPage a {
         color: transparent;
     }
+
+    #stats {
+        position: static;
+        top: 25px;
+        right: 0;
+        display: flex;
+        flex-wrap: wrap;
+        padding-top: 12px;
+    }
+
+    #stats div {
+        display: inline;
+        white-space: nowrap;
+        font-size: 12px;
+        padding: 6px 0;
+        width: 50%;
+    }
+
+    #stats div span {
+        font-size: 14px;
+        width: 175px;
+        margin-bottom: 4px;
+    }
+
+    #stats div i {
+        font-size: 32px;
+        width: 48px;
+        height: 42px;
+    }
+
+    #stats i.fa {
+        font-size: 28px;
+        width: 45px;
+        height: 32px;
+    }
+
+    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 {
+        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/robots.txt

+User-agent: *
+Disallow: /mail/