AKModel/admin.py

 from django import forms
 from django.apps import apps
-from django.contrib import admin
-from django.contrib.admin import SimpleListFilter, RelatedFieldListFilter
+from django.contrib import admin, messages
+from django.contrib.admin import SimpleListFilter, RelatedFieldListFilter, action
 from django.db.models import Count, F
+from django.db.models.functions import Now
 from django.shortcuts import render, redirect
 from django.urls import reverse_lazy
 from django.utils import timezone
@@ -31,11 +32,12 @@ class EventRelatedFieldListFilter(RelatedFieldListFilter):
 @admin.register(Event)
 class EventAdmin(admin.ModelAdmin):
     model = Event
-    list_display = ['name', 'status_url', 'place', 'start', 'end', 'active']
+    list_display = ['name', 'status_url', 'place', 'start', 'end', 'active', 'plan_hidden']
     list_filter = ['active']
     list_editable = ['active']
     ordering = ['-start']
-    readonly_fields = ['status_url']
+    readonly_fields = ['status_url', 'plan_hidden', 'plan_published_at']
+    actions = ['publish', 'unpublish']
 
     def add_view(self, request, form_url='', extra_context=None):
         # Always use wizard to create new events (the built-in form wouldn't work anyways since the timezone cannot
@@ -62,6 +64,16 @@ class EventAdmin(admin.ModelAdmin):
         timezone.activate(obj.timezone)
         return super().get_form(request, obj, change, **kwargs)
 
+    @action(description=_('Publish plan'))
+    def publish(self, request, queryset):
+        queryset.update(plan_published_at=Now(), plan_hidden=False)
+        self.message_user(request, _('Plan published'), messages.SUCCESS)
+
+    @action(description=_('Unpublish plan'))
+    def unpublish(self, request, queryset):
+        queryset.update(plan_published_at=None, plan_hidden=True)
+        self.message_user(request, _('Plan unpublished'), messages.SUCCESS)
+
 
 @admin.register(AKOwner)
 class AKOwnerAdmin(admin.ModelAdmin):

AKModel/forms.py

 from bootstrap_datepicker_plus import DateTimePickerInput
 from django import forms
 from django.forms.utils import ErrorList
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from AKModel.models import Event, AKCategory, AKRequirement
 
@@ -29,6 +29,7 @@ class NewEventWizardSettingsForm(forms.ModelForm):
             'start': DateTimePickerInput(options={"format": "YYYY-MM-DD HH:mm"}),
             'end': DateTimePickerInput(options={"format": "YYYY-MM-DD HH:mm"}),
             'reso_deadline': DateTimePickerInput(options={"format": "YYYY-MM-DD HH:mm"}),
+            'plan_hidden': forms.HiddenInput(),
         }
 
 

AKModel/management/commands/makemessages.py

+"""
+Ensure PO files are generated using forward slashes in the location comments on all operating systems
+"""
+import os
+
+from django.core.management.commands.makemessages import Command as MakeMessagesCommand
+
+
+class Command(MakeMessagesCommand):
+    def find_files(self, root):
+        all_files = super().find_files(root)
+        if os.sep != "\\":
+            return all_files
+
+        for file_entry in all_files:
+            if file_entry.dirpath == ".":
+                file_entry.dirpath = ""
+            elif file_entry.dirpath.startswith(".\\"):
+                file_entry.dirpath = file_entry.dirpath[2:].replace("\\", "/")
+
+        return all_files
+
+    def build_potfiles(self):
+        pot_files = super().build_potfiles()
+        if os.sep != "\\":
+            return pot_files
+
+        for filename in pot_files:
+            lines = open(filename, "r", encoding="utf-8").readlines()
+            fixed_lines = []
+            for line in lines:
+                if line.startswith("#: "):
+                    line = line.replace("\\", "/")
+                fixed_lines.append(line)
+
+            with open(filename, "w", encoding="utf-8") as f:
+                f.writelines(fixed_lines)
+
+        return pot_files

AKModel/migrations/0053_plan_published_at.py

+# Generated by Django 3.2.16 on 2022-10-15 10:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('AKModel', '0052_history_upgrade'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='plan_published_at',
+            field=models.DateTimeField(blank=True, help_text='Timestamp at which the plan was published', null=True, verbose_name='Plan published at'),
+        ),
+    ]

AKModel/models.py

@@ -39,6 +39,8 @@ class Event(models.Model):
     active = models.BooleanField(verbose_name=_('Active State'), help_text=_('Marks currently active events'))
     plan_hidden = models.BooleanField(verbose_name=_('Plan Hidden'), help_text=_('Hides plan for non-staff users'),
                                       default=True)
+    plan_published_at = models.DateTimeField(verbose_name=_('Plan published at'), blank=True, null=True,
+                                         help_text=_('Timestamp at which the plan was published'))
 
     base_url = models.URLField(verbose_name=_("Base URL"), help_text=_("Prefix for wiki link construction"), blank=True)
     wiki_export_template_name = models.CharField(verbose_name=_("Wiki Export Template Name"), blank=True, max_length=50)

AKModel/templates/admin/login.html

-{% extends "admin/base_site.html" %}
+{% extends "admin/login.html" %}
 {% load i18n static %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}">
-{{ form.media }}
-{% endblock %}
-
-{% block bodyclass %}{{ block.super }} login{% endblock %}
-
-{% block usertools %}{% endblock %}
-
-{% block nav-global %}{% endblock %}
-
-{% block nav-sidebar %}{% endblock %}
-
-{% block content_title %}{% endblock %}
-
-{% block breadcrumbs %}{% endblock %}
 
 {% block content %}
 {% if form.errors and not form.non_field_errors %}

AKPlan/templatetags/tags_AKPlan.py

@@ -11,6 +11,11 @@ register = template.Library()
 
 @register.filter
 def highlight_change_colors(akslot):
+    # Do not highlight in preview mode or when changes occurred before the plan was published
+    if akslot.event.plan_hidden or (akslot.event.plan_published_at is not None
+                                    and akslot.event.plan_published_at > akslot.updated):
+        return akslot.ak.category.color
+
     seconds_since_update = akslot.seconds_since_last_update
 
     # Last change long ago? Use default color

AKPlanning/settings.py

@@ -99,6 +99,8 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'AKPlanning.wsgi.application'
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # Database
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 

requirements.txt

-Django==3.1.8
+Django==3.2.16
 django-bootstrap4==2.3.1
 django-fontawesome-5==1.0.18
-django-split-settings==1.0.1
+django-split-settings==1.2.0
 django-timezone-field==4.1.2
-djangorestframework==3.12.4
-django-simple-history==3.0.0
-django-registration-redux==2.9
-django-debug-toolbar==3.2.1
+djangorestframework==3.14.0
+django-simple-history==3.1.1
+django-registration-redux==2.11
+django-debug-toolbar==3.7.0
 django-bootstrap-datepicker-plus==3.0.5
 django-tex @ git+https://github.com/bhaettasch/django-tex.git@66cc6567acde4db2ac971b7707652067e664392c
 django-csp==3.7
 mysqlclient==2.0.3  # for production deployment
-pytz==2021.1
+pytz==2022.4

static_common/common/css/admin-bootstrap.css

+/*
+    Load both the django admin base style and bootstrap -- but make sure bootstrap is loaded first to override all critical theme settings from bootstrap with the default admin style.
+    This especially fixes the dark theme.
+*/
+@import "/static/common/css/bootstrap.css";
+@import "../../admin/css/base.css";

templates/admin/base_site.html

@@ -4,6 +4,8 @@
 {% load fontawesome_5 %}
 {% load static %}
 
+{% block stylesheet %}{% static "common/css/admin-bootstrap.css" %}{% endblock %}
+
 {% block extrastyle %}
     {% if not debug %}
         <link rel="stylesheet" type="text/css" href="{% static "common/css/admin-color.css" %}"/>
@@ -12,7 +14,6 @@
 
 {% block extrahead %}
     <!-- Load bootstrap, jquery and fontawesome-->
-    {% bootstrap_css %}
     {% bootstrap_javascript jquery=True %}
     {% fontawesome_5_static %}