From f2e9882603f04e4fa7990d500968b8401bf4fe00 Mon Sep 17 00:00:00 2001 From: flashwave Date: Wed, 24 Apr 2024 02:27:26 +0000 Subject: [PATCH] master -> html, master-2021 -> master --- templates/ascii/master.twig | 2 +- templates/dev/master.twig | 2 +- templates/errors/master.twig | 2 +- templates/html.twig | 18 +++++++++ templates/master-2021.twig | 59 --------------------------- templates/master.twig | 77 +++++++++++++++++++++++++++--------- templates/whois/master.twig | 2 +- 7 files changed, 81 insertions(+), 81 deletions(-) create mode 100644 templates/html.twig delete mode 100644 templates/master-2021.twig diff --git a/templates/ascii/master.twig b/templates/ascii/master.twig index dbcc819..fc530f2 100644 --- a/templates/ascii/master.twig +++ b/templates/ascii/master.twig @@ -1 +1 @@ -{% extends 'master-2021.twig' %} +{% extends 'master.twig' %} diff --git a/templates/dev/master.twig b/templates/dev/master.twig index dbcc819..fc530f2 100644 --- a/templates/dev/master.twig +++ b/templates/dev/master.twig @@ -1 +1 @@ -{% extends 'master-2021.twig' %} +{% extends 'master.twig' %} diff --git a/templates/errors/master.twig b/templates/errors/master.twig index 1758dbd..e11776a 100644 --- a/templates/errors/master.twig +++ b/templates/errors/master.twig @@ -1,4 +1,4 @@ -{% extends 'master.twig' %} +{% extends 'html.twig' %} {% set error_string = 'HTTP %03d %s'|format(error_code, error_text) %} {% set master_title = error_string ~ ' // flash.moe' %} diff --git a/templates/html.twig b/templates/html.twig new file mode 100644 index 0000000..d19c05e --- /dev/null +++ b/templates/html.twig @@ -0,0 +1,18 @@ + + + + + {% if master_title is defined and master_title is not empty %}{{ master_title }}{% endif %} + {% block master_head %}{% endblock %} + {% if csrfp_available() %}{% endif %} + {% for style in styles|default([]) %} + + {% endfor %} + + + {% block master_body %}{% endblock %} + {% for script in scripts|default([]) %} + + {% endfor %} + + diff --git a/templates/master-2021.twig b/templates/master-2021.twig deleted file mode 100644 index ddfdd98..0000000 --- a/templates/master-2021.twig +++ /dev/null @@ -1,59 +0,0 @@ -{% extends 'master.twig' %} - -{% set master_title = (header_title is defined ? (header_title ~ ' // ') : '') ~ 'flash.moe' %} - -{% set styles = [ globals.assetsInfo.get('makai.css') ] %} -{% set scripts = [ globals.assetsInfo.get('makai.js') ] %} - -{% set master_body_attrs = master_body_attrs|default([])|merge({ - 'class': html_classes({ - 'index': header_is_index is defined, - 'fullscreen-header': header_full is defined, - 'now-playing': header_now_playing is defined, - 'header-minimal': header_minimal is defined - }), -}) %} - -{% block master_head %} - -{% endblock %} - -{% block master_body %} -
-
- -
-
0 %}style="padding-bottom: {{ header_offset }}px"{% endif %}> - -
-
-
-
-
-
- -
-
-
-
-
-
-
- {% for link in globals.siteInfo.headerNavigation %} - {{ link.title }} - {% endfor %} -
-
-
-
-
- {% block container %} - {% endblock %} -
-
-
© flashwave {{ footer_copy_start|default('2010') }}-{{ footer_copy_end|default(('now'|date('Y'))) }} - {{ random(globals.siteInfo.footerQuotes) }}
-
-{% endblock %} diff --git a/templates/master.twig b/templates/master.twig index d19c05e..def703d 100644 --- a/templates/master.twig +++ b/templates/master.twig @@ -1,18 +1,59 @@ - - - - - {% if master_title is defined and master_title is not empty %}{{ master_title }}{% endif %} - {% block master_head %}{% endblock %} - {% if csrfp_available() %}{% endif %} - {% for style in styles|default([]) %} - - {% endfor %} - - - {% block master_body %}{% endblock %} - {% for script in scripts|default([]) %} - - {% endfor %} - - +{% extends 'html.twig' %} + +{% set master_title = (header_title is defined ? (header_title ~ ' // ') : '') ~ 'flash.moe' %} + +{% set styles = [ globals.assetsInfo.get('makai.css') ] %} +{% set scripts = [ globals.assetsInfo.get('makai.js') ] %} + +{% set master_body_attrs = master_body_attrs|default([])|merge({ + 'class': html_classes({ + 'index': header_is_index is defined, + 'fullscreen-header': header_full is defined, + 'now-playing': header_now_playing is defined, + 'header-minimal': header_minimal is defined + }), +}) %} + +{% block master_head %} + +{% endblock %} + +{% block master_body %} +
+
+ +
+
0 %}style="padding-bottom: {{ header_offset }}px"{% endif %}> + +
+
+
+
+
+
+ +
+
+
+
+
+
+
+ {% for link in globals.siteInfo.headerNavigation %} + {{ link.title }} + {% endfor %} +
+
+
+
+
+ {% block container %} + {% endblock %} +
+
+
© flashwave {{ footer_copy_start|default('2010') }}-{{ footer_copy_end|default(('now'|date('Y'))) }} - {{ random(globals.siteInfo.footerQuotes) }}
+
+{% endblock %} diff --git a/templates/whois/master.twig b/templates/whois/master.twig index dbcc819..fc530f2 100644 --- a/templates/whois/master.twig +++ b/templates/whois/master.twig @@ -1 +1 @@ -{% extends 'master-2021.twig' %} +{% extends 'master.twig' %}