From d9ee560afa0384b6efcae09250597bbf4be24877 Mon Sep 17 00:00:00 2001
From: Patrick Mayr <patrick@fet.at>
Date: Sat, 30 Jul 2022 23:29:56 +0000
Subject: [PATCH] sorting admin fields

---
 fet2020/posts/admin.py | 91 ++++++++++++++++++++++++++++++++++++++++++
 fet2020/posts/forms.py | 69 ++++++++++----------------------
 2 files changed, 113 insertions(+), 47 deletions(-)

diff --git a/fet2020/posts/admin.py b/fet2020/posts/admin.py
index bece338c..d2366836 100644
--- a/fet2020/posts/admin.py
+++ b/fet2020/posts/admin.py
@@ -102,6 +102,46 @@ class NewsAdmin(PostAdmin):
     form = NewsForm
     model = News
 
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "title",
+                    "subtitle",
+                    "tags",
+                )
+            },
+        ),
+        (
+            "Status",
+            {
+                "fields": (
+                    "status",
+                    "is_pinned",
+                )
+            }
+        ),
+        (
+            "Bericht",
+            {
+                "fields": (
+                    "image",
+                    "body",
+                )
+            }
+        ),
+        (
+            "Veröffentlichung",
+            {
+                "fields": (
+                    "slug",
+                    "author",
+                    "public_date",
+                )
+            }
+        ),
+    )
     inlines = (FileUploadInline,)
 
 
@@ -114,6 +154,57 @@ class EventAdmin(PostAdmin):
     list_filter = ["is_pinned", "status"]
     ordering = ["-event_start"]
 
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "title",
+                    "subtitle",
+                    "tags",
+                )
+            },
+        ),
+        (
+            "Status",
+            {
+                "fields": (
+                    "status",
+                    "is_pinned",
+                )
+            }
+        ),
+        (
+            "Event Infos",
+            {
+                "fields": (
+                    "event_start",
+                    "event_end",
+                    "event_place",
+                )
+            }
+        ),
+        (
+            "Bericht",
+            {
+                "fields": (
+                    "image",
+                    "body",
+                )
+            }
+        ),
+        (
+            "Veröffentlichung",
+            {
+                "fields": (
+                    "slug",
+                    "author",
+                    "public_date",
+                )
+            }
+        ),
+    )
+
 
 class FetMeetingAdmin(EventAdmin):
     form = FetMeetingForm
diff --git a/fet2020/posts/forms.py b/fet2020/posts/forms.py
index dc5b0099..0ccfc8b5 100644
--- a/fet2020/posts/forms.py
+++ b/fet2020/posts/forms.py
@@ -36,18 +36,17 @@ class PostForm(forms.ModelForm):
 class NewsForm(PostForm):
     class Meta:
         model = News
-        fields = [
-            "title",
-            "subtitle",
-            "tags",
-            "status",
-            "image",
-            "body",
-            "slug",
-            "author",
-            "public_date",
-            "is_pinned",
-        ]
+        fields = "__all__"
+
+        help_texts = {
+            "tags": _(
+                "Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen."
+            ),
+            "image": _("Verwendbare Formate: ..."),
+            "is_pinned": _(
+                "Dieser Post soll an die Startseite als erster Post angeheftet werden."
+            ),
+        }
 
         labels = {
             "title": _("Titel"),
@@ -60,16 +59,6 @@ class NewsForm(PostForm):
             "is_pinned": _("Post anheften"),
         }
 
-        help_texts = {
-            "tags": _(
-                "Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen."
-            ),
-            "image": _("Verwendbare Formate: ..."),
-            "is_pinned": _(
-                "Dieser Post soll an die Startseite als erster Post angeheftet werden."
-            ),
-        }
-
         widgets = {"body": CKEditorUploadingWidget(config_name="default")}
 
     def __init__(self, *args, **kwargs):
@@ -81,21 +70,17 @@ class NewsForm(PostForm):
 class EventForm(PostForm):
     class Meta:
         model = Event
-        fields = [
-            "title",
-            "subtitle",
-            "tags",
-            "status",
-            "image",
-            "body",
-            "event_start",
-            "event_end",
-            "event_place",
-            "slug",
-            "author",
-            "public_date",
-            "is_pinned",
-        ]
+        fields = "__all__"
+
+        help_texts = {
+            "tags": _(
+                "Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen."
+            ),
+            "image": _("Verwendbare Formate: "),
+            "is_pinned": _(
+                "Dieses Event soll an die Startseite als erster Post angeheftet werden."
+            ),
+        }
 
         labels = {
             "title": _("Titel"),
@@ -111,16 +96,6 @@ class EventForm(PostForm):
             "is_pinned": _("Event anheften"),
         }
 
-        help_texts = {
-            "tags": _(
-                "Die Hashtags ohne '#' eintragen, und mit Komma kann man mehrere Tags anfügen."
-            ),
-            "image": _("Verwendbare Formate: "),
-            "is_pinned": _(
-                "Dieses Event soll an die Startseite als erster Post angeheftet werden."
-            ),
-        }
-
         widgets = {"body": CKEditorUploadingWidget(config_name="default")}
 
     def __init__(self, *args, **kwargs):