diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 2b903d52..3213fd5d 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -217,6 +217,7 @@ INSTALLED_APPS = [ "bootstrapform", "pinax_theme_bootstrap", "sass_processor", + "capture_tag", # external "easy_thumbnails", diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index 697731f9..7e1abeef 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -2,6 +2,9 @@ {% load i18n %} {% load sitetree %} {% load sass_tags %} +{% load capture_tags %} + +{% capture as head_title silent %}{% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %}{% endcapture %} @@ -12,12 +15,21 @@ - {% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %} + {{ head_title }} - - - + + + + + + + + + + + + {% block styles %} diff --git a/requirements.txt b/requirements.txt index dcce569d..6fb68a8d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,6 +17,7 @@ dj-static==0.0.6 Django==1.11.25 django-appconf==1.0.1 django-bootstrap-form==3.4 +django-capture-tag==1.0 django-compressor==2.3 django-countries==5.3.1 django-crispy-forms==1.7.2 @@ -64,7 +65,7 @@ pylibmc==1.5.1 pyOpenSSL==18.0.0 pypng==0.0.18 PyQRCode==1.2.1 -pysaml2==4.4.0 +pysaml2==4.8.0 python-dateutil==2.7.3 pytz==2018.4 rcssmin==1.0.6