From b49883f7bc70b60ce2d67f19fe4793c98a33f5b7 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Mon, 6 Jun 2022 21:35:19 +0000 Subject: [PATCH] move body, footer and scripts files to base --- fet2020/templates/base.html | 190 ++++++++++++++++++++++----------- fet2020/templates/body.html | 13 --- fet2020/templates/footer.html | 40 ------- fet2020/templates/scripts.html | 24 ----- 4 files changed, 125 insertions(+), 142 deletions(-) delete mode 100644 fet2020/templates/body.html delete mode 100644 fet2020/templates/footer.html delete mode 100644 fet2020/templates/scripts.html diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html index 47ae8d4e..7db4270a 100644 --- a/fet2020/templates/base.html +++ b/fet2020/templates/base.html @@ -1,75 +1,135 @@ -{% extends 'footer.html' %} +{% extends 'head.html' %} {% load flatpages %} {% load static %} -{% block base %} - - - {% block content %} - {% endblock %} + {% block content %} + {% endblock %} + + +
+ Handcrafted + with + + by + FET +
+ + + + + + + + + + + + {% endblock %} diff --git a/fet2020/templates/body.html b/fet2020/templates/body.html deleted file mode 100644 index 077864e6..00000000 --- a/fet2020/templates/body.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends 'head.html' %} - -{% block body %} - - {% block base %} - {% endblock %} - - {% block footer %} - {% endblock %} - - {% include 'scripts.html' %} - -{% endblock %} diff --git a/fet2020/templates/footer.html b/fet2020/templates/footer.html deleted file mode 100644 index 9200e79c..00000000 --- a/fet2020/templates/footer.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends 'body.html' %} - -{% load flatpages %} - -{% block footer %} - -
- Handcrafted - with - - by - FET -
-{% endblock %} diff --git a/fet2020/templates/scripts.html b/fet2020/templates/scripts.html deleted file mode 100644 index 992c7f96..00000000 --- a/fet2020/templates/scripts.html +++ /dev/null @@ -1,24 +0,0 @@ -{% load static %} - - - - - - - - - - -