From e85d32920b64ce92ec2fe02d955157285b3504ee Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Wed, 10 Apr 2019 14:44:46 +0100 Subject: Single base template, no content in it --- pydis_site/templates/base/base-hero.html | 50 -------------------------------- pydis_site/templates/base/base.html | 14 +++------ pydis_site/templates/base/footer.html | 9 ++++++ pydis_site/templates/home/index.html | 29 +++++++++++------- 4 files changed, 31 insertions(+), 71 deletions(-) delete mode 100644 pydis_site/templates/base/base-hero.html create mode 100644 pydis_site/templates/base/footer.html (limited to 'pydis_site') diff --git a/pydis_site/templates/base/base-hero.html b/pydis_site/templates/base/base-hero.html deleted file mode 100644 index 652662e0..00000000 --- a/pydis_site/templates/base/base-hero.html +++ /dev/null @@ -1,50 +0,0 @@ -{% load django_simple_bulma %} -{% load static %} - - - - - - - - - Python Discord | {% block title %}Website{% endblock %} - - {% bulma %} - - {# Font-awesome here is defined explicitly so that we can have Pro #} - - - {% block head %}{% endblock %} - - - -

- {% block hero-head %}{% endblock %} -

- {% block hero-body %}{% endblock %} -

- {% block hero-foot %}{% endblock %} - {% include "base/navbar.html" with active_item=False dropdowns=True icon_weight="fas" use_logo=False %} -

- -{% block content %}{% endblock %} - - - - diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html index 46a273ec..e1cd0be2 100644 --- a/pydis_site/templates/base/base.html +++ b/pydis_site/templates/base/base.html @@ -24,16 +24,10 @@ {% block head %}{% endblock %} -{% include "base/navbar.html" with active_item=True dropdowns=True icon_weight="fal" use_logo=True %} -{% block content %}{% endblock %} - - + +{% block content %} + {{ block.super }} +{% endblock %} diff --git a/pydis_site/templates/base/footer.html b/pydis_site/templates/base/footer.html new file mode 100644 index 00000000..b14bd82c --- /dev/null +++ b/pydis_site/templates/base/footer.html @@ -0,0 +1,9 @@ + + + diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index c69f7bcd..61b4b03e 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -1,4 +1,4 @@ -{% extends 'base/base-hero.html' %} +{% extends 'base/base.html' %} {% load static %} {% block title %}Home{% endblock %} @@ -6,17 +6,22 @@ {% endblock %} -{% block hero-body %} -

- The hottest Python community on the web -

-{% endblock %} {% block content %} +

+ The hottest Python community on the web +

+ {% include "base/navbar.html" with active_item=False dropdowns=True icon_weight="fas" use_logo=False %} +

@@ -61,6 +66,8 @@

+ + {% include "base/footer.html" %} {% endblock %} -- cgit v1.2.3