From 0aa48837cffb04882dd29049fdb651f56f651e4e 2017-04-16 06:30:45 From: Sachi King Date: 2017-04-16 06:30:45 Subject: [PATCH] Template simplication: remove site_base_wagtail.html --- diff --git a/pinaxcon/templates/403_csrf.html b/pinaxcon/templates/403_csrf.html index 782137974da9f2c20d5c6a8d59799fa1c8482420..5a5a89684ce9f262847c250f10384f29b1924eb7 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 ce65149c3360a79f269568a72a377b697e098412..f5f87b7bbdb0b20be15a24714aa11183297aaea1 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 8df841b1aaae8062e7974916019ace826978c5f6..8975c0be2b637dc14f7f8250dcf224d76692996e 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 25ee1e89e68c1d2f6e89e2c5c0f7f254e2949d94..1d706b450f3000c2e3a3c3d4549b63ad71107b47 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 421bc6813a4b3e4cea86187679c253671ea0edcd..0000000000000000000000000000000000000000 --- 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 %}