diff --git a/Deployment/Live/docker-compose.yml b/Deployment/Live/docker-compose.yml index 99bc019..76783f0 100644 --- a/Deployment/Live/docker-compose.yml +++ b/Deployment/Live/docker-compose.yml @@ -6,6 +6,7 @@ services: build: context: ../../ dockerfile: Deployment/Live/Dockerfile.python + restart: "unless-stopped" command: gunicorn clubhaus.wsgi:application --bind 0.0.0.0:12000 volumes: - ../../clubhaus:/usr/src/app diff --git a/clubhaus/homepage/templates/homepage/base.html b/clubhaus/homepage/templates/homepage/base.html index eee2741..555fb6e 100644 --- a/clubhaus/homepage/templates/homepage/base.html +++ b/clubhaus/homepage/templates/homepage/base.html @@ -10,10 +10,10 @@ - - + + diff --git a/clubhaus/homepage/templates/homepage/events.html b/clubhaus/homepage/templates/homepage/events.html index 1fcaa0d..3d70ea0 100644 --- a/clubhaus/homepage/templates/homepage/events.html +++ b/clubhaus/homepage/templates/homepage/events.html @@ -103,9 +103,11 @@ Name - {% for dateOption in dates %} - {{ dateOption.date|date:'d. F' }} - {% endfor %} + {% language 'de' %} + {% for dateOption in dates %} + {{ dateOption.date|date:'d. F' }} + {% endfor %} + {% endlanguage %} diff --git a/clubhaus/homepage/views.py b/clubhaus/homepage/views.py index 31ca1e8..4f409d9 100644 --- a/clubhaus/homepage/views.py +++ b/clubhaus/homepage/views.py @@ -26,7 +26,7 @@ def cookies(request: HttpRequest) -> django.http.HttpResponse: def tobacco(request: HttpRequest) -> django.http.HttpResponse: - context = {'tobaccos': Tobacco.objects.all().order_by('-in_stock')} + context = {'tobaccos': Tobacco.objects.all().order_by('-in_stock', "category__name", "name")} return render(request, 'homepage/tobacco.html', context)