From 24858c0169f2a1267dd445cebe4938b46a78b5d3 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <mail@jonathanweth.de>
Date: Sat, 4 Jan 2020 11:48:34 +0100
Subject: [PATCH] Copy messages from SchoolApps' header template to AlekSIS
base template
Close #127
---
aleksis/core/templates/core/base.html | 19 ++++++++++++++++++-
aleksis/core/templates/partials/header.html | 21 +--------------------
2 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/aleksis/core/templates/core/base.html b/aleksis/core/templates/core/base.html
index 8b6995696..62635310e 100644
--- a/aleksis/core/templates/core/base.html
+++ b/aleksis/core/templates/core/base.html
@@ -66,7 +66,24 @@
<main role="main">
{% include 'core/no_person.html' %}
- {# {% bootstrap_messages %}#}
+ {% if messages %}
+ {% for message in messages %}
+ <div class="alert {% if message.tags %}{{ message.tags }}{% else %}info{% endif %}">
+ <p>
+ {% if message.tags == "success" %}
+ <i class="material-icons left">check_circle</i>
+ {% elif message.tags == "info" %}
+ <i class="material-icons left">info</i>
+ {% elif message.tags == "warning" %}
+ <i class="material-icons left">warning</i>
+ {% elif message.tags == "error" %}
+ <i class="material-icons left">error</i>
+ {% endif %}
+ {{ message }}
+ </p>
+ </div>
+ {% endfor %}
+ {% endif %}
<h4>{% block page_title %}{% endblock %}</h4>
diff --git a/aleksis/core/templates/partials/header.html b/aleksis/core/templates/partials/header.html
index 8fe9a3f0c..ceb4065c9 100644
--- a/aleksis/core/templates/partials/header.html
+++ b/aleksis/core/templates/partials/header.html
@@ -397,26 +397,7 @@
{# </p>#}
{#</header>#}
-{% if messages %}
- <header>
- {% for message in messages %}
- <div class="alert {% if message.tags %}{{ message.tags }}{% else %}info{% endif %}">
- <p>
- {% if message.tags == "success" %}
- <i class="material-icons left">check_circle</i>
- {% elif message.tags == "info" %}
- <i class="material-icons left">info</i>
- {% elif message.tags == "warning" %}
- <i class="material-icons left">warning</i>
- {% elif message.tags == "error" %}
- <i class="material-icons left">error</i>
- {% endif %}
- {{ message }}
- </p>
- </div>
- {% endfor %}
- </header>
-{% endif %}
+
{% if user.is_authenticated %}
<div class="fixed-action-btn">
--
GitLab