From 36cc47e40da54211275eab27a781bb5b126a030e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89loi=20Rivard?= <eloi.rivard@nubla.fr>
Date: Thu, 9 Mar 2023 17:45:20 +0100
Subject: [PATCH] Moved jinja macros in their own directory

---
 canaille/templates/about.html                         | 2 +-
 canaille/templates/firstlogin.html                    | 2 +-
 canaille/templates/forgotten-password.html            | 2 +-
 canaille/templates/group.html                         | 2 +-
 canaille/templates/invite.html                        | 2 +-
 canaille/templates/login.html                         | 4 ++--
 canaille/templates/{flask.j2 => macro/flask.html}     | 6 +++---
 canaille/templates/{ => macro}/fomanticui.html        | 0
 canaille/templates/mail/admin.html                    | 2 +-
 canaille/templates/oidc/admin/authorization_view.html | 2 +-
 canaille/templates/oidc/admin/client_add.html         | 2 +-
 canaille/templates/oidc/admin/client_edit.html        | 2 +-
 canaille/templates/oidc/admin/token_view.html         | 2 +-
 canaille/templates/oidc/user/logout.html              | 2 +-
 canaille/templates/password.html                      | 4 ++--
 canaille/templates/profile.html                       | 2 +-
 canaille/templates/reset-password.html                | 2 +-
 canaille/themes/default/base.html                     | 2 +-
 tests/fixtures/themes/test/base.html                  | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)
 rename canaille/templates/{flask.j2 => macro/flask.html} (65%)
 rename canaille/templates/{ => macro}/fomanticui.html (100%)

diff --git a/canaille/templates/about.html b/canaille/templates/about.html
index 86b89491..52b071a2 100644
--- a/canaille/templates/about.html
+++ b/canaille/templates/about.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block content %}
     <div class="ui clearing segment">
diff --git a/canaille/templates/firstlogin.html b/canaille/templates/firstlogin.html
index eb56001f..b4a16d1e 100644
--- a/canaille/templates/firstlogin.html
+++ b/canaille/templates/firstlogin.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block content %}
     <div class="loginform">
diff --git a/canaille/templates/forgotten-password.html b/canaille/templates/forgotten-password.html
index 613453ff..66191c71 100644
--- a/canaille/templates/forgotten-password.html
+++ b/canaille/templates/forgotten-password.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block content %}
     <div class="loginform">
diff --git a/canaille/templates/group.html b/canaille/templates/group.html
index 508aef33..bc139bfd 100644
--- a/canaille/templates/group.html
+++ b/canaille/templates/group.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 {% import 'userlist.html' as user_list %}
 
 {% block style %}
diff --git a/canaille/templates/invite.html b/canaille/templates/invite.html
index 62b9645e..d1a7a8fa 100644
--- a/canaille/templates/invite.html
+++ b/canaille/templates/invite.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as fui %}
+{% import 'macro/fomanticui.html' as fui %}
 
 {% block script %}
     <script src="/static/js/copy.js"></script>
diff --git a/canaille/templates/login.html b/canaille/templates/login.html
index 586a9dca..8cba6e07 100644
--- a/canaille/templates/login.html
+++ b/canaille/templates/login.html
@@ -1,6 +1,6 @@
 {% extends theme('base.html') %}
-{% import 'flask.j2' as flask %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/flask.html' as flask %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block container %}
     <div class="ui container">
diff --git a/canaille/templates/flask.j2 b/canaille/templates/macro/flask.html
similarity index 65%
rename from canaille/templates/flask.j2
rename to canaille/templates/macro/flask.html
index 3fb33517..568c46f1 100644
--- a/canaille/templates/flask.j2
+++ b/canaille/templates/macro/flask.html
@@ -1,9 +1,9 @@
 {% macro messages() %}
     {% with messages = get_flashed_messages(with_categories=true) %}
         {% for category, message in messages %}
-        <div class="ui message {{ category }}">
-            {{ message }}
-        </div>
+            <div class="ui message {{ category }}">
+                {{ message }}
+            </div>
         {% endfor %}
     {% endwith %}
 {% endmacro %}
diff --git a/canaille/templates/fomanticui.html b/canaille/templates/macro/fomanticui.html
similarity index 100%
rename from canaille/templates/fomanticui.html
rename to canaille/templates/macro/fomanticui.html
diff --git a/canaille/templates/mail/admin.html b/canaille/templates/mail/admin.html
index 96dcd669..a21ba84b 100644
--- a/canaille/templates/mail/admin.html
+++ b/canaille/templates/mail/admin.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block content %}
     <div class="ui segment">
diff --git a/canaille/templates/oidc/admin/authorization_view.html b/canaille/templates/oidc/admin/authorization_view.html
index b0fc4c91..b411a664 100644
--- a/canaille/templates/oidc/admin/authorization_view.html
+++ b/canaille/templates/oidc/admin/authorization_view.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block content %}
     <div class="loginform">
diff --git a/canaille/templates/oidc/admin/client_add.html b/canaille/templates/oidc/admin/client_add.html
index cb28d3a4..baed8242 100644
--- a/canaille/templates/oidc/admin/client_add.html
+++ b/canaille/templates/oidc/admin/client_add.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block content %}
     <div class="loginform">
diff --git a/canaille/templates/oidc/admin/client_edit.html b/canaille/templates/oidc/admin/client_edit.html
index 2fb58721..dd8c85b6 100644
--- a/canaille/templates/oidc/admin/client_edit.html
+++ b/canaille/templates/oidc/admin/client_edit.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block script %}
     <script src="/static/js/admin/client_edit.js"></script>
diff --git a/canaille/templates/oidc/admin/token_view.html b/canaille/templates/oidc/admin/token_view.html
index 67fac098..e42456b8 100644
--- a/canaille/templates/oidc/admin/token_view.html
+++ b/canaille/templates/oidc/admin/token_view.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block script %}
     <script src="/static/js/confirm.js"></script>
diff --git a/canaille/templates/oidc/user/logout.html b/canaille/templates/oidc/user/logout.html
index f41fbc2f..524874ab 100644
--- a/canaille/templates/oidc/user/logout.html
+++ b/canaille/templates/oidc/user/logout.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block content %}
     <div class="ui segment">
diff --git a/canaille/templates/password.html b/canaille/templates/password.html
index 320dabf9..f4b39efb 100644
--- a/canaille/templates/password.html
+++ b/canaille/templates/password.html
@@ -1,6 +1,6 @@
 {% extends theme('base.html') %}
-{% import 'flask.j2' as flask %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/flask.html' as flask %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block container %}
     <div class="ui container">
diff --git a/canaille/templates/profile.html b/canaille/templates/profile.html
index 854404d6..3d3c29d0 100644
--- a/canaille/templates/profile.html
+++ b/canaille/templates/profile.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block script %}
     <script src="/static/js/confirm.js"></script>
diff --git a/canaille/templates/reset-password.html b/canaille/templates/reset-password.html
index cacd22cc..5cbebacc 100644
--- a/canaille/templates/reset-password.html
+++ b/canaille/templates/reset-password.html
@@ -1,5 +1,5 @@
 {% extends theme('base.html') %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block content %}
     <div class="loginform">
diff --git a/canaille/themes/default/base.html b/canaille/themes/default/base.html
index 679d8b5e..a3fd91b5 100644
--- a/canaille/themes/default/base.html
+++ b/canaille/themes/default/base.html
@@ -1,4 +1,4 @@
-{% import 'flask.j2' as flask %}
+{% import 'macro/flask.html' as flask %}
 
 <!doctype html>
 <html lang="{{ locale }}">
diff --git a/tests/fixtures/themes/test/base.html b/tests/fixtures/themes/test/base.html
index 215f3fca..05c25ace 100644
--- a/tests/fixtures/themes/test/base.html
+++ b/tests/fixtures/themes/test/base.html
@@ -1,4 +1,4 @@
-{% import 'flask.j2' as flask %}
+{% import 'macro/flask.html' as flask %}
 
 <!doctype html>
 <html lang="fr">