9
0
mirror of https://github.com/donlon/cloudflare-error-page.git synced 2025-12-19 14:59:28 +00:00

py: trim spaces in generated page

This commit is contained in:
Anthony Donlon
2025-11-21 08:57:04 +08:00
parent 665528919b
commit 1e3a1aee62
2 changed files with 19 additions and 17 deletions

View File

@@ -7,7 +7,9 @@ from jinja2 import Environment, PackageLoader, select_autoescape
env = Environment( env = Environment(
loader=PackageLoader("cloudflare_error_page"), loader=PackageLoader("cloudflare_error_page"),
autoescape=select_autoescape() autoescape=select_autoescape(),
trim_blocks=True,
lstrip_blocks=True,
) )

View File

@@ -37,28 +37,28 @@
<div class="clearfix md:px-8"> <div class="clearfix md:px-8">
{% for item_id in ['browser', 'cloudflare', 'host'] %} {% for item_id in ['browser', 'cloudflare', 'host'] %}
{% if item_id == 'browser' %} {% if item_id == 'browser' %}
{% set icon = 'browser' -%} {% set icon = 'browser' %}
{% set default_location = 'You' -%} {% set default_location = 'You' %}
{% set default_name = 'Browser' -%} {% set default_name = 'Browser' %}
{% elif item_id == 'cloudflare' %} {% elif item_id == 'cloudflare' %}
{% set icon = 'cloud' -%} {% set icon = 'cloud' %}
{% set default_location = 'San Francisco' -%} {% set default_location = 'San Francisco' %}
{% set default_name = 'Cloudflare' -%} {% set default_name = 'Cloudflare' %}
{% else %} {% else %}
{% set icon = 'server' -%} {% set icon = 'server' %}
{% set default_location = 'example.com' -%} {% set default_location = 'Website' %}
{% set default_name = 'Host' -%} {% set default_name = 'Host' %}
{% endif %} {% endif %}
{% set item = params.get(item_id + '_status', {}) -%} {% set item = params.get(item_id + '_status', {}) %}
{% set status = item.status or 'ok' -%} {% set status = item.status or 'ok' %}
{% if item.status_text_color %} {% if item.status_text_color %}
{% set text_color = item.status_text_color -%} {% set text_color = item.status_text_color %}
{% elif status == 'ok' %} {% elif status == 'ok' %}
{% set text_color = '#9bca3e' -%} {# text-green-success #} {% set text_color = '#9bca3e' %}{# text-green-success #}
{% elif status == 'error' %} {% elif status == 'error' %}
{% set text_color = '#bd2426' -%} {# text-red-error #} {% set text_color = '#bd2426' %}{# text-red-error #}
{% endif %} {% 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') %}
<div id="cf-{{item_id}}-status" class="{{'cf-error-source' if params.error_source == item_id else ''}} relative w-1/3 md:w-full py-15 md:p-0 md:py-8 md:text-left md:border-solid md:border-0 md:border-b md:border-gray-400 overflow-hidden float-left md:float-none text-center"> <div id="cf-{{item_id}}-status" class="{{'cf-error-source' if params.error_source == item_id else ''}} relative w-1/3 md:w-full py-15 md:p-0 md:py-8 md:text-left md:border-solid md:border-0 md:border-b md:border-gray-400 overflow-hidden float-left md:float-none text-center">
<div class="relative mb-10 md:m-0"> <div class="relative mb-10 md:m-0">
<span class="cf-icon-{{icon}} block md:hidden h-20 bg-center bg-no-repeat"></span> <span class="cf-icon-{{icon}} block md:hidden h-20 bg-center bg-no-repeat"></span>
@@ -100,7 +100,7 @@
<span class="cf-footer-item sm:block sm:mb-1"><span>Performance &amp; security by</span> <a rel="noopener noreferrer" href="{{perf_sec_by.link or 'https://www.cloudflare.com/'}}" id="brand_link" target="_blank">{{perf_sec_by.text or 'Cloudflare'}}</a></span> <span class="cf-footer-item sm:block sm:mb-1"><span>Performance &amp; security by</span> <a rel="noopener noreferrer" href="{{perf_sec_by.link or 'https://www.cloudflare.com/'}}" id="brand_link" target="_blank">{{perf_sec_by.text or 'Cloudflare'}}</a></span>
{% set creator_info = params.creator_info or {} %} {% 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 #}
<span class="cf-footer-separator sm:hidden">&bull;</span> <span class="cf-footer-separator sm:hidden">&bull;</span>
<span class="cf-footer-item sm:block sm:mb-1">Created with <a href="{{creator_info.link}}" target="_blank">{{creator_info.text}}</a></span> <span class="cf-footer-item sm:block sm:mb-1">Created with <a href="{{creator_info.link}}" target="_blank">{{creator_info.text}}</a></span>
{% endif %} {% endif %}