From 0aa48837cffb04882dd29049fdb651f56f651e4e Mon Sep 17 00:00:00 2001 From: Sachi King Date: Mon, 10 Apr 2017 21:31:04 +1000 Subject: [PATCH] Template simplication: remove site_base_wagtail.html --- pinaxcon/templates/403_csrf.html | 2 +- pinaxcon/templates/404.html | 2 +- pinaxcon/templates/lca2017/content_page.html | 2 +- pinaxcon/templates/site_base.html | 23 +++++++------ pinaxcon/templates/site_base_wagtail.html | 34 -------------------- 5 files changed, 16 insertions(+), 47 deletions(-) delete mode 100644 pinaxcon/templates/site_base_wagtail.html diff --git a/pinaxcon/templates/403_csrf.html b/pinaxcon/templates/403_csrf.html index 78213797..5a5a8968 100644 --- a/pinaxcon/templates/403_csrf.html +++ b/pinaxcon/templates/403_csrf.html @@ -1,4 +1,4 @@ -{% extends "site_base_wagtail.html" %} +{% extends "site_base.html" %} {% load staticfiles %} {% load i18n %} diff --git a/pinaxcon/templates/404.html b/pinaxcon/templates/404.html index ce65149c..f5f87b7b 100644 --- a/pinaxcon/templates/404.html +++ b/pinaxcon/templates/404.html @@ -1,4 +1,4 @@ -{% extends "site_base_wagtail.html" %} +{% extends "site_base.html" %} {% load staticfiles %} {% load i18n %} diff --git a/pinaxcon/templates/lca2017/content_page.html b/pinaxcon/templates/lca2017/content_page.html index 8df841b1..8975c0be 100644 --- a/pinaxcon/templates/lca2017/content_page.html +++ b/pinaxcon/templates/lca2017/content_page.html @@ -1,4 +1,4 @@ -{% extends "site_base_wagtail.html" %} +{% extends "site_base.html" %} {% load staticfiles %} {% load pyconau2017_tags %} diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index 25ee1e89..1d706b45 100755 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -3,6 +3,7 @@ {% load metron_tags %} {% load i18n %} {% load sitetree %} +{% load staticfiles %} @@ -15,11 +16,12 @@ {% block styles %} - + + {% block extra_style %}{% endblock %} {% endblock %} {% block extra_head_base %} @@ -28,13 +30,8 @@
- {% block topbar_base %} + {% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %} - {% block nav %} - {% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %} - {% endblock %} - - {% endblock %} {% block body_base %} @@ -69,8 +66,14 @@ {% endblock %} {% block scripts %} - {% block extra_script %} - {% endblock %} + + + + + + + + {% block scripts_extra %}{% endblock %} {% endblock %} {% block extra_body_base %} diff --git a/pinaxcon/templates/site_base_wagtail.html b/pinaxcon/templates/site_base_wagtail.html deleted file mode 100644 index 421bc681..00000000 --- a/pinaxcon/templates/site_base_wagtail.html +++ /dev/null @@ -1,34 +0,0 @@ - -{% extends "site_base.html" %} -{% load staticfiles %} -{% block extra_style %}{% endblock %} - -{% comment %} -{% block body_base %} - {% include "_messages.html" %} - - - {% block body %} - - {% block content %} - {% endblock %} - - {% endblock %} - -{% endblock %} -{% endcomment %} - -{% block scripts %} - - - - - - - - - {% block scripts_extra %} - {% endblock %} - - -{% endblock %}