diff --git a/faerun_calendar/static/faerun_calendar/css/main.css b/faerun_calendar/static/faerun_calendar/css/main.css index e1d3513..52b082f 100644 --- a/faerun_calendar/static/faerun_calendar/css/main.css +++ b/faerun_calendar/static/faerun_calendar/css/main.css @@ -109,6 +109,7 @@ div.event-gm, div.event-suggested { border: 1px solid #000000; padding: 20px; + padding-bottom: 0px; margin: auto; margin-bottom: 15px; border-radius: 10px; diff --git a/faerun_calendar/templates/faerun_calendar/index.html b/faerun_calendar/templates/faerun_calendar/index.html index 904dca8..2f0a0eb 100644 --- a/faerun_calendar/templates/faerun_calendar/index.html +++ b/faerun_calendar/templates/faerun_calendar/index.html @@ -74,7 +74,11 @@
{{event.description}}
++ {% for description in event.descriptions %} +
{{description}}
+ {% endfor %} + {% endfor %} {% endif %} diff --git a/faerun_calendar/views.py b/faerun_calendar/views.py index 92804eb..d0ab554 100644 --- a/faerun_calendar/views.py +++ b/faerun_calendar/views.py @@ -53,10 +53,19 @@ def day_page(request, year: int, month: int, day: int): if not params: try: - events = Event.objects.filter(year=year_id, month=month_id, day=day, - is_suggested=select_suggested, is_only_for_gm=select_only_for_gm - ).order_by('time') - except Event.DoesNotExist: + events = [] + es = Event.objects.filter(year=year_id, month=month_id, day=day, + is_suggested=select_suggested, is_only_for_gm=select_only_for_gm + ).order_by('time') + for e in es: + event = {} + for param in ('time', 'title', 'is_suggested', 'is_only_for_gm'): + event['time'] = getattr(e, 'time') + + event['descriptions'] = tuple(p for p in getattr(e, 'description').split('\n') if p) + + events.append(event) + except (Event.DoesNotExist, AttributeError): params = {'type': 'error', 'error_type': 'events'} if not params: