diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py index 5efb3aa..6c73351 100644 --- a/publichealth/home/models/models.py +++ b/publichealth/home/models/models.py @@ -71,10 +71,6 @@ class ArticleIndexPage(Page): null=True, blank=True, ) - - #table_en = TableBlock() - #table_fr = TableBlock() - #table_de = TableBlock() trans_table = TranslatedField( 'table_de', 'table_fr', @@ -203,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) @@ -304,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) @@ -327,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"), ] diff --git a/publichealth/home/templates/home/page_content.html b/publichealth/home/templates/home/page_content.html index 57ea93a..a2c4165 100644 --- a/publichealth/home/templates/home/page_content.html +++ b/publichealth/home/templates/home/page_content.html @@ -27,19 +27,9 @@
{% include_block block %}
- -{% endfor %} - -