🚨 — Improve djlint test and fix its warnings/errors

Makefile

@@ -21,7 +21,7 @@ cog: ## Run cog, to integrate the CLI options to the docs.
 tests: venv ## Run the tests
 	venv/bin/pytest
 djlint: venv ## Format the templates
-	venv/bin/djlint --ignore=H030,H031,H006 --lint argos/server/templates/*html
+	venv/bin/djlint --ignore=H030,H031,H006 --profile jinja --lint argos/server/templates/*html
 pylint: venv ## Runs pylint on the code
 	venv/bin/pylint argos
 lint: djlint pylint

argos/server/templates/agents.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}<h2>Agents</h2>{% endblock %}
+{% block title %}<h2>Agents</h2>{% endblock title %}
 {% block content %}
 <table role="grid">
     <thead>
@@ -17,4 +17,4 @@
         {% endfor %}
     </tbody>
 </table>
-{% endblock %}
+{% endblock content %}

argos/server/templates/base.html

@@ -52,11 +52,11 @@
         <main class="container">
             <div id="header">
                 {% block title %}
-                {% endblock %}
+                {% endblock title %}
             </div>
             <div id="content">
                 {% block content %}
-                {% endblock %}
+                {% endblock content %}
             </div>
         </main>
         <footer class="text-center">

argos/server/templates/domain.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}<h2>{{ domain }}</h2>{% endblock %}
+{% block title %}<h2>{{ domain }}</h2>{% endblock title %}
 {% block content %}
     <div id="domains" class="frame">
         <table id="domains-list" role="grid">
@@ -25,9 +25,9 @@
                        href="{{ url_for('get_result_view', result_id=task.last_result.id) }}">
                         {% if task.status == "success" %}
                             ✅ Success
-                        {% elif task.status == "error"%}
+                        {% elif task.status == "error" %}
                             ⚠ Error
-                        {% elif task.status == "failure"%}
+                        {% elif task.status == "failure" %}
                             ❌ Failure
                         {% elif task.status == "unknown" %}
                             ❔ Unknown
@@ -43,4 +43,4 @@
         </tbody>
         </table>
     </div>
-{% endblock %}
+{% endblock content %}

argos/server/templates/domains.html

@@ -1,11 +1,11 @@
 {% extends "base.html" %}
-{% block title %}<h2>Tasks list</h2>{% endblock %}
+{% block title %}<h2>Tasks list</h2>{% endblock title %}
 {% block content %}
     <div id="domains" class="frame">
         <nav>
             <ul>
                 <li>
-                    {{ domains | length}} domains,
+                    {{ domains | length }} domains,
                     {{ total_task_count }} tasks,
                     <a href="{{ url_for('get_agents_view') }}">
                         {{ agents | length }} agent{{ 's' if agents | length > 1 }}
@@ -45,9 +45,9 @@
                     <td class="status highlight">
                         {% if status == "ok" %}
                             ✅ OK
-                        {% elif status == "warning"%}
+                        {% elif status == "warning" %}
                             ⚠️ Warning
-                        {% elif status == "critical"%}
+                        {% elif status == "critical" %}
                             ❌ Critical
                         {% elif status == "unknown" %}
                             ❔ Unknown
@@ -76,4 +76,4 @@
             }
         });
     </script>
-{% endblock %}
+{% endblock content %}

argos/server/templates/index.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}<h2>Dashboard</h2>{% endblock %}
+{% block title %}<h2>Dashboard</h2>{% endblock title %}
 {% block content %}
     <div id="domains" class="frame">
 <<<<<<< HEAD
@@ -69,4 +69,4 @@
             </p>
         </div>
     </div>
-{% endblock %}
+{% endblock content %}

argos/server/templates/result.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}<h2>{{ result }}</h2>{% endblock %}
+{% block title %}<h2>{{ result }}</h2>{% endblock title %}
 {% block content %}
 <dl>
     <dt>Task</dt>
@@ -13,4 +13,4 @@
     <dt>Context</dt>
     <dd>{{ result.context }}</dd>
 </dl>
-{% endblock %}
+{% endblock content %}

argos/server/templates/results.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}<h2>{{ task }}</h2>{% endblock %}
+{% block title %}<h2>{{ task }}</h2>{% endblock title %}
 {% block content %}
 <code>{{ description }}</code>
 <table role="grid">
@@ -23,4 +23,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock content %}