From bb6edca9435a9d65deeb4577b448dc1f271ea4df Mon Sep 17 00:00:00 2001 From: Mo8it Date: Sat, 19 Mar 2022 22:21:45 +0100 Subject: [PATCH] Indent templates --- advlabdb/templates/admin_create.html | 4 +-- advlabdb/templates/admin_details.html | 4 +-- advlabdb/templates/admin_edit.html | 4 +-- advlabdb/templates/admin_index.html | 8 +++--- advlabdb/templates/admin_list.html | 4 +-- advlabdb/templates/assistant_create.html | 6 ++--- advlabdb/templates/assistant_details.html | 4 +-- advlabdb/templates/assistant_edit.html | 4 +-- advlabdb/templates/assistant_index.html | 8 +++--- advlabdb/templates/assistant_list.html | 4 +-- advlabdb/templates/import.html | 32 +++++++++++------------ advlabdb/templates/macros.html | 22 ++++++++-------- 12 files changed, 52 insertions(+), 52 deletions(-) diff --git a/advlabdb/templates/admin_create.html b/advlabdb/templates/admin_create.html index 2c0c31a..2d9ac8f 100644 --- a/advlabdb/templates/admin_create.html +++ b/advlabdb/templates/admin_create.html @@ -2,6 +2,6 @@ {% extends "admin/model/create.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="admin")}} -{{ super() }} + {{information(current_user, userActiveSemester, role="admin")}} + {{ super() }} {% endblock %} \ No newline at end of file diff --git a/advlabdb/templates/admin_details.html b/advlabdb/templates/admin_details.html index ffede7b..3119844 100644 --- a/advlabdb/templates/admin_details.html +++ b/advlabdb/templates/admin_details.html @@ -2,6 +2,6 @@ {% extends "admin/model/details.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="admin")}} -{{ super() }} + {{information(current_user, userActiveSemester, role="admin")}} + {{ super() }} {% endblock %} \ No newline at end of file diff --git a/advlabdb/templates/admin_edit.html b/advlabdb/templates/admin_edit.html index 62d4d34..44b0d74 100644 --- a/advlabdb/templates/admin_edit.html +++ b/advlabdb/templates/admin_edit.html @@ -2,6 +2,6 @@ {% extends "admin/model/edit.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="admin")}} -{{ super() }} + {{information(current_user, userActiveSemester, role="admin")}} + {{ super() }} {% endblock %} \ No newline at end of file diff --git a/advlabdb/templates/admin_index.html b/advlabdb/templates/admin_index.html index d96fa6e..3e04a7c 100644 --- a/advlabdb/templates/admin_index.html +++ b/advlabdb/templates/admin_index.html @@ -2,11 +2,11 @@ {% extends "admin/index.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="admin")}} + {{information(current_user, userActiveSemester, role="admin")}} -
+
-{{missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks)}} + {{missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks)}} -{{ super() }} + {{ super() }} {% endblock %} \ No newline at end of file diff --git a/advlabdb/templates/admin_list.html b/advlabdb/templates/admin_list.html index a71b7ee..fc60f63 100644 --- a/advlabdb/templates/admin_list.html +++ b/advlabdb/templates/admin_list.html @@ -2,6 +2,6 @@ {% extends "admin/model/list.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="admin")}} -{{ super() }} + {{information(current_user, userActiveSemester, role="admin")}} + {{ super() }} {% endblock %} \ No newline at end of file diff --git a/advlabdb/templates/assistant_create.html b/advlabdb/templates/assistant_create.html index c5804d5..458f081 100644 --- a/advlabdb/templates/assistant_create.html +++ b/advlabdb/templates/assistant_create.html @@ -2,6 +2,6 @@ {% extends "admin/model/create.html" %} {% block body %} -{{ information(current_user, userActiveSemester, role="assistant") }} -{{ super() }} -{% endblock %} \ No newline at end of file + {{information(current_user, userActiveSemester, role="assistant")}} + {{ super() }} +{% endblock %} diff --git a/advlabdb/templates/assistant_details.html b/advlabdb/templates/assistant_details.html index 111f0ab..68a4f72 100644 --- a/advlabdb/templates/assistant_details.html +++ b/advlabdb/templates/assistant_details.html @@ -2,6 +2,6 @@ {% extends "admin/model/details.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="assistant")}} -{{ super() }} + {{information(current_user, userActiveSemester, role="assistant")}} + {{ super() }} {% endblock %} \ No newline at end of file diff --git a/advlabdb/templates/assistant_edit.html b/advlabdb/templates/assistant_edit.html index 1ec0883..ad9da0b 100644 --- a/advlabdb/templates/assistant_edit.html +++ b/advlabdb/templates/assistant_edit.html @@ -2,6 +2,6 @@ {% extends "admin/model/edit.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="assistant")}} -{{ super() }} + {{information(current_user, userActiveSemester, role="assistant")}} + {{ super() }} {% endblock %} \ No newline at end of file diff --git a/advlabdb/templates/assistant_index.html b/advlabdb/templates/assistant_index.html index 2ff4e5b..c83ee0d 100644 --- a/advlabdb/templates/assistant_index.html +++ b/advlabdb/templates/assistant_index.html @@ -2,11 +2,11 @@ {% extends "admin/index.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="assistant")}} + {{information(current_user, userActiveSemester, role="assistant")}} -
+
-{{missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks)}} + {{missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks)}} -{{ super() }} + {{ super() }} {% endblock %} \ No newline at end of file diff --git a/advlabdb/templates/assistant_list.html b/advlabdb/templates/assistant_list.html index f201bca..8538642 100644 --- a/advlabdb/templates/assistant_list.html +++ b/advlabdb/templates/assistant_list.html @@ -2,6 +2,6 @@ {% extends "admin/model/list.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="assistant")}} -{{ super() }} + {{information(current_user, userActiveSemester, role="assistant")}} + {{ super() }} {% endblock %} \ No newline at end of file diff --git a/advlabdb/templates/import.html b/advlabdb/templates/import.html index 2185e82..7c5ebd6 100644 --- a/advlabdb/templates/import.html +++ b/advlabdb/templates/import.html @@ -2,21 +2,21 @@ {% extends "admin/master.html" %} {% block body %} -{{information(current_user, userActiveSemester, role="admin")}} + {{information(current_user, userActiveSemester, role="admin")}} -{% for error in form.file.errors %} -
- Error! {{ error }} -
-{% endfor %} + {% for error in form.file.errors %} +
+ Error! {{ error }} +
+ {% endfor %} -
- {{ form.csrf_token }} - {{ form.file.label }} - {{ form.file }} - -
-
- {{ form.file.description }} -
-{% endblock body %} \ No newline at end of file +
+ {{ form.csrf_token }} + {{ form.file.label }} + {{ form.file }} + +
+
+ {{ form.file.description }} +
+{% endblock body %} diff --git a/advlabdb/templates/macros.html b/advlabdb/templates/macros.html index fc5ebc2..9a8c87a 100644 --- a/advlabdb/templates/macros.html +++ b/advlabdb/templates/macros.html @@ -1,18 +1,18 @@ {% macro information(current_user, userActiveSemester, role) %} -User: {{ current_user.repr() }} + User: {{ current_user.repr() }} -| Active semester: {{ userActiveSemester(flashWarning=True).repr() }} + | Active semester: {{ userActiveSemester(flashWarning=True).repr() }} -{% if (role == "admin") and (current_user.has_role("assistant")) %} -| Assistant space. -{% elif (role == "assistant") and (current_user.has_role("admin")) %} -| Admin space. -{% endif %} + {% if (role == "admin") and (current_user.has_role("assistant")) %} + | Assistant space. + {% elif (role == "assistant") and (current_user.has_role("admin")) %} + | Admin space. + {% endif %} {% endmacro %} {% macro missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks) %} -

- Number of missing final experiment marks: - {{ number_of_missing_final_experiment_marks }} / {{ number_of_all_experiment_marks }} -

+

+ Number of missing final experiment marks: + {{ number_of_missing_final_experiment_marks }} / {{ number_of_all_experiment_marks }} +

{% endmacro %} \ No newline at end of file