Die-KoMa · thelegy · Jul 9, 2023 · Mar 19, 2023 · Mar 19, 2023 · Mar 19, 2023
diff --git a/KoMaPedia/index.html b/KoMaPedia/index.html
@@ -1,11 +1,12 @@
 ---
 title: KoMaPedia
 menutitle: KoMaPedia
+menuurl: https://www.komapedia.org
 order: 99
 ---
 
-Sie werden weitergeleitet
+<a href="{{ page.menuurl }}">Klicken Sie hier, falls sie nicht weitergeleitet werden.</a>
 
 <script language="javascript"><!--
-window.location.href="https://www.komapedia.org";
+  window.location.href="{{ page.menuurl }}";
 // --></script>
diff --git a/_includes/arrowhead.svg b/_includes/arrowhead.svg
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,11 +1,32 @@
-<div class="footer">
-  <a href="/impressum/">Impressum</a>
-  &middot;
-  <a href="/datenschutz/">Datenschutz</a>
-  &middot;
-  <a href="/ueber_diese_seite/">Über diese Seite</a>
-
-  <a class="sponsoring" href="https://www.hetzner.com/cloud" target="blank">
-    <img src="/core/image/hosted-by-hetzner-201.png" alt="hosted by HETZNER" />
-  </a>
-</div>
+<footer>
+
+  <div>
+    <a href="/kommunikation/koma-buero/"><h1>KoMa-Büro</h1></a>
+    <pre>
+KoMa Büro c/o Fachschaft Mathematik
+Endenicher Allee 60
+D-53115 Bonn
+
+E-Mail: [email protected]
+    </pre>
+  </div>
+
+  <div>
+    <a href="/foerderverein/"><h1>KoMa e.V.</h1></a>
+    <p>IBAN: <code>DE38 4726 0121 8917 0136 00</code></p>
+  </div>
+
+  <div>
+    <h1>KoMa Admins</h1>
+    <a target="_blank" href="https://github.com/Die-KoMa/die-koma.org">
+      <img alt="GitHub" src="/core/image/github.svg">
+    </a>
+    <p>E-Mail: <a href="mailto:[email protected]">[email protected]</a></p>
+    <a href="/impressum/">Impressum</a>
+    <a href="/datenschutz/">Datenschutz</a>
+    <a class="sponsoring" href="https://www.hetzner.com/cloud" target="blank">
+      <img src="/core/image/hosted-by-hetzner-201.png" alt="hosted by HETZNER" />
+    </a>
+  </div>
+
+</footer>
diff --git a/_includes/head.html b/_includes/head.html
@@ -1,13 +1,14 @@
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+{% if site.livereload %}<head>{% endif -%}
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
-  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
+<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
+<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-  <link rel="stylesheet" href="{{ "/core/css/main.css" | prepend: site.baseurl }}">
-  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-  <!-- <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}"> -->
-  <link rel="shortcut icon" href="/static/favicon.ico" />
+<link rel="stylesheet" href="{{ "/core/css/main.css" | prepend: site.baseurl }}">
+<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+<link rel="shortcut icon" href="/static/favicon.ico" />
+{%- if site.livereload %}
 </head>
+{%- endif -%}
diff --git a/_includes/header.html b/_includes/header.html
@@ -1,14 +1,17 @@
 <header class="site-header">
   <a href="/">
     <div class="logo">
-      <img class="svg" src="/icon-koma.svg">
-      <span href="/">die-koma.org</span>
+      {% capture koma_logo %}{% include koma.svg %}{% endcapture -%}
+      {{ koma_logo | normalize_whitespace | replace: "> <", "><" }}
     </div>
+    <h1>die-koma.org</h1>
     <div class="arrow">
+      {% capture arrowhead %}{% include arrowhead.svg %}{% endcapture -%}
+      {{ arrowhead | normalize_whitespace | replace: "> <", "><" }}
     </div>
-    <img class="arrowhead" src="/arrowhead.svg">
     <div class="subtitle">
-      <span>Konferenz der deutschsprachigen Mathematikfachschaften</span>
+      <h2>Konferenz der deutschsprachigen Mathematikfachschaften</h2>
     </div>
   </a>
 </header>
+{{- '' -}}
diff --git a/_includes/koma.svg b/_includes/koma.svg
diff --git a/_includes/navroot.html b/_includes/navroot.html
@@ -5,34 +5,11 @@
             {%- assign navigation = navigation | push: p -%}
         {%- endif -%}
     {%- endif -%}
-
 {%- endfor -%}
 {%- assign navigation = navigation | sort: 'path' -%}
 {%- assign menudepth = navigation | group_by_exp: 'item', 'item.url | remove_first: "/" | split: "/" | size' -%}
-<div class="site-nav-wrapper">
-<nav class="site-nav">
-{%- comment -%}
-<pre>
-{%- for p in navigation -%}
-{{ p.dir }}
-{{ p.path }}
-{%- endfor -%}
-</pre>
-<pre>
-{%- for m in menudepth -%}
-{{ m }}
-    {%- for p in m.items -%}
-        {{ p.url }}
-    {%- endfor -%}
-{%- endfor -%}
-</pre>
-<pre>
-{%- assign wtf = navigation -%}
-{%- for w in wtf -%}
-    {{ w.dir }}
-{%- endfor -%}
-</pre>
-{%- endcomment -%}
-{%- include navtree.html treeprefix="menu-0" active=include.active depth=1 parent_path="/" -%}
+
+<a id="navlink" href="#nav">⮩ Springe zum Menü</a>
+<nav id="nav">
+{%- include navtree.html depth=1 parent_path="/" %}
 </nav>
-</div>
diff --git a/_includes/navtree.html b/_includes/navtree.html
@@ -1,66 +1,22 @@
 {%- assign depth_entries = menudepth | where: 'name', include.depth -%}
-{%- assign rawentries = "" | split: "" -%}
-{%- for ihateliquid in depth_entries -%}
-    {%- assign rawentries = ihateliquid.items -%}
-{%- endfor -%}
 {%- assign entries = "" | split: "" -%}
-{%- assign parent_path_size = include.parent_path.size -%}
-{%- for e in rawentries -%}
-    {%- assign entrytext = e.url | slice: 0,parent_path_size -%}
-    {%- if entrytext contains include.parent_path -%}
-        {%- assign entries = entries | push: e -%}
-    {%- endif -%}
+{%- for e in depth_entries.first.items -%}
+  {%- assign entrytext = e.url | slice: 0, include.parent_path.size -%}
+  {%- if entrytext contains include.parent_path -%}
+    {%- assign entries = entries | push: e -%}
+  {%- endif -%}
 {%- endfor -%}
 {%- assign entries = entries | where_exp: 'item', 'item.menuentry == true' -%}
-{%- if entries.size >= 1 -%}
-    <input type="checkbox" name="{{ include.treeprefix }}" id="{{ include.treeprefix }}" hidden="hidden"/>
-    <ul>
-    {%- assign ordered_entries = entries | sort: 'order' -%}
-    {%- for entry in ordered_entries -%}
-        {%- assign treeprefix = include.treeprefix | append: "-" | append: forloop.index -%}
-                {%- assign nextdepth = include.depth | plus: 1 -%}
-                {%- assign nextdepth_entries = menudepth | where: 'name', nextdepth -%}
-                {%- if nextdepth_entries.size == 1 -%}
-                    {%- assign nextrawentries = "" | split: "" -%}
-                    {%- for nextihateliquid in nextdepth_entries -%}
-                        {%- assign nextrawentries = nextihateliquid.items -%}
-                    {%- endfor -%}
-                    {%- assign nextentries = "" | split: "" -%}
-                    {%- assign nextparent_path_size = entry.dir.size -%}
-                    {%- for e in nextrawentries -%}
-                        {%- assign entrytext = e.url | slice: 0,nextparent_path_size -%}
-                        {%- if entrytext contains entry.dir -%}
-                            {%- assign nextentries = nextentries | push: e -%}
-                        {%- endif -%}
-                    {%- endfor -%}
-                    {%- assign nextentries = nextentries | where_exp: 'item', 'item.menuentry == true' -%}
-                    {%- if nextentries.size > 0 -%}{%- assign has_children = true -%}{%- else -%}{%- assign has_children = false -%}{%- endif -%}
-                {%- else -%}{%- assign has_children = false -%}{%- endif -%}
-        {%- assign is_active = false -%}
-        {%- if include.active -%}
-            {%- assign entry_url_active = entry.url | slice: 0,include.active.size -%}
-            {%- if include.active == entry.url -%}
-                {%- assign is_active = true -%}
-            {%- endif -%}
-        {%- endif -%}
-        <li>
-            <input type="radio" name="{{ include.treeprefix }}" id="{{ treeprefix }}" hidden="hidden"/>
-            <label for="{{ treeprefix }}" class="menuitem{% if include.active contains entry.url %} active{% endif %}{% if has_children %} more{% endif %}{% if is_active %} isactive{% endif %}">
-            <a href="{% if entry.menuurl %}{{ entry.menuurl }}{% else %}{{ entry.url}}{% endif %}">
-            {%- if entry.menutitle and entry.menuentitle %}<span lang="de">{{ entry.menutitle }}</span><span lang="en">{{ entry.menuentitle }}</span>{% else %}<span>{{ entry.menutitle | default: entry.menuentitle | default: "XXX" }}</span>{% endif -%}
-            </a>
-            </label>
-        {%- if has_children and entry.submenu == true -%}
-            {%- if include.active contains entry.url -%}
-                {%- include navtree.html treeprefix=treeprefix parent_path=entry.dir depth=nextdepth active=include.active foo=include.foo -%}
-            {%- else -%}
-                {%- include navtree.html treeprefix=treeprefix parent_path=entry.dir depth=nextdepth foo=include.foo -%}
-                {%- comment -%}{%- if nextdepth<3 -%}
-                    {%- include navtree.html treeprefix=treeprefix parent_path=entry.dir depth=nextdepth -%}
-                {%- endif -%}{%- endcomment -%}
-            {%- endif -%}
-        {%- endif -%}
-        </li>
-    {%- endfor -%}
-    </ul>
+
+{%- if entries.size >= 1 %}
+  <ul>
+  {%- assign ordered_entries = entries | sort: 'order' -%}
+  {%- for entry in ordered_entries -%}
+    {%- assign nextdepth = include.depth | plus: 1 -%}
+    {%- assign url = entry.menuurl | default: entry.url %}
+    <li><a href="{{ url }}">{{ entry.menutitle }}</a>
+      {%- include navtree.html parent_path=entry.dir depth=nextdepth -%}
+    </li>
+  {%- endfor %}
+  </ul>
 {%- endif -%}
diff --git a/_includes/next_koma.html b/_includes/next_koma.html
@@ -1,6 +1,6 @@
 <div class="next-koma">
   <h1>Nächste KoMata</h1>
-  <span>Folgende KoMata in der Übersicht:</span>
+  <span>Geplante KoMata in der Übersicht:</span>
   <ul>
     <li>
         <span class="name"><a href="https://komapedia.org/wiki/KoMa_89">KoMa in Darmstadt</a></span>

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,30 +1,20 @@
 <!DOCTYPE html>
-<html xml:lang="de" lang="de" xmlns="http://www.w3.org/1999/xhtml">
+<html lang="de">
+{% include head.html %}
 
-  {% include head.html %}
+{% include header.html %}
 
-  <body><div class="koma">
+{% include navroot.html %}
 
-    {% include header.html %}
+{% include footer.html %}
 
-    <div class="site-content">
+<main>
 
-      {% include navroot.html active=page.url %}
+  {% if page.show_next_koma %}
+  {% include next_koma.html %}
+  {% endif %}
 
-      <div class="content">
-
-        <div class="page-content2">
-          <div class="wrapper2">
-            {{ content }}
-          </div>
-        </div>
-
-      </div>
-
-    </div>
-
-    {% include footer.html %}
-
-  </div></body>
+  {{ content }}
 
+</main>
 </html>
diff --git a/_layouts/startpage.html b/_layouts/startpage.html
diff --git a/_sass/_footer.scss b/_sass/_footer.scss
@@ -1,15 +1,33 @@
-.footer {
+footer {
+  grid-area: footer;
   background-color: #dcdcf2;
-  padding: 10px;
-  font-weight: bold;
+  display: flex;
+  flex-flow: column;
+  justify-content: space-between;
+  gap: 1em;
+  font-size: 1rem;
+  padding: 2em;
 
-  .sponsoring {
-    float: right;
-    position: relative;
-    top: -.2em;
-
-    img {
-      height: 1.5em;
+  > div {
+    display: flex;
+    flex-flow: column;
+    > * {
+      padding-top: .6em;
     }
   }
+
+  h1 {
+    font-size: 1.2em;
+    font-weight: bold;
+    padding-bottom: .4em;
+  }
+
+  .sponsoring img {
+    height: 2.5em;
+  }
+
+  @media (min-width: 800px) {
+    flex-flow: row wrap;
+  }
 }
+