From b4e0467878c7886db734e557dfe6716673e8639b Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Sun, 14 Nov 2021 08:22:57 +0100
Subject: [PATCH] Reverted page partials into a single one due to better
 performance

---
 material/base.html                       |  4 +--
 material/partials/content.html           | 18 +++++++++++++
 material/partials/page-footer.html       |  9 -------
 material/partials/page-header.html       |  8 ------
 material/partials/page.html              |  7 ------
 src/base.html                            |  4 +--
 src/partials/{page.html => content.html} | 20 +++++++++++++++
 src/partials/page-footer.html            | 29 ---------------------
 src/partials/page-header.html            | 32 ------------------------
 9 files changed, 40 insertions(+), 91 deletions(-)
 create mode 100644 material/partials/content.html
 delete mode 100644 material/partials/page-footer.html
 delete mode 100644 material/partials/page-header.html
 delete mode 100644 material/partials/page.html
 rename src/partials/{page.html => content.html} (77%)
 delete mode 100644 src/partials/page-footer.html
 delete mode 100644 src/partials/page-header.html

diff --git a/material/base.html b/material/base.html
index fecad7962..e570671bb 100644
--- a/material/base.html
+++ b/material/base.html
@@ -160,9 +160,7 @@
           <div class="md-content" data-md-component="content">
             <article class="md-content__inner md-typeset">
               {% block content %}
-                {% include "partials/page-header.html" %}
-                {% include "partials/page.html" %}
-                {% include "partials/page-footer.html" %}
+                {% include "partials/content.html" %}
               {% endblock %}
             </article>
           </div>
diff --git a/material/partials/content.html b/material/partials/content.html
new file mode 100644
index 000000000..177364dbf
--- /dev/null
+++ b/material/partials/content.html
@@ -0,0 +1,18 @@
+{#-
+  This file was automatically generated - do not edit
+-#}
+{% if page.edit_url %}
+<a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-content__button md-icon">
+  {% include ".icons/material/pencil.svg" %}
+</a>
+{% endif %}
+{% if not "\x3ch1" in page.content %}
+  <h1>{{ page.title | d(config.site_name, true)}}</h1>
+{% endif %}
+{{ page.content }}
+{% if page and page.meta and (
+  page.meta.git_revision_date_localized or
+  page.meta.revision_date
+) %}
+  {% include "partials/source-file.html" %}
+{% endif %}
diff --git a/material/partials/page-footer.html b/material/partials/page-footer.html
deleted file mode 100644
index c1d58f8c1..000000000
--- a/material/partials/page-footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{#-
-  This file was automatically generated - do not edit
--#}
-{% if page and page.meta and (
-  page.meta.git_revision_date_localized or
-  page.meta.revision_date
-) %}
-  {% include "partials/source-file.html" %}
-{% endif %}
diff --git a/material/partials/page-header.html b/material/partials/page-header.html
deleted file mode 100644
index f454172b6..000000000
--- a/material/partials/page-header.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{#-
-  This file was automatically generated - do not edit
--#}
-{% if page.edit_url %}
-<a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-content__button md-icon">
-  {% include ".icons/material/pencil.svg" %}
-</a>
-{% endif %}
diff --git a/material/partials/page.html b/material/partials/page.html
deleted file mode 100644
index b57ba9a94..000000000
--- a/material/partials/page.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{#-
-  This file was automatically generated - do not edit
--#}
-{% if not "\x3ch1" in page.content %}
-  <h1>{{ page.title | d(config.site_name, true)}}</h1>
-{% endif %}
-{{ page.content }}
diff --git a/src/base.html b/src/base.html
index 35eb65b0a..417b584b5 100644
--- a/src/base.html
+++ b/src/base.html
@@ -292,9 +292,7 @@
           <div class="md-content" data-md-component="content">
             <article class="md-content__inner md-typeset">
               {% block content %}
-                {% include "partials/page-header.html" %}
-                {% include "partials/page.html" %}
-                {% include "partials/page-footer.html" %}
+                {% include "partials/content.html" %}
               {% endblock %}
             </article>
           </div>
diff --git a/src/partials/page.html b/src/partials/content.html
similarity index 77%
rename from src/partials/page.html
rename to src/partials/content.html
index bb6d63b2a..97b467216 100644
--- a/src/partials/page.html
+++ b/src/partials/content.html
@@ -20,6 +20,18 @@
   IN THE SOFTWARE.
 -->
 
+<!-- Edit button -->
+{% if page.edit_url %}
+<a
+  href="{{ page.edit_url }}"
+  title="{{ lang.t('edit.link.title') }}"
+  class="md-content__button md-icon"
+>
+  {% include ".icons/material/pencil.svg" %}
+</a>
+{% endif %}
+
+
 <!--
   Hack: check whether the content contains a h1 headline. If it
   doesn't, the page title (or respectively site name) is used
@@ -31,3 +43,11 @@
 
 <!-- Markdown content -->
 {{ page.content }}
+
+<!-- Source file information -->
+{% if page and page.meta and (
+  page.meta.git_revision_date_localized or
+  page.meta.revision_date
+) %}
+  {% include "partials/source-file.html" %}
+{% endif %}
diff --git a/src/partials/page-footer.html b/src/partials/page-footer.html
deleted file mode 100644
index 76a0b51e9..000000000
--- a/src/partials/page-footer.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  Copyright (c) 2016-2021 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.
--->
-
-<!-- Source file information -->
-{% if page and page.meta and (
-  page.meta.git_revision_date_localized or
-  page.meta.revision_date
-) %}
-  {% include "partials/source-file.html" %}
-{% endif %}
diff --git a/src/partials/page-header.html b/src/partials/page-header.html
deleted file mode 100644
index 3fa8bfd6f..000000000
--- a/src/partials/page-header.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Copyright (c) 2016-2021 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.
--->
-
-<!-- Edit button -->
-{% if page.edit_url %}
-<a
-  href="{{ page.edit_url }}"
-  title="{{ lang.t('edit.link.title') }}"
-  class="md-content__button md-icon"
->
-  {% include ".icons/material/pencil.svg" %}
-</a>
-{% endif %}