This is an automated email from the ASF dual-hosted git repository. wave pushed a commit to branch fix-metadata in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
commit b56b1e7daeffc44ed97b024594d074a3bc35bd42 Author: Dave Fisher <[email protected]> AuthorDate: Sun Dec 7 19:10:03 2025 -0800 Clean up for djlint --- .djlint.json | 14 ++++++++++++++ atr/templates/about.html | 3 +-- atr/templates/blank.html | 2 -- atr/templates/check-selected.html | 2 -- atr/templates/committee-directory.html | 5 +---- atr/templates/committee-view.html | 2 -- atr/templates/delete-committee-keys.html | 2 -- atr/templates/download-all.html | 2 -- atr/templates/draft-tools.html | 2 -- atr/templates/error.html | 2 -- atr/templates/index-committer.html | 4 +--- atr/templates/index-public.html | 2 -- atr/templates/layouts/base.html | 2 -- atr/templates/notfound.html | 4 +--- atr/templates/project-select.html | 2 -- atr/templates/projects.html | 2 -- atr/templates/release-select.html | 2 -- atr/templates/releases-finished.html | 5 +---- atr/templates/releases.html | 2 -- atr/templates/report-selected-path.html | 2 -- atr/templates/resolve-tabulated.html | 2 -- atr/templates/tutorial.html | 23 ++++++++++++----------- 22 files changed, 31 insertions(+), 57 deletions(-) diff --git a/.djlint.json b/.djlint.json new file mode 100644 index 0000000..e466f10 --- /dev/null +++ b/.djlint.json @@ -0,0 +1,14 @@ +{ + "profile": "jinja", + "ignore_rechecks": [ + { + "regex": "{% block title %}[\\s\\S]*?{% endblock title %}", + }, + { + "regex": "{% block desccription %}[\\s\\S]*?{% endblock description %}" + }, + { + "regex": "{% block desccription %}{% endblock description %}" + }, + ] +} diff --git a/atr/templates/about.html b/atr/templates/about.html index ba0a292..d86c61b 100644 --- a/atr/templates/about.html +++ b/atr/templates/about.html @@ -1,10 +1,9 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}About ATR ~ ATR{% endblock title %} {% block description %}About ATR ~ ATR{% endblock description %} -<!-- djlint:on --> + {% block stylesheets %} {{ super() }} <style> diff --git a/atr/templates/blank.html b/atr/templates/blank.html index de95e97..bec6548 100644 --- a/atr/templates/blank.html +++ b/atr/templates/blank.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}{{ title }} ~ ATR{% endblock title %} {% 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 650c34b..a1b8e6c 100644 --- a/atr/templates/check-selected.html +++ b/atr/templates/check-selected.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- 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 %} -<!-- djlint:on --> {% import 'macros/dialog.html' as dialog %} diff --git a/atr/templates/committee-directory.html b/atr/templates/committee-directory.html index fb021dc..d02b05b 100644 --- a/atr/templates/committee-directory.html +++ b/atr/templates/committee-directory.html @@ -1,11 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}Committee directory ~ ATR{% endblock title %} -{% block description %} - List of all ASF committees and their assated projects.{% endblock description %} -<!-- djlint:on --> +{% block description %}List of all ASF committees and their assated projects.{% endblock description %} {% block stylesheets %} {{ super() }} diff --git a/atr/templates/committee-view.html b/atr/templates/committee-view.html index 530ccb0..6f56006 100644 --- a/atr/templates/committee-view.html +++ b/atr/templates/committee-view.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}Committee ~ ATR{% endblock title %} {% 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 a5ee99c..420e9fa 100644 --- a/atr/templates/delete-committee-keys.html +++ b/atr/templates/delete-committee-keys.html @@ -2,11 +2,9 @@ {% import "macros/forms.html" as forms %} -<!-- 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 d54ac43..371eecc 100644 --- a/atr/templates/download-all.html +++ b/atr/templates/download-all.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- 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 %} -<!-- djlint:on --> {% block content %} {% set phase = release.phase.value %} diff --git a/atr/templates/draft-tools.html b/atr/templates/draft-tools.html index 15b1a6c..808dff8 100644 --- a/atr/templates/draft-tools.html +++ b/atr/templates/draft-tools.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}File tools ~ ATR{% endblock title %} {% 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 d8ca5ce..ab1976a 100644 --- a/atr/templates/error.html +++ b/atr/templates/error.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}Error ~ ATR{% endblock title %} {% 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 49c5a78..17bbee6 100644 --- a/atr/templates/index-committer.html +++ b/atr/templates/index-committer.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}Select a release ~ ATR{% endblock title %} -{% block description %}Select a release ~ ATR{%endblock description %} -<!-- djlint:on --> +{% block description %}Select a release ~ ATR{% endblock description %} {% block stylesheets %} {{ super() }} diff --git a/atr/templates/index-public.html b/atr/templates/index-public.html index fc973fd..8411090 100644 --- a/atr/templates/index-public.html +++ b/atr/templates/index-public.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- 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 40ebb16..38e165d 100644 --- a/atr/templates/layouts/base.html +++ b/atr/templates/layouts/base.html @@ -5,9 +5,7 @@ <meta name="viewport" content="width=device-width,initial-scale=1.0" /> <meta name="description" content="{%- block description -%}{%- endblock description -%}" /> - <!-- djlint:off --> <title>{% block title %}{% endblock title %}</title> - <!-- djlint:on --> <link rel="icon" type="image/x-icon" diff --git a/atr/templates/notfound.html b/atr/templates/notfound.html index db9b131..655c1f9 100644 --- a/atr/templates/notfound.html +++ b/atr/templates/notfound.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}404 ~ ATR{% endblock title %} -{% block description %} An error occurred while cessing your request.{% endblock description %} -<!-- djlint:on --> +{% block description %}An error occurred while cessing your request.{% endblock description %} {% block content %} <div> diff --git a/atr/templates/project-select.html b/atr/templates/project-select.html index 97b8d99..09973aa 100644 --- a/atr/templates/project-select.html +++ b/atr/templates/project-select.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- 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 db0bb46..d70069f 100644 --- a/atr/templates/projects.html +++ b/atr/templates/projects.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}Projects ~ ATR{% endblock title %} {% 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 779ab67..b2b812c 100644 --- a/atr/templates/release-select.html +++ b/atr/templates/release-select.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- 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 1e29391..01e09fe 100644 --- a/atr/templates/releases-finished.html +++ b/atr/templates/releases-finished.html @@ -1,11 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}Releases of {{ project.display_name }} ~ ATR{% endblock title %} -{% block description %} -All of the finished releases of {{ project.display_name }} ATR.{% endblock description %} -<!-- djlint:on --> +{% block description %}All of the finished releases of {{ project.display_name }} ATR.{% endblock description %} {% block content %} <p> diff --git a/atr/templates/releases.html b/atr/templates/releases.html index a0b23d7..6ffebf7 100644 --- a/atr/templates/releases.html +++ b/atr/templates/releases.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}Releases ~ ATR{% endblock title %} {% 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 3d09792..48690b7 100644 --- a/atr/templates/report-selected-path.html +++ b/atr/templates/report-selected-path.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- 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 %} -<!-- djlint:off --> {% block stylesheets %} {{ super() }} diff --git a/atr/templates/resolve-tabulated.html b/atr/templates/resolve-tabulated.html index 83eb45d..a371f09 100644 --- a/atr/templates/resolve-tabulated.html +++ b/atr/templates/resolve-tabulated.html @@ -1,10 +1,8 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> {% block title %}Resolve vote ~ ATR{% endblock title %} {% 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 94e2642..0bdd362 100644 --- a/atr/templates/tutorial.html +++ b/atr/templates/tutorial.html @@ -1,19 +1,20 @@ {% extends "layouts/base.html" %} -<!-- djlint:off --> -{% block description %}Tutorial for release managers ~ ATR{% endblock description %} +{% 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 - <!-- djlint:on -->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]
