diff options
| -rw-r--r-- | codenames/templates/codenames.html.j2 | 28 | ||||
| -rw-r--r-- | comic/templates/issue.html.j2 | 25 | ||||
| -rw-r--r-- | global/templates/base.html.j2 | 8 | ||||
| -rw-r--r-- | modules/codenames_generate.py | 1 |
4 files changed, 21 insertions, 41 deletions
diff --git a/codenames/templates/codenames.html.j2 b/codenames/templates/codenames.html.j2 index 0e1e17a..ca54abd 100644 --- a/codenames/templates/codenames.html.j2 +++ b/codenames/templates/codenames.html.j2 @@ -1,17 +1,9 @@ -<!DOCTYPE html> -<html dir="ltr" lang="en"> -<head> - <meta charset="utf-8"/> - <title>{{ title }}</title> - <meta name="viewport" content="width=device-width, initial-scale=1"/> - <meta property="og:title" content="{{ title }}" /> - <meta property="og:type" content="website" /> - <meta property="og:url" content="{{ url }}" /> - <link rel="stylesheet" href="{{ site.assets_path }}/css/codenames.css" /> - <link rel="stylesheet" href="{{ site.assets_path_static }}/css/bootstrap-grid.min.css" /> -</head> -<body> -<div class="bootstrap-wrapper"> +{% extends "base.html.j2" %} +{% block page_title %}{{ codenames.codenames_name }}{% endblock %} +{% block og_page_title %}{{ codenames.codenames_name }}{% endblock %} +{% block head_extra %}{{ super() }} + <link rel="stylesheet" href="{{ site.assets_path }}/css/codenames.css" />{% endblock %} +{% block body %}<div class="bootstrap-wrapper"> <div class="container"> <div class="row"> <main class="col-md-9"> @@ -71,9 +63,7 @@ </main> </div> </div> -</div> -</body> -<footer> +</div>{% endblock %} +{% block footer %} <script src="/assets/js/codenames.js"></script> -</footer> -</html> +{% endblock %}
\ No newline at end of file diff --git a/comic/templates/issue.html.j2 b/comic/templates/issue.html.j2 index 181604f..81afc04 100644 --- a/comic/templates/issue.html.j2 +++ b/comic/templates/issue.html.j2 @@ -1,18 +1,11 @@ -<!DOCTYPE html> -<html dir="ltr" lang="en"> -<head> - <meta charset="utf-8"/> - <title>{{ issue.title() }} - {{ comic.comic_name }}</title> - <meta name="viewport" content="width=device-width, initial-scale=1"/> - <meta property="og:title" content="{{ issue.title() }}" /> - <meta property="og:type" content="article" /> - <meta property="og:url" content="{{ url }}" /> - <link rel="stylesheet" href="{{ site.assets_path_static }}/css/bootstrap-grid.min.css" /> +{% extends "base.html.j2" %} +{% block page_title %}{{ issue.title() }} - {{ comic.comic_name }}{% endblock %} +{% block og_page_title %}{{ issue.title() }}{% endblock %} +{% block og_type %}article{% endblock %} +{% block head_extra %}{{ super() }} <link rel="stylesheet" href="{{ site.assets_path }}/css/comic.css" /> - <link rel="stylesheet" href="{{ site.assets_path }}/css/font.css" /> -</head> -<body> -<div class="bootstrap-wrapper"> + <link rel="stylesheet" href="{{ site.assets_path }}/css/font.css" />{% endblock %} +{% block body %}<div class="bootstrap-wrapper"> <div class="container"> <a href="/" class="row dont-bother"> <header class="col-md-9" role="banner"><img class="banner" src="{{ site.assets_path }}/image/banner_placeholder.png" alt="banner"/></header> @@ -56,6 +49,4 @@ </footer> </div> </div> -</div> -</body> -</html> +</div>{% endblock %} diff --git a/global/templates/base.html.j2 b/global/templates/base.html.j2 index 61826d9..21530c7 100644 --- a/global/templates/base.html.j2 +++ b/global/templates/base.html.j2 @@ -5,14 +5,12 @@ <title>{% block page_title %}{% endblock %}</title> <meta name="viewport" content="width=device-width, initial-scale=1"/> <meta property="og:title" content="{% block og_page_title %}{% endblock %}" /> - <meta property="og:type" content="{% block og_type %}{% endblock %}" /> + <meta property="og:type" content="{% block og_type %}website{% endblock %}" /> <meta property="og:url" content="{{ url }}" /> - {% block head_extra %}<link rel="stylesheet" href="{{ site.assets_path_static }}/css/bootstrap-grid.min.css" />{% endblock %} +{% block head_extra %} <link rel="stylesheet" href="{{ site.assets_path_static }}/css/bootstrap-grid.min.css" />{% endblock %} </head> <body> {% block body %}{% endblock %} </body> -<footer> - {% block footer %}{% endblock %} -</footer> +<footer>{% block footer %}{% endblock %}</footer> </html> diff --git a/modules/codenames_generate.py b/modules/codenames_generate.py index 19fd284..d5aba60 100644 --- a/modules/codenames_generate.py +++ b/modules/codenames_generate.py @@ -18,6 +18,7 @@ def generate(jinja_env: jinja2.Environment, output_root_path: str, local: bool): os.mkdir(output_root_path) jinja_env.globals.update(codenames={ + "codenames_name": Config.CODENAMES_NAME, "codenames_url": Config.CODENAMES_ROOT_URL, }) |