@@ -45,14 +31,6 @@
{% endfor %}
-
-
-
-
- ![]()
-
X
` -> `` (preserves link/style). - - Otherwise, unwrap the offending tag (drops the styling, keeps content). - """ - soup = BeautifulSoup(html, "html.parser") - while True: - offender = None - for tag in soup.find_all(_PROBLEM_WRAPPERS): - if tag.find(_BLOCK_TAGS): - offender = tag - break - if offender is None: - break - - block_children = [c for c in offender.children if getattr(c, "name", None) in _BLOCK_TAGS] - if len(block_children) == 1 and not _has_significant_other_content(offender, block_children[0]): - block = block_children[0] - new_wrapper = soup.new_tag(offender.name, attrs=dict(offender.attrs)) - for child in list(block.contents): - new_wrapper.append(child.extract()) - block.append(new_wrapper) - offender.unwrap() - else: - offender.unwrap() - return str(soup) - - -def sanitize_if_needed(html): - """Return repaired HTML if the input would crash the editor, else the input unchanged. - - Fast path: if the converter accepts the HTML, return it untouched (no parsing). - Repair path: if the cleaned HTML still wouldn't load, return the original to - avoid making things worse. - """ - if not is_broken(html): - return html - cleaned = repair(html) - if is_broken(cleaned): - return html - return cleaned diff --git a/publichealth/home/routes.py b/publichealth/home/routes.py index b3d2685..046884f 100644 --- a/publichealth/home/routes.py +++ b/publichealth/home/routes.py @@ -4,10 +4,10 @@ from datetime import date from django.utils.dateformat import DateFormat from django.utils.formats import date_format -from django.utils.translation import gettext_lazy as _ # ugettext_lazy deprecated in Django 4.0 +from django.utils.translation import ugettext_lazy as _ -from wagtail.models import Page # wagtail.core.models moved to wagtail.models in 3.0 -from wagtail.contrib.search_promotions.models import Query +from wagtail.core.models import Page +from wagtail.search.models import Query from wagtail.contrib.routable_page.models import RoutablePageMixin, route class HomePage(RoutablePageMixin, Page): diff --git a/publichealth/home/signals.py b/publichealth/home/signals.py deleted file mode 100644 index 95b26b4..0000000 --- a/publichealth/home/signals.py +++ /dev/null @@ -1,140 +0,0 @@ -""" -Pre-save signal handlers that sanitize rich-text content before it lands -in the database. - -The Draftail editor renders the *latest revision* of a page (not the page -row), so the most important hook is `Revision.pre_save` — that catches every -admin draft-save and publish flow. `Page.pre_save` is a belt-and-braces -catch for direct model writes (shell, migrations, etc). -""" -import json - -from django.db.models.signals import pre_save -from django.dispatch import receiver - -from wagtail.models import Page -from wagtail.fields import RichTextField, StreamField -from wagtail.blocks import RichTextBlock - -from .rich_text_sanitizer import sanitize_if_needed - -try: - from wagtail.models import Revision -except ImportError: # pragma: no cover — fallback for older Wagtail layouts - Revision = None - - -def _sanitize_stream_items(items, stream_block): - """Sanitize a list of {type, value, id} dicts in place. Return True if any changed.""" - changed = False - child_blocks = getattr(stream_block, "child_blocks", {}) - for item in items: - if not isinstance(item, dict): - continue - block_def = child_blocks.get(item.get("type")) - if isinstance(block_def, RichTextBlock): - value = item.get("value") - if isinstance(value, str): - cleaned = sanitize_if_needed(value) - if cleaned != value: - item["value"] = cleaned - changed = True - return changed - - -@receiver(pre_save) -def sanitize_revision_content(sender, instance, **kwargs): - """Sanitize rich-text values inside Revision.content before it's persisted.""" - if Revision is None or sender is not Revision: - return - ct = getattr(instance, "content_type", None) - if ct is None: - return - model_class = ct.model_class() - if model_class is None or not issubclass(model_class, Page): - return - - raw = instance.content - # Wagtail 4+ stores Revision.content as a JSONField (dict). Older Wagtail - # versions and any string-cast paths may give a JSON-encoded string. - if isinstance(raw, dict): - content_dict = raw - was_string = False - elif isinstance(raw, str): - try: - content_dict = json.loads(raw) - except (TypeError, ValueError): - return - was_string = True - else: - return - if not isinstance(content_dict, dict): - return - - changed = False - for field in model_class._meta.get_fields(): - if isinstance(field, RichTextField): - value = content_dict.get(field.name) - if isinstance(value, str): - cleaned = sanitize_if_needed(value) - if cleaned != value: - content_dict[field.name] = cleaned - changed = True - elif isinstance(field, StreamField): - value = content_dict.get(field.name) - stream_block = field.stream_block - if isinstance(value, list): - if _sanitize_stream_items(value, stream_block): - changed = True - elif isinstance(value, str): - try: - items = json.loads(value) - except (TypeError, ValueError): - continue - if isinstance(items, list) and _sanitize_stream_items(items, stream_block): - content_dict[field.name] = json.dumps(items) - changed = True - - if changed: - instance.content = json.dumps(content_dict) if was_string else content_dict - - -@receiver(pre_save) -def sanitize_page_fields(sender, instance, **kwargs): - """Sanitize rich-text fields on the Page model itself, for direct writes.""" - if not isinstance(instance, Page): - return - - for field in instance._meta.get_fields(): - if isinstance(field, RichTextField): - value = getattr(instance, field.name, "") or "" - cleaned = sanitize_if_needed(value) - if cleaned != value: - setattr(instance, field.name, cleaned) - elif isinstance(field, StreamField): - stream_value = getattr(instance, field.name, None) - if stream_value is None: - continue - try: - children = list(stream_value) - except Exception: - continue - replacements = {} - for i, child in enumerate(children): - if not isinstance(child.block, RichTextBlock): - continue - v = child.value - html = v.source if hasattr(v, "source") else str(v) - cleaned = sanitize_if_needed(html) - if cleaned != html: - replacements[i] = cleaned - if not replacements: - continue - new_list = [] - for i, child in enumerate(children): - if i in replacements: - new_list.append({"type": child.block_type, "value": replacements[i]}) - else: - raw = child.block.get_prep_value(child.value) - new_list.append({"type": child.block_type, "value": raw}) - setattr(instance, field.name, new_list) diff --git a/publichealth/home/templates/home/article_index_page.html b/publichealth/home/templates/home/article_index_page.html index 7b878cb..c4bca27 100644 --- a/publichealth/home/templates/home/article_index_page.html +++ b/publichealth/home/templates/home/article_index_page.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n wagtailcore_tags wagtailimages_tags %} +{% load wagtailcore_tags wagtailimages_tags %} {% block body_class %}template-{{ self.get_verbose_name|slugify }}{% endblock %} @@ -16,25 +16,11 @@ {% else %} - {% if page.header_image %} - {% image page.header_image fill-1908x400 as img %} -{{ page.trans_intro|richtext }}
- {% if page.subscribe_action %} - {% include 'home/subscription_form.html' %} - {% endif %}{% include_block block %} diff --git a/publichealth/home/templates/home/program_table.html b/publichealth/home/templates/home/program_table.html deleted file mode 100644 index 24bda39..0000000 --- a/publichealth/home/templates/home/program_table.html +++ /dev/null @@ -1,53 +0,0 @@ - -
| - {% if column.strip %} - {% if html_renderer %} - {{ column.strip|safe|linebreaksbr }} - {% else %} - {{ column.strip|linebreaksbr }} - {% endif %} - {% endif %} - | - {% endfor %} -|
|---|---|
| - {% if column.strip %} - {% if html_renderer %} - {{ column.strip|safe|linebreaksbr }} - {% else %} - {{ column.strip|linebreaksbr }} - {% endif %} - {% endif %} - | - {% else %} -- {% if column.strip %} - {% if html_renderer %} - {{ column.strip|safe|linebreaksbr }} - {% else %} - {{ column.strip|linebreaksbr }} - {% endif %} - {% endif %} - | - {% endif %} - {% endfor %} -
block, so -// floating them made supporter/sponsor logos collapse side by side and let -// trailing text (captions, contact blocks) wrap beside the last logo. Render -// rich-text images as stacked block elements instead: logos sit one under the -// other and any following text drops below them. The left/right alignment -// classes now position the block via auto margins rather than floating. -.richtext-image.left, -.richtext-image.right{ - display:block; - float:none; - clear:both; +.richtext-image.left{ + float:left; } .richtext-image.right{ - margin-left:auto; + float:right; } .responsive-object { position: relative; diff --git a/publichealth/static/css/subsites.scss b/publichealth/static/css/subsites.scss index df071ef..488d854 100644 --- a/publichealth/static/css/subsites.scss +++ b/publichealth/static/css/subsites.scss @@ -10,7 +10,7 @@ // Language menu hack, until this is configurable nav .language-nav a[lang='en'] { display: inline; } - //#footer, .contact-nav .link { display: none; } + #footer, .contact-nav .link { display: none; } a.navbar-brand { height: 60px; @@ -49,7 +49,6 @@ html[lang='fr'] .site-ngo-allianz-ebk .navbar-brand { background-image: url('/static/org/NGO-Allianz_Logo-fr.jpg'); } - // -site-ngo-allianz-ebk // Custom styles for gesundheitsmanifest.ch @@ -62,18 +61,3 @@ html[lang='fr'] .site-ngo-allianz-ebk .navbar-brand { border-bottom: 1px solid #ddd; } } - -.site-dev-pro-salutech { - .navbar-brand { - width: 240px; - height: 64px; - background-size: contain !important; - background-repeat: no-repeat; - background-image: url('/static/images/pro-salute-logo.png'); - - font-size: 0px !important; - img { display: none !important; } - } - #carousel-banner .carousel-caption { display: none; } -} - diff --git a/publichealth/static/images/favicon-prosalute.ico b/publichealth/static/images/favicon-prosalute.ico deleted file mode 100644 index 7611f74..0000000 Binary files a/publichealth/static/images/favicon-prosalute.ico and /dev/null differ diff --git a/publichealth/static/images/social/linkedin.png b/publichealth/static/images/social/linkedin.png deleted file mode 100644 index 0c639c8..0000000 Binary files a/publichealth/static/images/social/linkedin.png and /dev/null differ diff --git a/publichealth/templates/500.html b/publichealth/templates/500.html index d085d59..c186fc9 100644 --- a/publichealth/templates/500.html +++ b/publichealth/templates/500.html @@ -11,6 +11,6 @@
In case of persistent issues, write to info@ungleich.ch
+In case of persistent issues, write to info@datalets.ch