Revised the event calendar template for improved structure, semantics, and styling consistency. Added Bootstrap CSS for enhanced styling possibilities and updated the ICS link with a dedicated Django URL tag.main
parent
f79628ac31
commit
24674b70a3
@ -0,0 +1,18 @@ |
||||
# Generated by Django 5.2 on 2025-04-30 06:04 |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('core', '0012_aboutuspage'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='blogpage', |
||||
name='subtitle', |
||||
field=models.CharField(blank=True, default='Aktuelle Neuigkeiten, Einblicke und Ankündigungen', max_length=512), |
||||
), |
||||
] |
||||
@ -0,0 +1,17 @@ |
||||
# -*- coding: utf-8 -*- |
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('core', '0013_blogpage_subtitle'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='eventpage', |
||||
name='is_external', |
||||
field=models.BooleanField(default=False, help_text='Externes Event? Externe Events werden nicht im Upcoming Events Banner auf der Startseite angezeigt.'), |
||||
), |
||||
] |
||||
@ -0,0 +1,29 @@ |
||||
# Generated by Django 5.2 on 2025-04-30 10:56 |
||||
|
||||
from django.db import migrations |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('core', '0014_eventpage_is_external'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.RemoveField( |
||||
model_name='eventpage', |
||||
name='external_registration_code', |
||||
), |
||||
migrations.RemoveField( |
||||
model_name='eventpage', |
||||
name='from_address', |
||||
), |
||||
migrations.RemoveField( |
||||
model_name='eventpage', |
||||
name='subject', |
||||
), |
||||
migrations.RemoveField( |
||||
model_name='eventpage', |
||||
name='to_address', |
||||
), |
||||
] |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,96 @@ |
||||
/* Timeline styling */ |
||||
.timeline { |
||||
position: relative; |
||||
padding: 0; |
||||
list-style: none; |
||||
} |
||||
|
||||
.timeline:before { |
||||
content: ''; |
||||
position: absolute; |
||||
top: 0; |
||||
bottom: 0; |
||||
left: 40px; |
||||
width: 4px; |
||||
background-color: var(--bs-primary); |
||||
} |
||||
|
||||
.timeline-item { |
||||
position: relative; |
||||
margin-bottom: 50px; |
||||
} |
||||
|
||||
.timeline-badge { |
||||
position: absolute; |
||||
top: 0; |
||||
left: 40px; |
||||
width: 60px; |
||||
height: 60px; |
||||
margin-left: -30px; |
||||
border-radius: 50%; |
||||
text-align: center; |
||||
background-color: var(--bs-primary); |
||||
color: white; |
||||
z-index: 100; |
||||
display: flex; |
||||
flex-direction: column; |
||||
align-items: center; |
||||
justify-content: center; |
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); |
||||
padding: 5px; |
||||
} |
||||
|
||||
.timeline-badge-day { |
||||
font-size: 1.25rem; |
||||
font-weight: bold; |
||||
line-height: 1; |
||||
} |
||||
|
||||
.timeline-badge-month { |
||||
font-size: 0.8rem; |
||||
text-transform: uppercase; |
||||
line-height: 1; |
||||
} |
||||
|
||||
.timeline-month-header { |
||||
position: relative; |
||||
margin-bottom: 30px; |
||||
list-style: none; |
||||
} |
||||
|
||||
.timeline-month-header h3 { |
||||
position: relative; |
||||
padding-left: 60px; |
||||
border-bottom: 2px solid var(--bs-primary); |
||||
padding-bottom: 10px; |
||||
} |
||||
|
||||
.timeline-panel { |
||||
position: relative; |
||||
width: calc(100% - 90px); |
||||
float: right; |
||||
border-radius: 8px; |
||||
} |
||||
|
||||
.timeline-panel:before { |
||||
content: ''; |
||||
position: absolute; |
||||
top: 26px; |
||||
left: -15px; |
||||
border-top: 15px solid transparent; |
||||
border-right: 15px solid #fff; |
||||
border-bottom: 15px solid transparent; |
||||
} |
||||
|
||||
.timeline-date { |
||||
display: block; |
||||
margin-bottom: 10px; |
||||
font-weight: bold; |
||||
color: var(--bs-primary); |
||||
} |
||||
|
||||
@media (max-width: 767px) { |
||||
.timeline-badge { |
||||
margin-left: 0; |
||||
} |
||||
} |
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,48 @@ |
||||
/* Roboto Font */ |
||||
@font-face { |
||||
font-family: 'Roboto'; |
||||
font-style: normal; |
||||
font-weight: 100; |
||||
src: url('./roboto-v30-latin-100.woff2') format('woff2'), |
||||
url('./roboto-v30-latin-100.woff') format('woff'); |
||||
} |
||||
|
||||
@font-face { |
||||
font-family: 'Roboto'; |
||||
font-style: normal; |
||||
font-weight: 200; |
||||
src: url('./roboto-v30-latin-200.woff2') format('woff2'), |
||||
url('./roboto-v30-latin-200.woff') format('woff'); |
||||
} |
||||
|
||||
@font-face { |
||||
font-family: 'Roboto'; |
||||
font-style: normal; |
||||
font-weight: 300; |
||||
src: url('./roboto-v30-latin-300.woff2') format('woff2'), |
||||
url('./roboto-v30-latin-300.woff') format('woff'); |
||||
} |
||||
|
||||
@font-face { |
||||
font-family: 'Roboto'; |
||||
font-style: normal; |
||||
font-weight: 400; |
||||
src: url('./roboto-v30-latin-regular.woff2') format('woff2'), |
||||
url('./roboto-v30-latin-regular.woff') format('woff'); |
||||
} |
||||
|
||||
@font-face { |
||||
font-family: 'Roboto'; |
||||
font-style: normal; |
||||
font-weight: 500; |
||||
src: url('./roboto-v30-latin-500.woff2') format('woff2'), |
||||
url('./roboto-v30-latin-500.woff') format('woff'); |
||||
} |
||||
|
||||
@font-face { |
||||
font-family: 'Roboto'; |
||||
font-style: normal; |
||||
font-weight: 700; |
||||
src: url('./roboto-v30-latin-700.woff2') format('woff2'), |
||||
url('./roboto-v30-latin-700.woff') format('woff'); |
||||
} |
||||
|
After Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.8 KiB |
|
After Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 7.0 KiB |
|
After Width: | Height: | Size: 3.2 KiB |
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1,53 @@ |
||||
from datetime import date |
||||
from celery import shared_task |
||||
from django.db import transaction |
||||
from django.db.models import Q |
||||
from django.utils import timezone |
||||
|
||||
from core.models import EventPage, EventHistoryPage |
||||
|
||||
|
||||
@shared_task |
||||
def move_past_events_to_history(): |
||||
""" |
||||
Daily task to: |
||||
1. Move past events that are not external to the history |
||||
2. Unpublish external events that are past |
||||
""" |
||||
today = date.today() |
||||
|
||||
# Find all live EventPage objects with a start_date in the past |
||||
past_events = EventPage.objects.live().filter( |
||||
Q(end_date__lt=timezone.now()) | Q(end_date__isnull=True, start_date__lt=timezone.now())) |
||||
|
||||
# Find the first EventHistoryPage to use as the target for moving events |
||||
try: |
||||
history_page = EventHistoryPage.objects.live().first() |
||||
if not history_page: |
||||
# If no history page exists, we can't move events |
||||
return "No EventHistoryPage found. Cannot move past events." |
||||
except EventHistoryPage.DoesNotExist: |
||||
return "No EventHistoryPage found. Cannot move past events." |
||||
|
||||
moved_count = 0 |
||||
unpublished_count = 0 |
||||
|
||||
with transaction.atomic(): |
||||
# Process each past event |
||||
for event in past_events: |
||||
if event.is_external: |
||||
# Unpublish external events |
||||
event.unpublish() |
||||
unpublished_count += 1 |
||||
else: |
||||
# Move non-external events to history |
||||
# Get the current parent page |
||||
current_parent = event.get_parent() |
||||
|
||||
# Only move if not already under the history page |
||||
if current_parent.id != history_page.id: |
||||
# Move the event to be a child of the history page |
||||
event.move(history_page, pos='last-child') |
||||
moved_count += 1 |
||||
|
||||
return f"Processed past events: {moved_count} moved to history, {unpublished_count} external events unpublished." |
||||
@ -1,55 +1,90 @@ |
||||
{% extends "core/base.html" %} |
||||
{% load core_tags menu_tags static wagtailuserbar wagtailcore_tags wagtailimages_tags %} |
||||
|
||||
{% block extra_css %} |
||||
<link rel="stylesheet" href="{% static 'css/timeline.css' %}"> |
||||
{% endblock %} |
||||
|
||||
{% block content %} |
||||
<div class="container"> |
||||
{% for event in self.events %} |
||||
<div class="card mb-4 border-0 shadow-sm"> |
||||
<div class="card-header bg-light"> |
||||
<div class="d-flex justify-content-between align-items-center"> |
||||
<div> |
||||
<span class="fs-5">{{ event.value.start_date|date:"SHORT_DATE_FORMAT" }}{% if event.value.end_date %} - {{ event.value.end_date|date:"SHORT_DATE_FORMAT" }}{% endif %}</span> |
||||
</div> |
||||
<div> |
||||
<span class="text-muted">{{ event.value.start_date|date:"F Y" }}</span> |
||||
</div> |
||||
<ul class="timeline"> |
||||
{% regroup self.get_all_events by value.start_date|date:"F Y" as events_by_month %} |
||||
{% for month_group in events_by_month %} |
||||
<li class="timeline-month-header"> |
||||
<h3 class="text-primary mb-4">{{ month_group.grouper }}</h3> |
||||
</li> |
||||
{% for event in month_group.list %} |
||||
<li class="timeline-item clearfix"> |
||||
<div class="timeline-badge"> |
||||
<span class="timeline-badge-day">{{ event.value.start_date|date:"d" }}</span> |
||||
<span class="timeline-badge-month">{{ event.value.start_date|date:"b" }}</span> |
||||
</div> |
||||
</div> |
||||
<div class="card-body"> |
||||
<h3 class="card-title mb-3">{{ event.value.title }} |
||||
{% if event.value.subtitle %}<br><small class="text-muted">{{ event.value.subtitle }}</small>{% endif %}</h3> |
||||
<div class="row"> |
||||
<div class="col-md-4 mb-3 mb-md-0"> |
||||
{% if event.value.image %} |
||||
{% image event.value.image max-250x250 class="img-fluid rounded" %} |
||||
{% endif %} |
||||
<div class="timeline-panel card border-0 shadow-sm"> |
||||
<div class="card-header bg-light"> |
||||
<div class="d-flex justify-content-between align-items-center"> |
||||
<div> |
||||
<span class="fs-5">{{ event.value.start_date|date:"SHORT_DATE_FORMAT" }}{% if event.value.end_date %} - {{ event.value.end_date|date:"SHORT_DATE_FORMAT" }}{% endif %}</span> |
||||
</div> |
||||
<div> |
||||
<span class="text-muted">{{ event.value.start_date|date:"F Y" }}</span> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="col-md-4 mb-3 mb-md-0"> |
||||
<h5 class="mb-3"> |
||||
{{ event.value.start_date }}{% if event.value.end_date %} - {{ event.value.end_date }}{% endif %} |
||||
</h5> |
||||
<div class="card-body"> |
||||
<h3 class="card-title mb-3"> |
||||
{% if event.type == 'page' %} |
||||
<a href="{% pageurl event.page %}">{{ event.value.title }}</a> |
||||
{% else %} |
||||
{{ event.value.title }} |
||||
{% endif %} |
||||
{% if event.value.subtitle %}<br><small class="text-muted">{{ event.value.subtitle }}</small>{% endif %} |
||||
</h3> |
||||
<div class="row"> |
||||
<div class="col-md-4 mb-3 mb-md-0"> |
||||
{% if event.value.image %} |
||||
{% image event.value.image max-250x250 class="img-fluid rounded" %} |
||||
{% endif %} |
||||
</div> |
||||
<div class="col-md-4 mb-3 mb-md-0"> |
||||
<h5 class="mb-3"> |
||||
{{ event.value.start_date }}{% if event.value.end_date %} - {{ event.value.end_date }}{% endif %} |
||||
</h5> |
||||
|
||||
<p> |
||||
{% if event.value.location_name %}<strong>{{ event.value.location_name }}</strong><br>{% endif %} |
||||
{% if event.value.location_city %}{{ event.value.location_city }}{% endif %} |
||||
</p> |
||||
</div> |
||||
<div class="col-md-4"> |
||||
{% if event.value.flyer.url %} |
||||
<p> |
||||
<a class="btn btn-outline-primary w-100 mb-2" href="{{ event.value.flyer.url }}" target="_blank"><i class="bi bi-cloud-download"></i> Programm herunterladen</a> |
||||
</p> |
||||
{% endif %} |
||||
{% if event.value.additional_info_target.url %} |
||||
<p> |
||||
<a class="btn btn-outline-primary w-100 mb-2" href="{{ event.value.additional_info_target.url }}"><i class="bi bi-info-circle"></i> |
||||
{{ event.value.additional_info_btn_label }}</a> |
||||
</p> |
||||
{% endif %} |
||||
<p> |
||||
{% if event.value.location_name %}<strong>{{ event.value.location_name }}</strong><br>{% endif %} |
||||
{% if event.value.location_city %}{{ event.value.location_city }}{% endif %} |
||||
</p> |
||||
</div> |
||||
<div class="col-md-4"> |
||||
{% if event.type == 'manual' %} |
||||
{% if event.value.flyer.url %} |
||||
<p> |
||||
<a class="btn btn-outline-primary w-100 mb-2" href="{{ event.value.flyer.url }}" target="_blank"><i class="bi bi-cloud-download"></i> Programm herunterladen</a> |
||||
</p> |
||||
{% endif %} |
||||
{% if event.value.additional_info_target.url %} |
||||
<p> |
||||
<a class="btn btn-outline-primary w-100 mb-2" href="{{ event.value.additional_info_target.url }}"><i class="bi bi-info-circle"></i> |
||||
{{ event.value.additional_info_btn_label }}</a> |
||||
</p> |
||||
{% endif %} |
||||
{% elif event.type == 'page' %} |
||||
{% if event.value.flyer %} |
||||
<p> |
||||
<a class="btn btn-outline-primary w-100 mb-2" href="{{ event.value.flyer.url }}" target="_blank"><i class="bi bi-cloud-download"></i> Programm herunterladen</a> |
||||
</p> |
||||
{% endif %} |
||||
<p> |
||||
<a class="btn btn-outline-primary w-100 mb-2" href="{% pageurl event.page %}"><i class="bi bi-info-circle"></i> Details anzeigen</a> |
||||
</p> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
{% endfor %} |
||||
</li> |
||||
{% endfor %} |
||||
{% endfor %} |
||||
</ul> |
||||
</div> |
||||
{% endblock content %} |
||||
|
||||
@ -1,9 +1,8 @@ |
||||
{% load menu_tags wagtailcore_tags %} |
||||
|
||||
<ul class="dropdown-menu shadow-sm border-0" aria-labelledby="navbarDropdown"> |
||||
{# Include link to parent because the parent link is a drop down #} |
||||
<li><a class="dropdown-item" href="{% pageurl parent %}">{{ parent.title }}</a></li> |
||||
<ul class="dropdown-menu modern-dropdown shadow border-0" aria-labelledby="navbarDropdown"> |
||||
<li><hr class="dropdown-divider"></li> |
||||
{% for child in menuitems_children %} |
||||
<li><a class="dropdown-item{% if child.active %} active text-primary{% endif %}" href="{% pageurl child %}">{{ child.title }}</a></li> |
||||
<li><a class="dropdown-item{% if child.active %} active{% endif %}" href="{% pageurl child %}">{{ child.title }}</a></li> |
||||
{% endfor %} |
||||
</ul> |
||||
|
||||
@ -1,27 +1,42 @@ |
||||
{% load core_tags menu_tags static wagtailuserbar wagtailcore_tags wagtailimages_tags %} |
||||
|
||||
<div class="border-bottom pb-2 mb-3"> |
||||
<h2>Veranstaltungskalender</h2> |
||||
</div> |
||||
<div class="mb-4 overflow-auto" style="max-height: 300px;"> |
||||
{% for event in events %} |
||||
<div class="mb-3 pb-3 border-bottom"> |
||||
<div class="d-flex"> |
||||
<div class="text-center me-3 bg-light rounded p-2"> |
||||
<span class="d-block fs-4">{{ event.start_date|date:"d" }}</span> |
||||
<small class="text-muted">{{ event.start_date|date:"M Y" }}</small> |
||||
</div> |
||||
<div class="overflow-hidden"> |
||||
<h3 class="h5"><a href="{% pageurl event %}" class="text-decoration-none">{{ event.title }}</a></h3> |
||||
<p class="mb-0"> |
||||
{{ event.start_date }}{% if event.end_date %} - {{ event.end_date }}{% endif %} |
||||
{{ event.location_name }}<br> |
||||
{{ event.location_city }}</p> |
||||
<div class="event-calendar"> |
||||
<div class="event-calendar-header mb-3"> |
||||
<h2 class="event-calendar-title">Veranstaltungskalender</h2> |
||||
</div> |
||||
<div class="event-list mb-4 overflow-auto" style="max-height: 300px; overflow-x: hidden !important;"> |
||||
{% for event in events %} |
||||
<div class="event-item mb-3"> |
||||
<div class="d-flex"> |
||||
<div class="event-date-badge me-3"> |
||||
<span class="event-day">{{ event.start_date|date:"d" }}</span> |
||||
<span class="event-month">{{ event.start_date|date:"M" }}</span> |
||||
<span class="event-year">{{ event.start_date|date:"Y" }}</span> |
||||
</div> |
||||
<div class="event-content"> |
||||
<h3 class="event-title"><a href="{% pageurl event %}" class="event-link">{{ event.title }}</a></h3> |
||||
<div class="event-details"> |
||||
<div class="event-date"> |
||||
<i class="bi bi-calendar-event"></i> |
||||
{{ event.start_date|date:"d.m.Y" }}{% if event.end_date %} - {{ event.end_date|date:"d.m.Y" }}{% endif %} |
||||
</div> |
||||
{% if event.location_name or event.location_city %} |
||||
<div class="event-location"> |
||||
<i class="bi bi-geo-alt"></i> |
||||
{% if event.location_name %}{{ event.location_name }}{% endif %} |
||||
{% if event.location_name and event.location_city %}, {% endif %} |
||||
{% if event.location_city %}{{ event.location_city }}{% endif %} |
||||
</div> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
{% endfor %} |
||||
</div> |
||||
<div class="event-calendar-footer text-end"> |
||||
<a class="btn btn-outline-primary btn-sm" href="{% url 'ics_events' %}"> |
||||
<i class="bi bi-calendar-plus"></i> Veranstaltungskalender als ICS |
||||
</a> |
||||
</div> |
||||
{% endfor %} |
||||
</div> |
||||
<div class="pt-3 text-end"> |
||||
<a class="btn btn-outline-primary btn-sm" href="https://feo.gmbh/events.ics">Veranstaltungskalender als ICS</a> |
||||
</div> |
||||
|
||||
@ -1,7 +1,9 @@ |
||||
<div id="mc_embed_signup"> |
||||
<div id="mc_embed_signup" class="newsletter-cta p-3 mb-4 rounded"> |
||||
<p class="newsletter-heading mb-2">Bleiben Sie informiert!</p> |
||||
<p class="newsletter-text mb-3">Erhalten Sie Updates zu unseren Veranstaltungen und Angeboten.</p> |
||||
<a href="https://gmbh.us8.list-manage.com/subscribe?u=a2db855ea544f9ced14052793&id=42a1a3ba11" |
||||
target="_blank"> |
||||
<i class="fa fa-envelope"></i> |
||||
target="_blank" class="btn btn-primary w-100 d-flex align-items-center justify-content-center"> |
||||
<i class="bi bi-envelope-fill me-2"></i> |
||||
Zum Newsletter anmelden |
||||
</a> |
||||
</div> |
||||
|
||||
@ -0,0 +1,5 @@ |
||||
# This will make sure the app is always imported when |
||||
# Django starts so that shared_task will use this app. |
||||
from .celery import app as celery_app |
||||
|
||||
__all__ = ('celery_app',) |
||||
@ -0,0 +1,14 @@ |
||||
import os |
||||
from celery import Celery |
||||
|
||||
# Set the default Django settings module for the 'celery' program. |
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'feo_homepage.settings.base') |
||||
|
||||
app = Celery('feo_homepage') |
||||
|
||||
# Using a string here means the worker doesn't have to serialize |
||||
# the configuration object to child processes. |
||||
app.config_from_object('django.conf:settings', namespace='CELERY') |
||||
|
||||
# Load task modules from all registered Django app configs. |
||||
app.autodiscover_tasks() |
||||
Loading…
Reference in new issue