From ea7c8553b0da62347ddc91ad025406d0f8226bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Thu, 14 May 2020 14:26:38 +0200
Subject: [PATCH] Move messages to general templates
---
AKModel/templatetags/tags_AKModel.py | 12 ++++++++++++
AKSubmission/templates/AKSubmission/ak_detail.html | 2 +-
AKSubmission/templates/AKSubmission/ak_history.html | 2 +-
.../templates/AKSubmission/submission_overview.html | 2 +-
AKSubmission/templates/AKSubmission/submit_new.html | 2 +-
AKSubmission/templatetags/tags_AKSubmission.py | 12 ------------
.../AKSubmission => templates}/messages.html | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
rename {AKSubmission/templates/AKSubmission => templates}/messages.html (90%)
diff --git a/AKModel/templatetags/tags_AKModel.py b/AKModel/templatetags/tags_AKModel.py
index 4540e859..80cbc6fc 100644
--- a/AKModel/templatetags/tags_AKModel.py
+++ b/AKModel/templatetags/tags_AKModel.py
@@ -14,3 +14,15 @@ def footer_info():
@register.filter
def check_app_installed(name):
return apps.is_installed(name)
+
+
+@register.filter
+def message_bootstrap_class(tag):
+ print(tag)
+ if tag == "error":
+ return "alert-danger"
+ elif tag == "success":
+ return "alert-success"
+ elif tag == "warning":
+ return "alert-warning"
+ return "alert-info"
diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html
index b7b9342d..bb99e830 100644
--- a/AKSubmission/templates/AKSubmission/ak_detail.html
+++ b/AKSubmission/templates/AKSubmission/ak_detail.html
@@ -23,7 +23,7 @@
{% endif %}
{% block content %}
- {% include "AKSubmission/messages.html" %}
+ {% include "messages.html" %}
<div class="text-right">
{% if ak.interest_counter >= 0 %}
diff --git a/AKSubmission/templates/AKSubmission/ak_history.html b/AKSubmission/templates/AKSubmission/ak_history.html
index 61094ad2..586fc0b1 100644
--- a/AKSubmission/templates/AKSubmission/ak_history.html
+++ b/AKSubmission/templates/AKSubmission/ak_history.html
@@ -20,7 +20,7 @@
{% endblock %}
{% block content %}
- {% include "AKSubmission/messages.html" %}
+ {% include "messages.html" %}
<div class="float-right">
<a href='{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}' data-toggle="tooltip"
diff --git a/AKSubmission/templates/AKSubmission/submission_overview.html b/AKSubmission/templates/AKSubmission/submission_overview.html
index f26cf36a..6265d4c3 100644
--- a/AKSubmission/templates/AKSubmission/submission_overview.html
+++ b/AKSubmission/templates/AKSubmission/submission_overview.html
@@ -37,7 +37,7 @@
{% block content %}
<h1>{% trans "AKs" %}: {{ event.name }}</h1>
- {% include "AKSubmission/messages.html" %}
+ {% include "messages.html" %}
{% blocktrans %}On this page you can see a list of current AKs, change them and add new ones.{% endblocktrans %}
diff --git a/AKSubmission/templates/AKSubmission/submit_new.html b/AKSubmission/templates/AKSubmission/submit_new.html
index 2a07c2b2..489806f4 100644
--- a/AKSubmission/templates/AKSubmission/submit_new.html
+++ b/AKSubmission/templates/AKSubmission/submit_new.html
@@ -22,7 +22,7 @@
{% endblock %}
{% block content %}
- {% include "AKSubmission/messages.html" %}
+ {% include "messages.html" %}
{% block headline %}
<h2>{% trans 'New AK' %}</h2>
diff --git a/AKSubmission/templatetags/tags_AKSubmission.py b/AKSubmission/templatetags/tags_AKSubmission.py
index e8a60e2c..7be35e1e 100644
--- a/AKSubmission/templatetags/tags_AKSubmission.py
+++ b/AKSubmission/templatetags/tags_AKSubmission.py
@@ -29,15 +29,3 @@ def category_list(categories, event_slug):
@register.inclusion_tag("AKSubmission/category_linked_badge.html")
def category_linked_badge(category, event_slug):
return {"category": category, "event_slug": event_slug}
-
-
-@register.filter
-def message_bootstrap_class(tag):
- print(tag)
- if tag == "error":
- return "alert-danger"
- elif tag == "success":
- return "alert-success"
- elif tag == "warning":
- return "alert-warning"
- return "alert-info"
diff --git a/AKSubmission/templates/AKSubmission/messages.html b/templates/messages.html
similarity index 90%
rename from AKSubmission/templates/AKSubmission/messages.html
rename to templates/messages.html
index dc8dd31f..7aacbaa6 100644
--- a/AKSubmission/templates/AKSubmission/messages.html
+++ b/templates/messages.html
@@ -1,4 +1,4 @@
-{% load tags_AKSubmission %}
+{% load tags_AKModel %}
{% if messages %}
{% for message in messages %}
--
GitLab