Moved jinja macros in their own directory

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">

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">

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">

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 %}

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>

canaille/templates/login.html

@@ -1,6 +1,6 @@
 {% extends theme('base.html') %}
-{% import 'flask.j2' as flask %}
+{% import 'macro/flask.html' as flask %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block container %}
     <div class="ui container">

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 }}">
+            <div class="ui message {{ category }}">
-            {{ message }}
+                {{ message }}
-        </div>
+            </div>
         {% endfor %}
     {% endwith %}
 {% endmacro %}

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">

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">

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">

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>

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>

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">

canaille/templates/password.html

@@ -1,6 +1,6 @@
 {% extends theme('base.html') %}
-{% import 'flask.j2' as flask %}
+{% import 'macro/flask.html' as flask %}
-{% import 'fomanticui.html' as sui %}
+{% import 'macro/fomanticui.html' as sui %}
 
 {% block container %}
     <div class="ui container">

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>

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">

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 }}">

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">