move some block labels around

dnscms/dnscms/blocks.py

@@ -38,6 +38,7 @@ class ImageWithTextBlock(blocks.StructBlock):
 
     class Meta:
         icon = "image"
+        label = "Bilde"
 
 
 @register_streamfield_block
@@ -55,6 +56,7 @@ class ImageSliderItemBlock(blocks.StructBlock):
 
     class Meta:
         icon = "image"
+        label = "Bildegalleri"
 
 
 @register_streamfield_block
@@ -91,6 +93,7 @@ class HorizontalRuleBlock(blocks.StructBlock):
 
     class Meta:
         icon = "minus"
+        label = "Skillelinje"
 
 
 @register_streamfield_block
@@ -153,6 +156,7 @@ class FeaturedBlock(blocks.StructBlock):
 
     class Meta:
         icon = "arrow-right-full"
+        label = "Fremhevet underside"
 
 
 class PageSectionNavigationBlock(blocks.StaticBlock):
@@ -193,14 +197,15 @@ class AccordionBlock(blocks.StructBlock):
 
     class Meta:
         icon = "folder-open-1"
+        label = "Trekkspill"
 
 
 BASE_BLOCKS = [
     ("paragraph", blocks.RichTextBlock(label="Rik tekst")),
-    ("image", ImageWithTextBlock(label="Bilde")),
-    ("image_slider", ImageSliderBlock(label="Bildegalleri")),
-    ("horizontal_rule", HorizontalRuleBlock(label="Skillelinje")),
-    ("featured", FeaturedBlock(label="Fremhevet underside")),
+    ("image", ImageWithTextBlock()),
+    ("image_slider", ImageSliderBlock()),
+    ("horizontal_rule", HorizontalRuleBlock()),
+    ("featured", FeaturedBlock()),
     ("page_section_navigation", PageSectionNavigationBlock()),
     ("accordion", AccordionBlock()),
 ]
@@ -238,3 +243,4 @@ class PageSectionBlock(blocks.StructBlock):
 
     class Meta:
         icon = "folder-open-1"
+        label = "Seksjon"

dnscms/generic/models.py

@@ -12,7 +12,7 @@ class GenericPage(Page):
     show_in_menus = True
 
     lead = RichTextField(features=["bold", "italic", "link"])
-    body = StreamField(BASE_BLOCKS + [("page_section", PageSectionBlock(label="Seksjon"))])
+    body = StreamField(BASE_BLOCKS + [("page_section", PageSectionBlock())])
 
     content_panels = Page.content_panels + [
         FieldPanel("lead", heading="Ingress"),