From: Michael Tremer Date: Mon, 22 Oct 2018 10:17:41 +0000 (+0100) Subject: Move navigation into base template X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31947225d129437693bb8174228788f85caa23b1;p=ipfire.org.git Move navigation into base template Otherwise the wrong or no navigation would have been shown on error pages, etc. Signed-off-by: Michael Tremer --- diff --git a/src/templates/auth/login.html b/src/templates/auth/login.html index e153d4c8..2199a929 100644 --- a/src/templates/auth/login.html +++ b/src/templates/auth/login.html @@ -2,8 +2,6 @@ {% block title %}{{ _("Log In") }}{% end block %} -{% block menu %}{% end block %} - {% block content %}
diff --git a/src/templates/base.html b/src/templates/base.html index 9d2e707c..7b0e7a59 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -19,38 +19,119 @@ diff --git a/src/templates/blog/base.html b/src/templates/blog/base.html index 90e501bb..58cf769f 100644 --- a/src/templates/blog/base.html +++ b/src/templates/blog/base.html @@ -4,26 +4,6 @@ {% end block %} -{% block subtitle %}{{ _("Blog") }}{% end block %} - -{% block menu %} - - - -{% end block %} - {% block content %}
diff --git a/src/templates/nopaste/base.html b/src/templates/nopaste/base.html index 6f1d78c2..d108a0c0 100644 --- a/src/templates/nopaste/base.html +++ b/src/templates/nopaste/base.html @@ -1,16 +1 @@ {% extends "../base.html" %} - -{% block menu %} - - - -{% end block %} diff --git a/src/templates/people/base.html b/src/templates/people/base.html index 4b84dbcd..d108a0c0 100644 --- a/src/templates/people/base.html +++ b/src/templates/people/base.html @@ -1,49 +1 @@ {% extends "../base.html" %} - -{% block subtitle %}{{ _("People") }}{% end block %} - -{% block menu %} - {% if current_user %} - - - - {% end %} -{% end block %}