master -> html, master-2021 -> master
This commit is contained in:
parent
7fa74bbfef
commit
f2e9882603
7 changed files with 81 additions and 81 deletions
|
|
@ -1 +1 @@
|
|||
{% extends 'master-2021.twig' %}
|
||||
{% extends 'master.twig' %}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{% extends 'master-2021.twig' %}
|
||||
{% extends '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' %}
|
||||
|
|
|
|||
18
templates/html.twig
Normal file
18
templates/html.twig
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="{{ master_charset|default('utf-8') }}">
|
||||
{% if master_title is defined and master_title is not empty %}<title>{{ master_title }}</title>{% endif %}
|
||||
{% block master_head %}{% endblock %}
|
||||
{% if csrfp_available() %}<meta name="csrfp-token" content="{{ csrfp_token() }}">{% endif %}
|
||||
{% for style in styles|default([]) %}
|
||||
<link href="{{ style }}" type="text/css" rel="stylesheet">
|
||||
{% endfor %}
|
||||
</head>
|
||||
<body{% if master_body_attrs is defined and master_body_attrs is not empty %}{% for name, value in master_body_attrs %}{% if value is not empty %} {{ name }}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
|
||||
{% block master_body %}{% endblock %}
|
||||
{% for script in scripts|default([]) %}
|
||||
<script src="{{ script }}" charset="utf-8" type="text/javascript"></script>
|
||||
{% endfor %}
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -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 %}
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
||||
{% endblock %}
|
||||
|
||||
{% block master_body %}
|
||||
<div class="header">
|
||||
<div class="header-background">
|
||||
<img src="{{ random(globals.siteInfo.headerImages) }}" alt="">
|
||||
</div>
|
||||
<div class="header-foreground" {% if header_offset is defined and header_offset > 0 %}style="padding-bottom: {{ header_offset }}px"{% endif %}>
|
||||
<a class="header-logo" href="/">
|
||||
<div class="header-flash">{{ header_logo_flash|default('flash') }}</div>
|
||||
<div class="header-wave">{{ header_logo_wave|default('wave') }}</div>
|
||||
</a>
|
||||
<div class="header-right">
|
||||
<div class="header-now-playing header-now-playing-hidden">
|
||||
<div class="header-now-playing-icon" title="Now listening to...">
|
||||
<a href="/now-listening"><div class="fmi fmi-music"></div></a>
|
||||
</div>
|
||||
<div class="header-now-playing-cover">
|
||||
<img src="//now.flash.moe/resources/no-cover.png" alt="">
|
||||
</div>
|
||||
<div class="header-now-playing-details">
|
||||
<div class="header-now-playing-title"><a href="#" target="_blank" rel="noopener"></a></div>
|
||||
<div class="header-now-playing-artist"><a href="#" target="_blank" rel="noopener"></a></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="header-menu">
|
||||
{% for link in globals.siteInfo.headerNavigation %}
|
||||
<a href="{{ link.link }}">{{ link.title }}</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
{% block container %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
<div class="footer">
|
||||
<div class="footer-text">© flashwave {{ footer_copy_start|default('2010') }}-{{ footer_copy_end|default(('now'|date('Y'))) }} - {{ random(globals.siteInfo.footerQuotes) }}</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -1,18 +1,59 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="{{ master_charset|default('utf-8') }}">
|
||||
{% if master_title is defined and master_title is not empty %}<title>{{ master_title }}</title>{% endif %}
|
||||
{% block master_head %}{% endblock %}
|
||||
{% if csrfp_available() %}<meta name="csrfp-token" content="{{ csrfp_token() }}">{% endif %}
|
||||
{% for style in styles|default([]) %}
|
||||
<link href="{{ style }}" type="text/css" rel="stylesheet">
|
||||
{% 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 %}
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
||||
{% endblock %}
|
||||
|
||||
{% block master_body %}
|
||||
<div class="header">
|
||||
<div class="header-background">
|
||||
<img src="{{ random(globals.siteInfo.headerImages) }}" alt="">
|
||||
</div>
|
||||
<div class="header-foreground" {% if header_offset is defined and header_offset > 0 %}style="padding-bottom: {{ header_offset }}px"{% endif %}>
|
||||
<a class="header-logo" href="/">
|
||||
<div class="header-flash">{{ header_logo_flash|default('flash') }}</div>
|
||||
<div class="header-wave">{{ header_logo_wave|default('wave') }}</div>
|
||||
</a>
|
||||
<div class="header-right">
|
||||
<div class="header-now-playing header-now-playing-hidden">
|
||||
<div class="header-now-playing-icon" title="Now listening to...">
|
||||
<a href="/now-listening"><div class="fmi fmi-music"></div></a>
|
||||
</div>
|
||||
<div class="header-now-playing-cover">
|
||||
<img src="//now.flash.moe/resources/no-cover.png" alt="">
|
||||
</div>
|
||||
<div class="header-now-playing-details">
|
||||
<div class="header-now-playing-title"><a href="#" target="_blank" rel="noopener"></a></div>
|
||||
<div class="header-now-playing-artist"><a href="#" target="_blank" rel="noopener"></a></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="header-menu">
|
||||
{% for link in globals.siteInfo.headerNavigation %}
|
||||
<a href="{{ link.link }}">{{ link.title }}</a>
|
||||
{% endfor %}
|
||||
</head>
|
||||
<body{% if master_body_attrs is defined and master_body_attrs is not empty %}{% for name, value in master_body_attrs %}{% if value is not empty %} {{ name }}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
|
||||
{% block master_body %}{% endblock %}
|
||||
{% for script in scripts|default([]) %}
|
||||
<script src="{{ script }}" charset="utf-8" type="text/javascript"></script>
|
||||
{% endfor %}
|
||||
</body>
|
||||
</html>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
{% block container %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
<div class="footer">
|
||||
<div class="footer-text">© flashwave {{ footer_copy_start|default('2010') }}-{{ footer_copy_end|default(('now'|date('Y'))) }} - {{ random(globals.siteInfo.footerQuotes) }}</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{% extends 'master-2021.twig' %}
|
||||
{% extends 'master.twig' %}
|
||||
|
|
|
|||
Loading…
Reference in a new issue