From 1e3a1aee622dbeba710ce3d06249890127180776 Mon Sep 17 00:00:00 2001 From: Anthony Donlon Date: Fri, 21 Nov 2025 08:57:04 +0800 Subject: [PATCH] py: trim spaces in generated page --- cloudflare_error_page/__init__.py | 4 ++- cloudflare_error_page/templates/error.html | 32 +++++++++++----------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/cloudflare_error_page/__init__.py b/cloudflare_error_page/__init__.py index c90cd5c..8e30edb 100644 --- a/cloudflare_error_page/__init__.py +++ b/cloudflare_error_page/__init__.py @@ -7,7 +7,9 @@ from jinja2 import Environment, PackageLoader, select_autoescape env = Environment( loader=PackageLoader("cloudflare_error_page"), - autoescape=select_autoescape() + autoescape=select_autoescape(), + trim_blocks=True, + lstrip_blocks=True, ) diff --git a/cloudflare_error_page/templates/error.html b/cloudflare_error_page/templates/error.html index 2553686..93dea2e 100644 --- a/cloudflare_error_page/templates/error.html +++ b/cloudflare_error_page/templates/error.html @@ -37,28 +37,28 @@
{% for item_id in ['browser', 'cloudflare', 'host'] %} {% if item_id == 'browser' %} - {% set icon = 'browser' -%} - {% set default_location = 'You' -%} - {% set default_name = 'Browser' -%} + {% set icon = 'browser' %} + {% set default_location = 'You' %} + {% set default_name = 'Browser' %} {% elif item_id == 'cloudflare' %} - {% set icon = 'cloud' -%} - {% set default_location = 'San Francisco' -%} - {% set default_name = 'Cloudflare' -%} + {% set icon = 'cloud' %} + {% set default_location = 'San Francisco' %} + {% set default_name = 'Cloudflare' %} {% else %} - {% set icon = 'server' -%} - {% set default_location = 'example.com' -%} - {% set default_name = 'Host' -%} + {% set icon = 'server' %} + {% set default_location = 'Website' %} + {% set default_name = 'Host' %} {% endif %} - {% set item = params.get(item_id + '_status', {}) -%} - {% set status = item.status or 'ok' -%} + {% set item = params.get(item_id + '_status', {}) %} + {% set status = item.status or 'ok' %} {% if item.status_text_color %} - {% set text_color = item.status_text_color -%} + {% set text_color = item.status_text_color %} {% elif status == 'ok' %} - {% set text_color = '#9bca3e' -%} {# text-green-success #} + {% set text_color = '#9bca3e' %}{# text-green-success #} {% elif status == 'error' %} - {% set text_color = '#bd2426' -%} {# text-red-error #} + {% set text_color = '#bd2426' %}{# text-red-error #} {% endif %} - {% set status_text = item.status_text or ('Working' if status == 'ok' else 'Not Working') -%} + {% set status_text = item.status_text or ('Working' if status == 'ok' else 'Not Working') %}
@@ -100,7 +100,7 @@ Performance & security by {{perf_sec_by.text or 'Cloudflare'}} {% set creator_info = params.creator_info or {} %} - {% if not creator_info.get('hidden', True) %} {# default: hidden #} + {% if not creator_info.get('hidden', True) %}{# default: hidden #} Created with {{creator_info.text}} {% endif %}