diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 476620a5e..4faee8674 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,12 +35,12 @@ repos: entry: cargo fmt pass_filenames: false - repo: https://github.com/instrumentl/pre-commit-just - rev: v0.1 + rev: v0.2 hooks: - id: format-justfile name: "format justfiles" - repo: https://github.com/djlint/djLint - rev: v1.36.4 + rev: v1.40.3 hooks: - id: djlint name: djLint diff --git a/cot/templates/admin/login.html b/cot/templates/admin/login.html index 26f425c3d..2de97857d 100644 --- a/cot/templates/admin/login.html +++ b/cot/templates/admin/login.html @@ -9,9 +9,7 @@
{% if form.has_errors() %} -
- {% for error in form.errors_for(FormErrorTarget::Form) %}{{ error }}{% endfor %} -
+
{% for error in form.errors_for(FormErrorTarget::Form) %}{{ error }}{% endfor %}
{% endif %}
diff --git a/cot/templates/error.html b/cot/templates/error.html index 53b7d5a07..de29258c7 100644 --- a/cot/templates/error.html +++ b/cot/templates/error.html @@ -9,27 +9,27 @@

- {% match kind %}{% when Kind::NotFound %}Not found - {% else %} - Cot failure{% endmatch %} -

-

- {% match kind %}{% when Kind::NotFound %}The URL requested could not be found.{% when Kind::Panic %}The request handler has panicked. - {% else %} - An error occurred while handling a request.{% endmatch %} -

- {% match kind %} - {% when Kind::Panic %} -

Panic data

- {% match panic_string %}{% when Some with (panic_string) %}
{{ panic_string }}
+ {% match kind %}{% when Kind::NotFound %}Not found {% else %} - Panic payload unavailable or not a string.{% endmatch %} - {% match panic_location %}{% when Some with (panic_location) %} -

- at {{ panic_location }} -

- {% else %} - {% endmatch %} + Cot failure{% endmatch %} + +

+ {% match kind %}{% when Kind::NotFound %}The URL requested could not be found.{% when Kind::Panic %}The request handler has panicked. +{% else %} + An error occurred while handling a request.{% endmatch %} +

+{% match kind %} +{% when Kind::Panic %} +

Panic data

+{% match panic_string %}{% when Some with (panic_string) %}
{{ panic_string }}
+{% else %} +Panic payload unavailable or not a string.{% endmatch %} +{% match panic_location %}{% when Some with (panic_location) %} +

+ at {{ panic_location }} +

+{% else %} +{% endmatch %} {% else %} {% endmatch %} {% if let Some(error_message) = error_message %}