From 7cdf259a553e85a4894f26654e6fa24c804eda45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20H=C3=A1la?= <halapetr@selfnet.cz>
Date: Fri, 12 Jan 2024 15:47:14 +0100
Subject: [PATCH] Add Option to specify tenant logo

---
 backend/locale/cs/LC_MESSAGES/django.po       |   6 +--
 .../migrations/0012_alter_category_link.py    |  19 +++++++++
 frontend/locale/cs/LC_MESSAGES/django.po      |  18 +++++----
 frontend/static/favicon.ico                   | Bin 1406 -> 0 bytes
 frontend/templates/base/form.html             |   2 +-
 frontend/templates/base/index.html            |  10 ++++-
 pdf/locale/cs/LC_MESSAGES/django.po           |   1 -
 pdf/migrations/0024_alter_pdfrequest_link.py  |  19 +++++++++
 tenants/locale/cs/LC_MESSAGES/django.po       |  36 ++++++++++++------
 tenants/migrations/0003_tenant_icon.py        |  25 ++++++++++++
 tenants/models.py                             |  18 ++++++++-
 11 files changed, 128 insertions(+), 26 deletions(-)
 create mode 100644 category/migrations/0012_alter_category_link.py
 delete mode 100644 frontend/static/favicon.ico
 create mode 100644 pdf/migrations/0024_alter_pdfrequest_link.py
 create mode 100644 tenants/migrations/0003_tenant_icon.py

diff --git a/backend/locale/cs/LC_MESSAGES/django.po b/backend/locale/cs/LC_MESSAGES/django.po
index f0bb49c..85d5e99 100644
--- a/backend/locale/cs/LC_MESSAGES/django.po
+++ b/backend/locale/cs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-29 14:14+0000\n"
+"POT-Creation-Date: 2024-01-12 15:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -136,11 +136,11 @@ msgstr "Smazat"
 msgid "Transpose"
 msgstr "Transponovat"
 
-#: backend/templates/songs/index.html:91
+#: backend/templates/songs/index.html:97
 msgid "Search"
 msgstr "Vyhledávání"
 
-#: backend/templates/songs/index.html:93
+#: backend/templates/songs/index.html:99
 msgid "Number, text or author"
 msgstr "Číslo, text nebo autor"
 
diff --git a/category/migrations/0012_alter_category_link.py b/category/migrations/0012_alter_category_link.py
new file mode 100644
index 0000000..4109f99
--- /dev/null
+++ b/category/migrations/0012_alter_category_link.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0 on 2024-01-12 14:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("category", "0011_alter_category_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="category",
+            name="link",
+            field=models.CharField(
+                blank=True, help_text="Link to include in the PDF", max_length=300, verbose_name="Link"
+            ),
+        ),
+    ]
diff --git a/frontend/locale/cs/LC_MESSAGES/django.po b/frontend/locale/cs/LC_MESSAGES/django.po
index 382ea83..9437d16 100644
--- a/frontend/locale/cs/LC_MESSAGES/django.po
+++ b/frontend/locale/cs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-29 14:14+0000\n"
+"POT-Creation-Date: 2024-01-12 15:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -73,27 +73,31 @@ msgstr ""
 msgid "Submit"
 msgstr "Odeslat"
 
-#: frontend/templates/base/index.html:58
+#: frontend/templates/base/index.html:35
+msgid "Logo"
+msgstr ""
+
+#: frontend/templates/base/index.html:64
 msgid "Options"
 msgstr "Možnosti"
 
-#: frontend/templates/base/index.html:68
+#: frontend/templates/base/index.html:74
 msgid "Language"
 msgstr "Jazyk"
 
-#: frontend/templates/base/index.html:82
+#: frontend/templates/base/index.html:88
 msgid "Version"
 msgstr "Verze"
 
-#: frontend/templates/base/index.html:83
+#: frontend/templates/base/index.html:89
 msgid "Git"
 msgstr ""
 
-#: frontend/templates/base/index.html:91
+#: frontend/templates/base/index.html:97
 msgid "Logged as"
 msgstr "Přihlášen jako"
 
-#: frontend/templates/base/index.html:93
+#: frontend/templates/base/index.html:99
 msgid "Log in"
 msgstr "Přihlásit se"
 
diff --git a/frontend/static/favicon.ico b/frontend/static/favicon.ico
deleted file mode 100644
index 21ca38e7a258c55fd65d43b31bca5e4f7881930c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1406
zcmeHDNl#Nz7(MlZR1v8~naY*P3y3I_d(wsc7XAPWNQf*E`i8#tF%%1!poTyKiS9@U
zAPIv88UiN3LK9^HM1~zJ;JgPF;?i}$m-D{!P3PYG0UmxnA6#om2Xe`(2q#rSc;MyV
zC71pmzW3)4A>Dv!+t95j4vvnoGP4DHAcn-3UkKY#jE;?=DHw!dMX<7#K#ys{>K{ai
z-VECazG}uBT|;YIJ3fw&V{l{`t8+iFKL49D7EEI5^Ct|%<Jdnu!o=hxx-|_8ON%%-
zKEb;W@6q1T0X=MCb883RiTK+gbZH@IhJoF^ee}j+_%^eHZbRppVJuH?Bii4`d-q~-
zZUaUng0G3h^&3+xwSm+I{$~S1+?*1wB{K|4{FyK5oJ>FnrTjFdgb098N=X_WYphCD
zT6*sm6OtX`F}+NGmg96tN^n~GtIMjSpA%FR0jWIl5$j5oJ12-NcHDi=FxL$m9u!r`
zrv*~gH`Y4+HQuyh-;2UK_n+L(r<};6Xm(vj<wGI7jy`c^H)t}2^K;<rHE>!C{LBD4
VJ%39sabgFvR7vtQR*Vz4vlp3=ffoP(

diff --git a/frontend/templates/base/form.html b/frontend/templates/base/form.html
index d1195bb..169f299 100644
--- a/frontend/templates/base/form.html
+++ b/frontend/templates/base/form.html
@@ -3,7 +3,7 @@
 {% load django_bootstrap5 %}
 
 {% block framed_body %}
-  <form method="post">
+  <form method="post" enctype="multipart/form-data">
     {% csrf_token %}
     {% bootstrap_form form layout='horizontal' %}
     {% bootstrap_button _("Submit") button_type="submit" %}
diff --git a/frontend/templates/base/index.html b/frontend/templates/base/index.html
index da417d0..2943ce9 100644
--- a/frontend/templates/base/index.html
+++ b/frontend/templates/base/index.html
@@ -13,7 +13,9 @@
 <html lang="en">
 <head>
     <title>{% block title %} {{ request.tenant.display_name }} {% endblock %}</title>
-    <link rel="shortcut icon" type="image/png" href="{% static 'favicon.ico' %}"/>
+    {% if request.tenant.icon %}
+    <link rel="shortcut icon" type="image/png" href="{{ request.tenant.icon.url }}"/>
+    {% endif %}
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
@@ -28,7 +30,11 @@
 <body>
 <div>
     <nav class="navbar navbar-expand-lg">
-        <a class="navbar-brand ms-3" href="{{ request.tenant.index_redirect }}">{{ request.tenant.display_name }}</a>
+        <a class="navbar-brand ms-3" href="{{ request.tenant.index_redirect }}">
+            {% if request.tenant.icon %}
+                <img src="{{ request.tenant.icon.url }}" alt="{{ _("Logo") }}" width="30" height="30"/>
+            {% endif %}
+            {{ request.tenant.display_name }}</a>    
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
                 aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
diff --git a/pdf/locale/cs/LC_MESSAGES/django.po b/pdf/locale/cs/LC_MESSAGES/django.po
index e98d59e..2b3c229 100644
--- a/pdf/locale/cs/LC_MESSAGES/django.po
+++ b/pdf/locale/cs/LC_MESSAGES/django.po
@@ -345,4 +345,3 @@ msgstr "Musíte vybrat alespoň jednu písničku"
 #, python-format
 msgid "PDF Request with id %(id)s was successfully created"
 msgstr "PDF požadavek se id %(id)s byl úspěšně vytvořen"
-
diff --git a/pdf/migrations/0024_alter_pdfrequest_link.py b/pdf/migrations/0024_alter_pdfrequest_link.py
new file mode 100644
index 0000000..d81ae7f
--- /dev/null
+++ b/pdf/migrations/0024_alter_pdfrequest_link.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0 on 2024-01-12 14:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("pdf", "0023_alter_pdfrequest_file"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="pdfrequest",
+            name="link",
+            field=models.CharField(
+                blank=True, help_text="Link to include in the PDF", max_length=300, verbose_name="Link"
+            ),
+        ),
+    ]
diff --git a/tenants/locale/cs/LC_MESSAGES/django.po b/tenants/locale/cs/LC_MESSAGES/django.po
index 7dabf36..afd00aa 100644
--- a/tenants/locale/cs/LC_MESSAGES/django.po
+++ b/tenants/locale/cs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-01 13:46+0000\n"
+"POT-Creation-Date: 2024-01-12 15:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Tenant"
 msgstr "Zpěvník"
 
-#: tenants/menus.py:27 tenants/models.py:24
+#: tenants/menus.py:27 tenants/models.py:30
 msgid "All Songs"
 msgstr "Všechno"
 
@@ -35,44 +35,58 @@ msgstr "Soubory"
 msgid "Categories"
 msgstr "Kategorie"
 
-#: tenants/models.py:13
+#: tenants/models.py:12
+msgid "Only PNG images are allowed"
+msgstr "Jen PNG obrázky jsou podporovány"
+
+#: tenants/models.py:19
 msgid "Hostname"
 msgstr "Doménové jméno"
 
-#: tenants/models.py:13
+#: tenants/models.py:19
 msgid "The exact hostname for this Tenant"
 msgstr "Přesné doménové jméno pod kterým bude Zpěvník dostupný"
 
-#: tenants/models.py:15
+#: tenants/models.py:21
 msgid "Name"
 msgstr "Jméno"
 
-#: tenants/models.py:15
+#: tenants/models.py:21
 msgid "Internal name for this Tenant"
 msgstr "Interní název tohoto Zpevníku"
 
-#: tenants/models.py:16
+#: tenants/models.py:22
 msgid "Title"
 msgstr "Titulek"
 
-#: tenants/models.py:16
+#: tenants/models.py:22
 msgid "Title on the Main site"
 msgstr "Titulek na hlavní stránce"
 
-#: tenants/models.py:18
+#: tenants/models.py:24
 msgid "Index redirect path"
 msgstr "Cíl přesměrování úvodní stránky"
 
-#: tenants/models.py:19
+#: tenants/models.py:25
 msgid ""
 "Where should new tenant redirect from index page, usually a category slug"
 msgstr ""
 "Kam by měla úvodní stránka přesměrovat uživatele, většinou URL kategorie"
 
-#: tenants/models.py:25
+#: tenants/models.py:31
 msgid "True, if all songs category should be added to navigation"
 msgstr "Pokud je zaškrknuto tak se do navigace přidá odkaz na všechny písničky"
 
+#: tenants/models.py:34
+msgid "Logo"
+msgstr ""
+
+#: tenants/models.py:35
+msgid "Optional Site logo, should be around 50x50 and in PNG format"
+msgstr ""
+"Logo zpěvníčku, nepovinné, mělo by mít rozměry kolem 50x50 a být v PNG "
+"formátu"
+
 #: tenants/templates/tenant/add.html:4 tenants/templates/tenant/add.html:5
 msgid "Tenant Editor"
 msgstr "Uprava Zpěvníku"
diff --git a/tenants/migrations/0003_tenant_icon.py b/tenants/migrations/0003_tenant_icon.py
new file mode 100644
index 0000000..8e9e91f
--- /dev/null
+++ b/tenants/migrations/0003_tenant_icon.py
@@ -0,0 +1,25 @@
+# Generated by Django 5.0 on 2024-01-12 14:46
+
+import tenants.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tenants", "0002_tenant_all_songs_category"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="tenant",
+            name="icon",
+            field=models.ImageField(
+                blank=True,
+                help_text="Optional Site Icon, needs to be a PNG",
+                null=True,
+                upload_to="uploads/",
+                validators=[tenants.models.only_png],
+                verbose_name="Site Icon",
+            ),
+        ),
+    ]
diff --git a/tenants/models.py b/tenants/models.py
index 63e3e5b..069476d 100644
--- a/tenants/models.py
+++ b/tenants/models.py
@@ -1,11 +1,18 @@
 """Tenant models"""
 from django.contrib.auth import get_user_model
-from django.db.models import Model, CharField, ManyToManyField, BooleanField
+from django.core.exceptions import ValidationError
+from django.db.models import Model, CharField, ManyToManyField, BooleanField, ImageField
 from django.utils.translation import gettext_lazy as _
 
 # Create your models here.
 
 
+def only_png(value):
+    """Raises validation error if the file is not a PNG image"""
+    if not value.url and value.file.content_type != "image/png":
+        raise ValidationError(_("Only PNG images are allowed"))
+
+
 class Tenant(Model):
     """Represents a Tenant, who has own Categories and is determined by a Host Header"""
 
@@ -24,6 +31,15 @@ class Tenant(Model):
         verbose_name=_("All Songs"),
         help_text=_("True, if all songs category should be added to navigation"),
     )
+    icon = ImageField(
+        verbose_name=_("Logo"),
+        help_text=_("Optional Site logo, should be around 50x50 and in PNG format"),
+        null=True,
+        blank=True,
+        upload_to="uploads/",
+        validators=[only_png],
+    )
+
     admins = ManyToManyField(get_user_model())
 
     def __str__(self):