Merge remote-tracking branch 'origin/feature/enhancements-2' into feature/majak-misc-enhancements

district/models.py

@@ -127,7 +127,7 @@ class DistrictHomePage(MetadataPageMixin, CalendarMixin, Page):
         FieldPanel("show_calendar_on_hp"),
     ]
 
-    promote_panels = [
+    promote_panels = MetadataPageMixin.promote_panels + [
         MultiFieldPanel(
             [
                 FieldPanel("facebook"),
@@ -135,7 +135,7 @@ class DistrictHomePage(MetadataPageMixin, CalendarMixin, Page):
                 FieldPanel("twitter"),
                 FieldPanel("youtube"),
             ],
-            gettext_lazy("Common page configuration"),
+            gettext_lazy("Social page configuration"),
         ),
     ]
 

region/models.py

@@ -127,7 +127,7 @@ class RegionHomePage(MetadataPageMixin, CalendarMixin, Page):
         FieldPanel("show_calendar_on_hp"),
     ]
 
-    promote_panels = [
+    promote_panels = MetadataPageMixin.promote_panels + [
         MultiFieldPanel(
             [
                 FieldPanel("facebook"),
@@ -135,7 +135,7 @@ class RegionHomePage(MetadataPageMixin, CalendarMixin, Page):
                 FieldPanel("twitter"),
                 FieldPanel("youtube"),
             ],
-            gettext_lazy("Common page configuration"),
+            gettext_lazy("Social page configuration"),
         ),
     ]