Cleanup unused code

publichealth/home/models/models.py

@@ -17,7 +17,7 @@ from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel, InlinePane
 from wagtail.images.blocks import ImageChooserBlock
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.search import index
-from wagtail.contrib.table_block.blocks import TableBlock
+from wagtail.core.blocks import RawHTMLBlock
 
 from puput.models import EntryPage, BlogPage
 from feedler.models import Entry, Stream
@@ -50,32 +50,27 @@ class ArticleIndexPage(Page):
         'intro_en',
     )
 
-
     table_en = StreamField(
         [
-            ('table_en', TableBlock())
+            ('table_en', RawHTMLBlock())
         ],
         null=True,
-        blank = True,
+        blank=True,
     )
     table_de = StreamField(
         [
-            ('table_de', TableBlock())
+            ('table_de', RawHTMLBlock())
         ],
         null=True,
-        blank = True,
+        blank=True,
     )
     table_fr = StreamField(
         [
-            ('table_fr', TableBlock())
+            ('table_fr', RawHTMLBlock())
         ],
         null=True,
-        blank = True,
+        blank=True,
     )
-
-    #table_en = TableBlock()
-    #table_fr = TableBlock()
-    #table_de = TableBlock()
     trans_table = TranslatedField(
         'table_de',
         'table_fr',
@@ -204,14 +199,6 @@ class ArticlePage(Page):
         'body_fr',
         'body_en',
     )
-    table_en = TableBlock()
-    table_fr = TableBlock()
-    table_de = TableBlock()
-    trans_table = TranslatedField(
-        'table_en',
-        'table_fr',
-        'table_de',
-    )
 
     date = models.DateField("Date", null=True, blank=True)
 
@@ -305,15 +292,6 @@ class HomePage(Page):
         'body_en',
     )
 
-    #table_en = TableBlock()
-    #table_fr = TableBlock()
-    #table_de = TableBlock()
-    #trans_table = TranslatedField(
-    #    'table_en',
-    #    'table_fr',
-    #    'table_de',
-    #)
-
     infos_de = StreamField([
         ('info', InfoBlock())
     ], null=True, blank=True)
@@ -328,27 +306,24 @@ class HomePage(Page):
         'infos_fr',
         'infos_en',
     )
-#    content_table = StreamField(TableBlock(), verbose_name=_('Content Table'), blank=True)
+
     content_panels = Page.content_panels + [
         MultiFieldPanel([
             FieldPanel('intro_de', classname="full"),
             FieldPanel('body_de', classname="full"),
             StreamFieldPanel('infos_de'),
-	    #StreamFieldPanel('table_de'),
         ], heading="Deutsch",
            classname="collapsible collapsed"),
         MultiFieldPanel([
             FieldPanel('intro_fr', classname="full"),
             FieldPanel('body_fr', classname="full"),
             StreamFieldPanel('infos_fr'),
-	    #StreamFieldPanel('table_fr'),
         ], heading="Français",
            classname="collapsible collapsed"),
         MultiFieldPanel([
             FieldPanel('intro_en', classname="full"),
             FieldPanel('body_en', classname="full"),
             StreamFieldPanel('infos_en'),
-	    #StreamFieldPanel('table_fr'),
         ], heading="English",
            classname="collapsible collapsed"),
     ]

publichealth/home/templates/home/page_content.html

@@ -27,19 +27,9 @@
   <p class="block-{{ block.block_type }}">
     {% include_block block %}
   </p>
-
-{% endfor %}
-</div>
-<h1>Mmmm</h1>
-<!-- Table content -->
-<div class="article-table" role="main">
-{% for block in page.trans_table %}
-  {% if block.block_type == 'table' %}
-    Inside if
-    {% include_block block %}
   {% endif %}
 {% endfor %}
-
+</div>
 
 <!-- Infoblocks -->
 <div class="row infoblocks">

publichealth/settings/base.py

@@ -44,7 +44,6 @@ INSTALLED_APPS = [
     'wagtail.contrib.redirects',
     'wagtail.contrib.search_promotions',
     "wagtail.contrib.legacy.richtext",
-    'wagtail.contrib.table_block',
 
     'wagtail.embeds',
     'wagtail.sites',