From ba72f1c845a8430b289fb8ac94f039c7c1a205c4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Feb 2021 17:58:18 +0000 Subject: templates: clean up HTML output The main issue was that the license header from the tree template was being repeated in the generated HTML every time it was included. Use an askama comment to avoid that. Additionally, reduce the amount of unnecessary whitespace generated a bit. --- templates/page.html | 26 +++++++++++++------------- templates/tree.html | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/templates/page.html b/templates/page.html index 715814a..d433e41 100644 --- a/templates/page.html +++ b/templates/page.html @@ -5,9 +5,9 @@ {% match pr_number %} - {% when Some with (pr_number) %} + {%- when Some with (pr_number) -%} Nixpkgs PR #{{ pr_number }} progress - {% else %} + {%- else -%} Nixpkgs PR progress tracker {% endmatch %} @@ -169,29 +169,29 @@ {% endmatch %} {% match pr_number %} - {% when Some with (pr_number) %} + {%- when Some with (pr_number) -%}
  1. - {% if closed %} + {%- if closed -%} ❌ - {% else %} + {%- else -%} ✅ - {% endif %} + {%- endif -%} PR #{{ pr_number }} - {% if closed %} + {%- if closed -%} closed - {% endif %} + {%- endif -%}
    2. {% match tree %} - {% when Some with (tree) %} - {{ tree|safe }} - {% else %} - {% endmatch %} + {%- when Some with (tree) -%} + {{- tree|safe -}} + {%- else -%} + {%- endmatch -%}
- {% else %} + {%- else -%} {% endmatch %}