diff --git a/DjangoFiles/Administration/admin_tenant.py b/DjangoFiles/Administration/admin_tenant.py index 8633116..29dd319 100644 --- a/DjangoFiles/Administration/admin_tenant.py +++ b/DjangoFiles/Administration/admin_tenant.py @@ -106,6 +106,7 @@ class ConfigurationAdmin(SingletonModelAdmin): 'organisation', 'short_description', 'long_description', + 'logo', 'img', 'adress', 'phone', diff --git a/DjangoFiles/BaseBillet/models.py b/DjangoFiles/BaseBillet/models.py index 2c35af7..480f789 100644 --- a/DjangoFiles/BaseBillet/models.py +++ b/DjangoFiles/BaseBillet/models.py @@ -111,6 +111,19 @@ class Configuration(SingletonModel): verbose_name='Background' ) + logo = StdImageField(upload_to='images/', + null=True, blank=True, + # validators=[MaxSizeValidator(1920, 1920)], + variations={ + 'fhd': (1920, 1920), + 'hdr': (720, 720), + 'med': (480, 480), + 'thumbnail': (300, 120), + }, + delete_orphans=True, + verbose_name='Logo' + ) + mollie_api_key = models.CharField(max_length=50, blank=True, null=True) diff --git a/DjangoFiles/BaseBillet/static/arnaud_mvc/img/menu/adhesion_card.png b/DjangoFiles/BaseBillet/static/arnaud_mvc/img/menu/adhesion_card.png new file mode 100644 index 0000000..25cc65e Binary files /dev/null and b/DjangoFiles/BaseBillet/static/arnaud_mvc/img/menu/adhesion_card.png differ diff --git a/DjangoFiles/BaseBillet/templates/arnaud_mvc/base.html b/DjangoFiles/BaseBillet/templates/arnaud_mvc/base.html index 6190baa..04fc8ae 100644 --- a/DjangoFiles/BaseBillet/templates/arnaud_mvc/base.html +++ b/DjangoFiles/BaseBillet/templates/arnaud_mvc/base.html @@ -1,6 +1,6 @@ {% block header %} -{% load static %} -{% load tz %} + {% load static %} + {% load tz %} @@ -18,12 +18,20 @@ {% endblock header %} {% block nav %} + {% get_media_prefix as MEDIA_PREFIX %} + -{# {% include 'arnaud_mvc/nav_filter.html' %}#} + {# {% include 'arnaud_mvc/nav_filter.html' %}#} diff --git a/DjangoFiles/BaseBillet/templates/arnaud_mvc/lieux.html b/DjangoFiles/BaseBillet/templates/arnaud_mvc/lieux.html index 7841030..913511f 100644 --- a/DjangoFiles/BaseBillet/templates/arnaud_mvc/lieux.html +++ b/DjangoFiles/BaseBillet/templates/arnaud_mvc/lieux.html @@ -1,7 +1,7 @@ {% extends "arnaud_mvc/base.html" %} {% load static %} {% block content %} -{% get_media_prefix as MEDIA_PREFIX %} + {% get_media_prefix as MEDIA_PREFIX %}
@@ -30,9 +30,7 @@
{{ configuration.long_description }}
- {% if configuration.button_adhesion %} - Adhérer à l'association - {% endif %} + {% if configuration.facebook %} + {{ configuration.site_web }} +
+ {% include 'arnaud_mvc/menu.html' %} - -
- - billeterie Ti Billet -

CALENDRIER

- - - billeterie Ti Billet -

CONCERTS

- -{# #} -{# billeterie Ti Billet#} -{#

PHOTO

#} -{# #} -{# #} -{# billeterie Ti Billet#} -{#

VIDEO

#} -{# #} -{# #} -{# billeterie Ti Billet#} -{#

PROGRAMME

#} -{# #} - - billeterie Ti Billet -

MAP

- -
-
diff --git a/DjangoFiles/BaseBillet/templates/arnaud_mvc/menu.html b/DjangoFiles/BaseBillet/templates/arnaud_mvc/menu.html new file mode 100644 index 0000000..f8e0b53 --- /dev/null +++ b/DjangoFiles/BaseBillet/templates/arnaud_mvc/menu.html @@ -0,0 +1,59 @@ +{% load static %} +{% get_media_prefix as MEDIA_PREFIX %} + + + + +
+ {% if configuration.button_adhesion %} + + billeterie Ti Billet +

ADHERER

+ + {% endif %} + + billeterie Ti Billet +

CALENDRIER

+ + + billeterie Ti Billet +

CONCERTS

+ + {# #} + {# billeterie Ti Billet#} + {#

VIDEO

#} + {# #} + {# #} + {# billeterie Ti Billet#} + {#

PROGRAMME

#} + {# #} + + billeterie Ti Billet +

MAP

+ +
+ \ No newline at end of file