{% if title %}{{ title }} | {% endif %}WolneLektury.pl

From 8f51cea59b3cc79f091627e08b3b9f4f24f3f232 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 21 Oct 2022 16:59:54 +0200 Subject: [PATCH 1/1] Cut the unnecessary middle base template. --- .../catalogue/2022/author_detail.html | 2 +- .../templates/catalogue/2022/book_detail.html | 2 +- .../catalogue/2022/theme_detail.html | 2 +- src/wolnelektury/templates/2022/base.html | 51 ++++++++++++++++++- .../templates/2022/base_real.html | 51 ------------------- 5 files changed, 52 insertions(+), 56 deletions(-) delete mode 100644 src/wolnelektury/templates/2022/base_real.html diff --git a/src/catalogue/templates/catalogue/2022/author_detail.html b/src/catalogue/templates/catalogue/2022/author_detail.html index 9ba6aaf7f..d32c01204 100644 --- a/src/catalogue/templates/catalogue/2022/author_detail.html +++ b/src/catalogue/templates/catalogue/2022/author_detail.html @@ -1,4 +1,4 @@ -{% extends '2022/base_real.html' %} +{% extends '2022/base.html' %} {% load choose_cites from social_tags %} diff --git a/src/catalogue/templates/catalogue/2022/book_detail.html b/src/catalogue/templates/catalogue/2022/book_detail.html index 9082d0102..d70572889 100644 --- a/src/catalogue/templates/catalogue/2022/book_detail.html +++ b/src/catalogue/templates/catalogue/2022/book_detail.html @@ -1,4 +1,4 @@ -{% extends '2022/base_real.html' %} +{% extends '2022/base.html' %} {% load static %} {% load choose_cites from social_tags %} diff --git a/src/catalogue/templates/catalogue/2022/theme_detail.html b/src/catalogue/templates/catalogue/2022/theme_detail.html index c0afc339d..5713cecea 100644 --- a/src/catalogue/templates/catalogue/2022/theme_detail.html +++ b/src/catalogue/templates/catalogue/2022/theme_detail.html @@ -1,4 +1,4 @@ -{% extends '2022/base_real.html' %} +{% extends '2022/base.html' %} {% load pagination_tags %} {% block global-content %} diff --git a/src/wolnelektury/templates/2022/base.html b/src/wolnelektury/templates/2022/base.html index 6d9a056f5..aa8588156 100644 --- a/src/wolnelektury/templates/2022/base.html +++ b/src/wolnelektury/templates/2022/base.html @@ -1,4 +1,51 @@ -{% extends "2022/base_real.html" %} + +{% load pipeline %} +{% load static %} +{% load piwik_tags %} +{% load title %} +{% block settings %} +{% endblock %} -{% block ogtitle %}{% block titleextra %}{{ page_title }}{% endblock %}{% endblock %} + + + + + + {% if title %}{{ title }} | {% endif %}WolneLektury.pl + + {% stylesheet '2022' %} + + + + + + + {% tracking_code %} + + + {% include '2022/header.html' %} + + {% block global-content %} +

+ +

+ {% block main %}{% endblock %} +

+ {% endblock %} + + {% include '2022/footer.html' %} + + + + + {% javascript '2022' %} + {% javascript '2022_player' %} + {% include '2022/hotjar.html' %} + + diff --git a/src/wolnelektury/templates/2022/base_real.html b/src/wolnelektury/templates/2022/base_real.html deleted file mode 100644 index aa8588156..000000000 --- a/src/wolnelektury/templates/2022/base_real.html +++ /dev/null @@ -1,51 +0,0 @@ - -{% load pipeline %} -{% load static %} -{% load piwik_tags %} -{% load title %} - -{% block settings %} -{% endblock %} - - - - - - - {% if title %}{{ title }} | {% endif %}WolneLektury.pl - - {% stylesheet '2022' %} - - - - - - - {% tracking_code %} - - - {% include '2022/header.html' %} - - {% block global-content %} -

- -

- {% block main %}{% endblock %} -

- {% endblock %} - - {% include '2022/footer.html' %} - - - - - {% javascript '2022' %} - {% javascript '2022_player' %} - {% include '2022/hotjar.html' %} - - -- 2.20.1