From b6dcd4c3f920bfd6de8920ad0e60e43134c843d9 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 9 Dec 2019 18:56:27 +0100 Subject: Can configure a warning banner and a warning message --- .../migrations/0113_auto_20191209_1334.py | 25 +++++++++++++++++ ishtar_common/models.py | 2 ++ ishtar_common/templates/base.html | 31 ++++++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 ishtar_common/migrations/0113_auto_20191209_1334.py (limited to 'ishtar_common') diff --git a/ishtar_common/migrations/0113_auto_20191209_1334.py b/ishtar_common/migrations/0113_auto_20191209_1334.py new file mode 100644 index 000000000..9e4a60cf6 --- /dev/null +++ b/ishtar_common/migrations/0113_auto_20191209_1334.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.18 on 2019-12-09 13:34 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0112_document_qrcode'), + ] + + operations = [ + migrations.AddField( + model_name='ishtarsiteprofile', + name='warning_message', + field=models.TextField(blank=True, verbose_name='Warning message'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='warning_name', + field=models.TextField(blank=True, verbose_name='Warning name'), + ), + ] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 946e88703..03eda4781 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2724,6 +2724,8 @@ class IshtarSiteProfile(models.Model, Cached): experimental_feature = models.BooleanField( _("Activate experimental feature"), default=False) description = models.TextField(_("Description"), null=True, blank=True) + warning_name = models.TextField(_("Warning name"), blank=True) + warning_message = models.TextField(_("Warning message"), blank=True) config = models.CharField( _("Alternate configuration"), max_length=200, choices=ALTERNATE_CONFIGS_CHOICES, diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index bb53092ca..5fb935eb5 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -117,6 +117,37 @@ {% include "navbar.html" %} + {% if SITE_PROFILE.warning_name %} +
+ + {{SITE_PROFILE.warning_name }} + {% if SITE_PROFILE.warning_message %} + + + + {% endif %} +
+ + {% if SITE_PROFILE.warning_message %} + + {% endif %} + {% endif %}