Merge pull request #103 from GeriLife/add-djade-pre-commit

brylie · web-flow · commit 55a6aef307f8 · 2025-04-08T10:16:37.000+03:00
Refactor template block titles for consistency and clarity
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -54,3 +54,8 @@ repos:
     hooks:
       - id: keep-sorted
         exclude: ".*migrations/.*"
+  - repo: https://github.com/adamchainz/djade-pre-commit
+    rev: "1.3.2"
+    hooks:
+      - id: djade
+        args: [--target-version, "5.1"]
diff --git a/accounts/templates/registration/login.html b/accounts/templates/registration/login.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %}Log in{% endblock title %}
+{% block title %}Log in{% endblock %}
 
 {% block content %}
     <div class="card bg-base-100 shadow-xl max-w-md mx-auto">
diff --git a/accounts/templates/registration/signup.html b/accounts/templates/registration/signup.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %}{% translate "Sign up" %}{% endblock title %}
+{% block title %}{% translate "Sign up" %}{% endblock %}
 
 {% block content %}
     <div class="card bg-base-100 shadow-xl max-w-md mx-auto">
diff --git a/activities/templates/activities/list.html b/activities/templates/activities/list.html
@@ -27,4 +27,4 @@ <h1>Activities</h1>
             {% endfor %}
         </tbody>
     </table>
-{% endblock %}
+{% endblock content %}
diff --git a/activities/templates/activities/resident_activity_form.html b/activities/templates/activities/resident_activity_form.html
@@ -172,7 +172,7 @@ <h1 class="card-title text-2xl mb-4">{% translate "Create Resident Activity" %}<
             </form>
         </div>
     </div>
-{% endblock %}
+{% endblock content %}
 
 {% block extra_js %}
     <script src="https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.complete.min.js"></script>
diff --git a/activities/templates/activities/resident_activity_list.html b/activities/templates/activities/resident_activity_list.html
@@ -1,11 +1,10 @@
 {% extends "base.html" %}
 
-{% load i18n %}
-{% load l10n %}
+{% load i18n l10n %}
 
 {% block title %}
     {% translate "Activities" %}
-{% endblock %}
+{% endblock title %}
 
 {% block content %}
     <div class="flex justify-between items-center mb-6">
@@ -81,4 +80,4 @@ <h1 class="text-2xl font-bold">{% translate "Activities" %}</h1>
             {% endif %}
         </div>
     </div>
-{% endblock %}
+{% endblock content %}
diff --git a/common/templates/403.html b/common/templates/403.html
@@ -4,12 +4,12 @@
 
 {% block title %}
     {% translate "Forbidden" %}
-{% endblock %}
+{% endblock title %}
 
 {% block content %}
     <h1>
         {% translate "Forbidden" %}
     </h1>
 
     <p>{% translate "You do not have permission to access this page." %}</p>
-{% endblock %}
+{% endblock content %}
diff --git a/common/templates/base.html b/common/templates/base.html
@@ -6,13 +6,13 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>{% block title %}{% endblock title %}</title>
+    <title>{% block title %}{% endblock %}</title>
 
     {% tailwind_css %}
 
     <!-- extra CSS to load after primary CSS -->
     <link rel="stylesheet" href="{% static 'style.css' %}" />
-    {% block extra_css %}{% endblock extra_css %}
+    {% block extra_css %}{% endblock %}
   </head>
   <body>
     {% include "navigation.html" %} {% if messages %}
@@ -34,10 +34,10 @@
     {% endif %}
 
     <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
-      {% block content %} {% endblock content %}
+      {% block content %} {% endblock %}
     </div>
 
     <!-- extra JavaScript to load after other page elements -->
-    {% block extra_js %}{% endblock extra_js %}
+    {% block extra_js %}{% endblock %}
   </body>
 </html>
diff --git a/common/templates/home.html b/common/templates/home.html
@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% block title %}{% translate "Home" %}{% endblock title %}
+{% block title %}{% translate "Home" %}{% endblock %}
+
 {% block content %}
     <div class="card bg-base-100 shadow-xl">
         <div class="card-body">
diff --git a/homes/templates/homes/home_residents_activity_percents.html b/homes/templates/homes/home_residents_activity_percents.html
@@ -6,7 +6,7 @@
         <div
             class="h-full {% if item.activity_level_class == 'success' %}bg-success{% elif item.activity_level_class == 'warning' %}bg-warning{% elif item.activity_level_class == 'danger' %}bg-error{% else %}bg-info{% endif %}"
             style="width: {{ item.value|unlocalize }}%;"
-            aria-label="{{ item.activity_level_label }}: {{ item.value|floatformat:'0'}}%"
+            aria-label="{{ item.activity_level_label }}: {{ item.value|floatformat:'0' }}%"
             title="{{ item.activity_level_label }}: {{ item.value|floatformat:'0' }}%"></div>
     {% endfor %}
 </div>
diff --git a/work/templates/work/report.html b/work/templates/work/report.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 
-{% load i18n %}
-{% load static %}
+{% load i18n static %}
 
 {% block content %}
     <div class="card bg-base-100 shadow-xl mb-6">
