From 9b96615222b28570b5d4f5f53b9ad07e2f4fbc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 29 May 2015 13:34:20 +0200 Subject: [PATCH] adjustments after #7409 and #7411 --- templates/authentic2/base-page.html | 8 ++++++++ templates/authentic2/base.html | 1 + templates/authentic2/login.html | 2 +- templates/base.html | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 templates/authentic2/base-page.html create mode 100644 templates/authentic2/base.html diff --git a/templates/authentic2/base-page.html b/templates/authentic2/base-page.html new file mode 100644 index 0000000..1ea0904 --- /dev/null +++ b/templates/authentic2/base-page.html @@ -0,0 +1,8 @@ +{% extends "authentic2/base.html" %} + +{% block placeholder-content %} +
+ {% block content %} + {% endblock %} +
+{% endblock %} diff --git a/templates/authentic2/base.html b/templates/authentic2/base.html new file mode 100644 index 0000000..94d9808 --- /dev/null +++ b/templates/authentic2/base.html @@ -0,0 +1 @@ +{% extends "base.html" %} diff --git a/templates/authentic2/login.html b/templates/authentic2/login.html index 82a6ee1..a10a27f 100644 --- a/templates/authentic2/login.html +++ b/templates/authentic2/login.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "authentic2/base.html" %} {% load i18n %} {% load staticfiles %} diff --git a/templates/base.html b/templates/base.html index 7362f17..1a2fa65 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,6 +5,11 @@ {% endblock %} {% endblock %} +{% block placeholder-content %} + {% block content %} + {% endblock %} +{% endblock %} + {% block user-info %} {% if user.is_authenticated %}