diff --git a/home/templates/base.html b/home/templates/base.html index bb835f00a960962cb5c1516827609ae087fe46fc..ad90301cdedd48b05ca9222bc14fcab023f70f95 100644 --- a/home/templates/base.html +++ b/home/templates/base.html @@ -15,11 +15,19 @@ <body> <header> <div id="header_logo"> - <h1><a href="/">Interludes 2021</a></h1> + <h1><a href="/">Interludes {% if settings.date_start %}{{ settings.date_start.year }}{% endif %}</a></h1> </div> <div id="head_main_infos"> <div id="location">ENS Ulm</div> - <div id="date">9-11 avril 2021</div> + <div id="date">{% if settings.date_start %} + {% if settings.date_end %} + {{ settings.date_start.day }}-{{ settings.date_end }} + {% else %} + {{ settings.date_start }} + {% endif %} + {% else %} + Date non-fixée + {% endif %}</div> </div> </header> @@ -73,6 +81,9 @@ /> </a> </div> + {% if settings.contact_email %} + <p>Pour tout problème, contacter :<br>{{ settings.contact_email }}</p> + {% endif %} </footer> </body> diff --git a/site_settings/admin.py b/site_settings/admin.py index 8ec1a48a0e5fce052c8e1522f7f24ffc6f4feca3..b487f71bedb89a1b42bc4354c2010281ebc709e1 100644 --- a/site_settings/admin.py +++ b/site_settings/admin.py @@ -15,4 +15,5 @@ class SingletonModelAdmin(admin.ModelAdmin): @admin.register(SiteSettings) class SiteSettingsAdmin(SingletonModelAdmin): list_display = ("contact_email", "date_start", "date_end", "registrations_open", "inscriptions_open",) - list_editable = ("registrations_open", "inscriptions_open",) + list_display_links = None + list_editable = ("contact_email", "date_start", "date_end", "registrations_open", "inscriptions_open",) diff --git a/site_settings/models.py b/site_settings/models.py index 6d7dfb86fe615ba8ed56cd6cfa5ed3cd22655e45..2e858f008a93c4187804b75c9dd744417b8dc5f5 100644 --- a/site_settings/models.py +++ b/site_settings/models.py @@ -32,9 +32,9 @@ class SingletonModel(models.Model): class SiteSettings(SingletonModel): """Réglages globaux du site""" - contact_email = models.EmailField("Email contact") - date_start = models.DateField("Date de début", null=True) - date_end = models.DateField("Date de fin", null=True) + contact_email = models.EmailField("Email contact", blank=True, null=True) + date_start = models.DateField("Date de début", blank=True, null=True) + date_end = models.DateField("Date de fin", blank=True, null=True) registrations_open = models.BooleanField("Ouvrir la création de compte", default=False) inscriptions_open = models.BooleanField("Ouvrir les inscriptions", default=False)