From e68e992d700d071b5daff740aeb08d74a9f345b6 Mon Sep 17 00:00:00 2001
From: James Shuttleworth <digehode@googlemail.com>
Date: Fri, 26 Feb 2021 11:25:17 +0000
Subject: [PATCH] Updated for new material theme file layout

---
 custom_theme/main.html                 |   8 --
 custom_theme/partials/header.html      | 141 +++++++++++--------------
 custom_theme/partials/themetoggle.html |   4 +-
 3 files changed, 66 insertions(+), 87 deletions(-)
 delete mode 100644 custom_theme/main.html

diff --git a/custom_theme/main.html b/custom_theme/main.html
deleted file mode 100644
index 90ca5c3..0000000
--- a/custom_theme/main.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "base.html" %}
-
-{% block scripts %}
-    {{ super() }}  {# Call super to load the parent version of this #}
-
-    {# Then add our part of the script to the end of it #}
-    <script src="{{ 'assets/javascripts/themetoggle.js' | url }}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/custom_theme/partials/header.html b/custom_theme/partials/header.html
index 222917d..738ba8d 100644
--- a/custom_theme/partials/header.html
+++ b/custom_theme/partials/header.html
@@ -1,84 +1,71 @@
-<!--
-  Copyright (c) 2016-2020 Martin Donath <martin.donath@squidfunk.com>
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to
-  deal in the Software without restriction, including without limitation the
-  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-  sell copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
--->
-
-<!-- Application header -->
+{#-
+  This file was automatically generated - do not edit
+-#}
+{% set site_url = config.site_url | d(nav.homepage.url, true) | url %}
+{% if not config.use_directory_urls and site_url[0] == site_url[-1] == "." %}
+  {% set site_url = site_url ~ "/index.html" %}
+{% endif %}
 <header class="md-header" data-md-component="header">
-
-    <!-- Top-level navigation -->
-    <nav class="md-header-nav md-grid" aria-label="{{ lang.t('header.title') }}">
-  
-      <!-- Link to home -->
-      <a
-        href="{{ config.site_url | default(nav.homepage.url, true) | url }}"
-        title="{{ config.site_name }}"
-        class="md-header-nav__button md-logo"
-        aria-label="{{ config.site_name }}"
-      >
-        {% include "partials/logo.html" %}
-      </a>
-  
-      <!-- Button to open drawer -->
-      <label class="md-header-nav__button md-icon" for="__drawer">
-        {% include ".icons/material/menu" ~ ".svg" %}
-      </label>
-  
-      <!-- Header title -->
-      <div class="md-header-nav__title" data-md-component="header-title">
-        {% if config.site_name == page.title %}
-          <div class="md-header-nav__ellipsis md-ellipsis">
+  <nav class="md-header__inner md-grid" aria-label="{{ lang.t('header.title') }}">
+    <a href="{{ site_url }}" title="{{ config.site_name | e }}" class="md-header__button md-logo" aria-label="{{ config.site_name }}">
+      {% include "partials/logo.html" %}
+    </a>
+    <label class="md-header__button md-icon" for="__drawer">
+      {% include ".icons/material/menu" ~ ".svg" %}
+    </label>
+    <div class="md-header__title" data-md-component="header-title">
+      <div class="md-header__ellipsis">
+        <div class="md-header__topic">
+          <span class="md-ellipsis">
             {{ config.site_name }}
-          </div>
-        {% else %}
-          <div class="md-header-nav__ellipsis">
-            <span class="md-header-nav__topic md-ellipsis">
-              {{ config.site_name }}
-            </span>
-            <span class="md-header-nav__topic md-ellipsis">
-              {% if page and page.meta and page.meta.title %}
-                {{ page.meta.title }}
-              {% else %}
-                {{ page.title }}
-              {% endif %}
-            </span>
-          </div>
-        {% endif %}
+          </span>
+        </div>
+        <div class="md-header__topic" data-md-component="header-topic">
+          <span class="md-ellipsis">
+            {% if page and page.meta and page.meta.title %}
+              {{ page.meta.title }}
+            {% else %}
+              {{ page.title }}
+            {% endif %}
+          </span>
+        </div>
       </div>
-  
-      <!-- Button to open search dialogue -->
-      {% if "search" in config["plugins"] %}
-        <label class="md-header-nav__button md-icon" for="__search">
-          {% include ".icons/material/magnify.svg" %}
-        </label>
-  
-        <!-- Search interface -->
-        {% include "partials/search.html" %}
-      {% endif %}
-  
-      <!-- Repository containing source -->
-      
-      {% if config.repo_url %}
-        <div class="md-header-nav__source">
-          {% include "partials/source.html" %}
+    </div>
+    <div class="md-header__options">
+      {% if config.extra.alternate %}
+        <div class="md-select">
+          {% set icon = config.theme.icon.alternate or "material/translate" %}
+          <span class="md-header__button md-icon">
+            {% include ".icons/" ~ icon ~ ".svg" %}
+          </span>
+          <div class="md-select__inner">
+            <ul class="md-select__list">
+              {% for alt in config.extra.alternate %}
+                <li class="md-select__item">
+                  <a href="{{ alt.link | url }}" class="md-select__link">
+                    {{ alt.name }}
+                  </a>
+                </li>
+                {% endfor %}
+            </ul>
+          </div>
         </div>
       {% endif %}
-      
+    </div>
+    {% if "search" in config["plugins"] %}
+      <label class="md-header__button md-icon" for="__search">
+        {% include ".icons/material/magnify.svg" %}
+      </label>
+      {% include "partials/search.html" %}
+    {% endif %}
+    {% if config.repo_url %}
+      <div class="md-header__source">
+        {% include "partials/source.html" %}
+      </div>
+      {% endif %}
       <!-- Dark Mode Tagging -->
       {% include "partials/themetoggle.html" %}
-    </nav>
-  </header>
\ No newline at end of file
+      
+  </nav>
+</header>
+
diff --git a/custom_theme/partials/themetoggle.html b/custom_theme/partials/themetoggle.html
index 037d0aa..6d9cd45 100644
--- a/custom_theme/partials/themetoggle.html
+++ b/custom_theme/partials/themetoggle.html
@@ -1,5 +1,4 @@
 
-
 <div id="themeToggle2" class="md-source__icon md-icon">
 </div>
 
@@ -13,4 +12,5 @@
         {% set icon = "octicons/moon-24" %}
         {% include ".icons/" ~ icon ~ ".svg" %}
     </div>
-</div>
\ No newline at end of file
+</div>
+<script src="{{ 'assets/javascripts/themetoggle.js' | url }}"></script>