From 8665c7f17004af507ccfe25f7766a0375727f953 Mon Sep 17 00:00:00 2001
From: Kaylee Roland <its.kiako@gmail.com>
Date: Sun, 9 Feb 2025 22:08:49 -0600
Subject: [PATCH] feat: Propogating changes from main site

At least as far back as AgoraNomic/agoranomic.github.io/tree/2411868,
but probably more. While there are still substantial shortcomings, at
this point, only CSS should need to substantially change for those
improvements; the HTML will be flexible enough.

Notably, mobile support is completely broken with the current CSS. By
propogating this change to AgoraNomic/ruleset and AgoraNomic/Webmastor,
I can at least remove the depreciated CSS.
---
 _data/nav.yml         | 24 ++++++++++++++++-------
 _includes/chats.html  | 15 +++++++--------
 _includes/nav.html    | 45 ++++++++++++++++++++++++++++---------------
 _layouts/default.html | 22 +++++++++++++--------
 _layouts/puremd.html  |  4 ++--
 5 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/_data/nav.yml b/_data/nav.yml
index 2747b58..22527f3 100644
--- a/_data/nav.yml
+++ b/_data/nav.yml
@@ -2,17 +2,27 @@
   label: Home
 - url: /join.html
   label: Join
-- url: /play
+- url: /play.html
   label: How To Play
 - url: /ruleset/
   label: Rules
-- url: /judgments
+- url: /judgments.html
   label: Judgments
-- url: /glossary
+- url: /glossary.html
   label: Glossary
-- url: /calendar
+- url: /calendar.html
   label: Calendar
-- url: /archives
+- url: /archives.html
   label: Archives
-- url: /Herald/
-  label: Herald
+- label: Offices
+  pages:
+    - url: /judgments.html
+      label: Arbitor
+    - url: /archives.html
+      label: Archivist
+    - url: /assessor/
+      label: Assessor
+    - url: /ruleset/
+      label: Rulekeepor
+    - url: /Webmastor/
+      label: Webmastor
diff --git a/_includes/chats.html b/_includes/chats.html
index 8a1cd12..83ec028 100644
--- a/_includes/chats.html
+++ b/_includes/chats.html
@@ -1,9 +1,8 @@
 <div class="chats">
-  <h3>Chat With Us</h3>
-  <p align="center">All three are connected so just choose your favorite!</p>
-  <a href="https://discord.gg/tz2u6m7"><button position="relative" class="button">Discord</button></a>
-  <a href="https://matrix.to/#/%23agoranomiccommunity%3Amozilla.org?via=mozilla.org&via=matrix.org"><button
-      position="relative" class="button">Matrix</button></a>
-  <a href="irc:irc.libera.chat/##nomic"><button position="relative" class="button">IRC</button></a>
-  <a href="https://web.libera.chat/##nomic"><button position="relative" class="button">IRC (Web)</button></a>
-</div>
\ No newline at end of file
+<h3>Chat With Us</h3>
+<p align="center">All three are connected so just choose your favorite!</p>
+<a href="https://discord.gg/tz2u6m7"><button position="relative" class="button">Discord</button></a>
+<a href="https://matrix.to/#/%23agoranomiccommunity%3Amozilla.org?via=mozilla.org&via=matrix.org"><button position="relative" class="button">Matrix</button></a>
+<a href="irc:irc.libera.chat/##nomic"><button position="relative" class="button">IRC</button></a>
+<a href="https://web.libera.chat/##nomic"><button position="relative" class="button">IRC (Web)</button></a>
+</div>
diff --git a/_includes/nav.html b/_includes/nav.html
index 51d9cdf..82e97d3 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,17 +1,30 @@
-<div class="nvbr desktop">
-  {% for item in site.data.nav %}
-  <a class="{% if item.url == page.url %}active{% endif %}" href="{{ item.url }}">{{ item.label }}</a>
-  {% endfor %}
-</div>
-<div class="nvbr mobile dropdown">
-  <center><button class="dropbtn">Menu</br>☰</button></center>
-  <div class="dropdown-content">
-    {% for item in site.data.nav %}
-    <a class="{% if item.url == page.url %}active{% endif %}" href="{{ item.url }}">{{ item.label }}</a>
-    {% endfor %}
-  </div>
-</div>
-
-<img class="coat-of-arms" src="https://agoranomic.org/coat_of_arms.png" align="right">
+<div class="container">
+  <nav class="main-nav">
+    <ul class="main-menu">
+      {%- for item in site.data.nav %}
+      <li class="main-menu-entry-container">
+        {%- if item.url -%}
+        <a class="main-menu-entry {%- if item.url == page.url %} active{% endif %}" href="{{ item.url }}">{{ item.label
+          }}</a>
+        {%- else -%}
+        <div class="main-menu-entry">{{ item.label }}</div>
+        {%- endif -%}
 
-<div class="nvpad"></div>
\ No newline at end of file
+        {%- if item.pages -%}
+        <ul class="submenu">
+          {%- for subitem in item.pages if subitem.url %}
+          <li>
+            <a class="{% if subitem.url == page.url %}active{% endif %}" href="{{ subitem.url }}">{{ subitem.label
+              }}</a>
+          </li>
+          {%- endfor %}
+        </ul>
+        {% endif %}
+      </li>
+      {%- endfor %}
+    </ul>
+  </nav>
+  <div class="coat-of-arms-container">
+    <img class="coat-of-arms" src="https://agoranomic.org/coat_of_arms.png">
+  </div>
+</div>
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index 82f4720..76746a4 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 
 <head>
   <title>{{ page.title}} | {{site.name}}</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <!-- DEBUG: {{ page.url }} -->
 
   <script src="https://code.jquery.com/jquery-3.2.1.min.js"
     integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
 
   <link rel="icon" type="image/png" href="https://agoranomic.org/coat_of_arms.png" />
   <link rel="stylesheet" href="https://agoranomic.org/style.css">
-  <!-- TODO: Insert your custom stylesheet, if using. -->
 
   <!-- Latest compiled and minified JavaScript -->
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
@@ -20,12 +20,18 @@
 </head>
 
 <body>
-  {% include nav.html %}
-
-  <div class="container">
-    {{ content }}
-
-    {% include chats.html %}
+  <header class="top-navigation">
+    {% include nav.html %}
+  </header>
+
+  <div class="main-wrapper">
+    <main class="main-content">
+      {{ content }}
+    </main>
+
+    <aside>
+      {% include chats.html %}
+    </aside>
   </div>
 
 </body>
diff --git a/_layouts/puremd.html b/_layouts/puremd.html
index 415f63a..e7a439f 100644
--- a/_layouts/puremd.html
+++ b/_layouts/puremd.html
@@ -2,6 +2,6 @@
 layout: default
 ---
 
-<div class="content">
+<article>
   {{ content }}
-</div>
\ No newline at end of file
+</article>
\ No newline at end of file