This is an automated email from the ASF dual-hosted git repository.
wave pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/main by this push:
new 3ed3ab8 Cleanup titles and content description metadata (#396)
3ed3ab8 is described below
commit 3ed3ab84b98a90a8ad749fab57160b1b6abf21ed
Author: Dave Fisher <[email protected]>
AuthorDate: Mon Dec 8 10:36:17 2025 -0800
Cleanup titles and content description metadata (#396)
* Add a couple of simple public route tests
* Fix titles and descriptions
* Clean up for djlint
* djlint comments
* Revert "Add a couple of simple public route tests"
This reverts commit 2a3873aea4a3894539481990265abc479a4eb5b6.
* djlint comments still required due to bug
---------
Co-authored-by: Sean B. Palmer <[email protected]>
---
atr/templates/about.html | 8 +++++---
atr/templates/blank.html | 10 ++++------
atr/templates/check-selected.html | 10 ++++------
atr/templates/committee-directory.html | 10 ++++------
atr/templates/committee-view.html | 10 ++++------
atr/templates/delete-committee-keys.html | 8 +++++---
atr/templates/download-all.html | 10 ++++------
atr/templates/draft-tools.html | 10 ++++------
atr/templates/error.html | 10 ++++------
atr/templates/index-committer.html | 8 +++++---
atr/templates/index-public.html | 8 +++++---
atr/templates/layouts/base.html | 5 +----
atr/templates/notfound.html | 10 ++++------
atr/templates/project-select.html | 8 +++++---
atr/templates/projects.html | 10 ++++------
atr/templates/release-select.html | 8 +++++---
atr/templates/releases-finished.html | 10 ++++------
atr/templates/releases.html | 10 ++++------
atr/templates/report-selected-path.html | 10 ++++------
atr/templates/resolve-tabulated.html | 10 ++++------
atr/templates/tutorial.html | 25 +++++++++++++------------
21 files changed, 96 insertions(+), 112 deletions(-)
diff --git a/atr/templates/about.html b/atr/templates/about.html
index 8944b16..3e11f82 100644
--- a/atr/templates/about.html
+++ b/atr/templates/about.html
@@ -1,8 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- About ATR ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}About ATR ~ ATR{%- endblock title -%}
+
+{%- block description -%}About ATR ~ ATR{%- endblock description -%}
+{# djlint:on #}
{% block stylesheets %}
{{ super() }}
diff --git a/atr/templates/blank.html b/atr/templates/blank.html
index 2f6ca90..68d47d6 100644
--- a/atr/templates/blank.html
+++ b/atr/templates/blank.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- {{ title }} ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}{{ title }} ~ ATR{%- endblock title -%}
-{% block description %}
- {{ description }}
-{% endblock description %}
+{%- block description -%}{{ description }}{%- endblock description -%}
+{# djlint:on #}
{% block content %}
{{ content }}
diff --git a/atr/templates/check-selected.html
b/atr/templates/check-selected.html
index 7448666..49959dd 100644
--- a/atr/templates/check-selected.html
+++ b/atr/templates/check-selected.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- {{ release.project.display_name }} {{ version_name }} ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}{{ release.project.display_name }} {{ version_name }} ~
ATR{%- endblock title -%}
-{% block description %}
- Review page for the {{ release.project.display_name }} {{ version_name }}
candidate.
-{% endblock description %}
+{%- block description -%}Review page for the {{ release.project.display_name
}} {{ version_name }} candidate{%- endblock description -%}
+{# djlint:on #}
{% import 'macros/dialog.html' as dialog %}
diff --git a/atr/templates/committee-directory.html
b/atr/templates/committee-directory.html
index f5d2f84..81157ae 100644
--- a/atr/templates/committee-directory.html
+++ b/atr/templates/committee-directory.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Committee directory ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Committee directory ~ ATR{%- endblock title -%}
-{% block description %}
- List of all ASF committees and their associated projects.
-{% endblock description %}
+{%- block description -%}List of all ASF committees and their assated
projects.{%- endblock description -%}
+{# djlint:on #}
{% block stylesheets %}
{{ super() }}
diff --git a/atr/templates/committee-view.html
b/atr/templates/committee-view.html
index b03fd98..1319d3b 100644
--- a/atr/templates/committee-view.html
+++ b/atr/templates/committee-view.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Committee ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Committee ~ ATR{%- endblock title -%}
-{% block description %}
- Information regarding an Apache Committee.
-{% endblock description %}
+{%- block description -%}Information regarding an Apachommittee.{%- endblock
description -%}
+{# djlint:on #}
{% block content %}
<h1>{{ committee.display_name }}</h1>
diff --git a/atr/templates/delete-committee-keys.html
b/atr/templates/delete-committee-keys.html
index 2114c86..f16938b 100644
--- a/atr/templates/delete-committee-keys.html
+++ b/atr/templates/delete-committee-keys.html
@@ -2,9 +2,11 @@
{% import "macros/forms.html" as forms %}
-{% block title %}
- Delete committee keys
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Delete committee keys{%- endblock title -%}
+
+{%- block description -%}Delete committee keys{%- endblock description -%}
+{# djlint:on #}
{% block content %}
<div class="container mx-auto p-4">
diff --git a/atr/templates/download-all.html b/atr/templates/download-all.html
index f8f1976..b91d6ca 100644
--- a/atr/templates/download-all.html
+++ b/atr/templates/download-all.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Download {{ release.project.display_name }} {{ release.version }} ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Download {{ release.project.display_name }} {{
release.version }} ~ ATR{%- endblock title -%}
-{% block description %}
- Download commands for {{ release.project.display_name }} {{ release.version
}}.
-{% endblock description %}
+{%- block description -%}Download commands for {{ release.project.display_name
}} {{ release.version }}.{%- endblock description -%}
+{# djlint:on #}
{% block content %}
{% set phase = release.phase.value %}
diff --git a/atr/templates/draft-tools.html b/atr/templates/draft-tools.html
index a7607da..ad645f9 100644
--- a/atr/templates/draft-tools.html
+++ b/atr/templates/draft-tools.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- File tools ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}File tools ~ ATR{%- endblock title -%}
-{% block description %}
- Manage a file in the candidate draft using tools.
-{% endblock description %}
+{%- block description -%}Manage a file in the candidate draft using tools.{%-
endblock description -%}
+{# djlint:on #}
{% block content %}
<a href="{{ as_url(get.compose.selected, project_name=project_name,
version_name=version_name) }}"
diff --git a/atr/templates/error.html b/atr/templates/error.html
index ba6d8ca..8602be6 100644
--- a/atr/templates/error.html
+++ b/atr/templates/error.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Error ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Error ~ ATR{%- endblock title -%}
-{% block description %}
- An error occurred while processing your request.
-{% endblock description %}
+{%- block description -%}An error occurred while processing your request.{%-
endblock description -%}
+{# djlint:on #}
{% block content %}
<div>
diff --git a/atr/templates/index-committer.html
b/atr/templates/index-committer.html
index e2e1030..2a5d3df 100644
--- a/atr/templates/index-committer.html
+++ b/atr/templates/index-committer.html
@@ -1,8 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Select a release ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Select a release ~ ATR{%- endblock title -%}
+
+{%- block description -%}Select a release ~ ATR{%- endblock description -%}
+{# djlint:on #}
{% block stylesheets %}
{{ super() }}
diff --git a/atr/templates/index-public.html b/atr/templates/index-public.html
index 4a46a74..fee83ce 100644
--- a/atr/templates/index-public.html
+++ b/atr/templates/index-public.html
@@ -1,8 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Apache Trusted Releases
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Apache Trusted Releases{%- endblock title -%}
+
+{%- block description -%}Apache Trusted Releases{%- endblock description -%}
+{# djlint:on #}
{% block content %}
<h1>Apache Trusted Releases</h1>
diff --git a/atr/templates/layouts/base.html b/atr/templates/layouts/base.html
index 53e03b6..1644b4f 100644
--- a/atr/templates/layouts/base.html
+++ b/atr/templates/layouts/base.html
@@ -5,10 +5,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<meta name="description"
content="{%- block description -%}{%- endblock description -%}" />
- <title>
- {% block title %}
- {% endblock title %}
- </title>
+ <title>{%- block title -%}{%- endblock title -%}</title>
<link rel="icon"
type="image/x-icon"
diff --git a/atr/templates/notfound.html b/atr/templates/notfound.html
index 3e1dde7..92425ca 100644
--- a/atr/templates/notfound.html
+++ b/atr/templates/notfound.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- 404 ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}404 ~ ATR{%- endblock title -%}
-{% block description %}
- An error occurred while processing your request.
-{% endblock description %}
+{%- block description -%}An error occurred while cessing your request.{%-
endblock description -%}
+{# djlint:on #}
{% block content %}
<div>
diff --git a/atr/templates/project-select.html
b/atr/templates/project-select.html
index 5830db9..5ba0c4b 100644
--- a/atr/templates/project-select.html
+++ b/atr/templates/project-select.html
@@ -1,8 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Select a project ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Select a project ~ ATR{%- endblock title -%}
+
+{%- block description -%}Select a project ~ ATR{%- endblock description -%}
+{# djlint:on #}
{% block content %}
diff --git a/atr/templates/projects.html b/atr/templates/projects.html
index b59156c..38aeea4 100644
--- a/atr/templates/projects.html
+++ b/atr/templates/projects.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Projects ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Projects ~ ATR{%- endblock title -%}
-{% block description %}
- Directory of current ASF projects and their releases.
-{% endblock description %}
+{%- block description -%}Directory of current ASF projs and their releases.{%-
endblock description -%}
+{# djlint:on #}
{% block content %}
<h1>Projects</h1>
diff --git a/atr/templates/release-select.html
b/atr/templates/release-select.html
index 111f24f..2793894 100644
--- a/atr/templates/release-select.html
+++ b/atr/templates/release-select.html
@@ -1,8 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Select a release of {{ project.display_name }} ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Select a release of {{ project.display_name }} ~ ATR{%-
endblock title -%}
+
+{%- block description -%}Select a release of {{ project.display_name }} ~
ATR{%- endblock description -%}
+{# djlint:on #}
{% block content %}
<p class="atr-breadcrumbs">
diff --git a/atr/templates/releases-finished.html
b/atr/templates/releases-finished.html
index bc63ca5..ecf202f 100644
--- a/atr/templates/releases-finished.html
+++ b/atr/templates/releases-finished.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Releases of {{ project.display_name }} ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Releases of {{ project.display_name }} ~ ATR{%- endblock
title -%}
-{% block description %}
- All of the finished releases of {{ project.display_name }} on ATR.
-{% endblock description %}
+{%- block description -%}All of the finished releases of {{
project.display_name }} ATR.{%- endblock description -%}
+{# djlint:on #}
{% block content %}
<p>
diff --git a/atr/templates/releases.html b/atr/templates/releases.html
index 2a09235..ec95042 100644
--- a/atr/templates/releases.html
+++ b/atr/templates/releases.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Releases ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Releases ~ ATR{%- endblock title -%}
-{% block description %}
- Review public releases.
-{% endblock description %}
+{%- block description -%}Review public releases.{%- endblock description -%}
+{# djlint:on #}
{% block stylesheets %}
{{ super() }}
diff --git a/atr/templates/report-selected-path.html
b/atr/templates/report-selected-path.html
index a8db765..4bce635 100644
--- a/atr/templates/report-selected-path.html
+++ b/atr/templates/report-selected-path.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Report for {{ release.short_display_name }} {{ package.filename }} ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Report for {{ release.short_display_name }} {{
package.filename }} ~ ATR{%- endblock title -%}
-{% block description %}
- Show the report for the {{ release.short_display_name }} {{ package.filename
}} candidate draft file.
-{% endblock description %}
+{%- block description -%}Show the report for the {{ release.short_display_name
}} {{ package.filename }} candidate draft file.{%- endblock description -%}
+{# djlint:on #}
{% block stylesheets %}
{{ super() }}
diff --git a/atr/templates/resolve-tabulated.html
b/atr/templates/resolve-tabulated.html
index 3ce069c..a998786 100644
--- a/atr/templates/resolve-tabulated.html
+++ b/atr/templates/resolve-tabulated.html
@@ -1,12 +1,10 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Resolve vote ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block title -%}Resolve vote ~ ATR{%- endblock title -%}
-{% block description %}
- Resolve vote for a release.
-{% endblock description %}
+{%- block description -%}Resolve vote for a release.{%- endblock description
-%}
+{# djlint:on #}
{% block content %}
<p>
diff --git a/atr/templates/tutorial.html b/atr/templates/tutorial.html
index f52ad64..a5a16af 100644
--- a/atr/templates/tutorial.html
+++ b/atr/templates/tutorial.html
@@ -1,19 +1,20 @@
{% extends "layouts/base.html" %}
-{% block title %}
- Tutorial for release managers ~ ATR
-{% endblock title %}
+{# djlint:off #}
+{%- block description -%}Tutorial for release managers ~ ATR{%- endblock
description -%}
+
+{%- block title -%}Tutorial for release managers ~ ATR{%- endblock title -%}
+{# djlint:on #}
{% block stylesheets %}
- {{ super() }}
- <style>
- img {
- border: 1px solid #cccccc;
- box-shadow: 0 0 1rem rgba(0, 0, 0, 0.2);
- margin: 1rem 0;
- max-width: 50%;
- }
- </style>
+ {{ super() }}<style>
+ img {
+ border: 1px < !-- djlint:on -->solid #cccccc;
+ box-shadow: 0 0 1rem rgba(0, 0, 0, 0.2);
+ margin: 1rem 0;
+ max-width: 50%;
+ }
+</style>
{% endblock stylesheets %}
{% block content %}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
