From 6e5074f8feec67facc5c157cefc8e27cdccd1581 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 24 Jan 2018 18:12:21 +0200 Subject: [PATCH] Rearrange html files to folders --- webapp/templates/{ => kaehmy}/kaehmy.html | 4 ++-- webapp/templates/{ => kaehmy}/kaehmy_base.html | 6 +++--- .../{ => kaehmy}/kaehmy_checkbox_option.html | 0 webapp/templates/{ => kaehmy}/kaehmy_error.html | 2 +- webapp/templates/{ => kaehmy}/kaehmy_export.html | 2 +- webapp/templates/{ => kaehmy}/kaehmy_footer.html | 0 webapp/templates/{ => kaehmy}/kaehmy_header.html | 0 webapp/templates/{ => kaehmy}/kaehmy_list.html | 6 +++--- .../templates/{ => kaehmy}/kaehmy_message.html | 2 +- .../{ => kaehmy}/kaehmy_navigation.html | 0 .../{ => kaehmy}/kaehmy_statistics.html | 4 ++-- webapp/templates/{ => ohlhafv}/ohlhafv.html | 0 webapp/templates/{ => ohlhafv}/ohlhafv_list.html | 0 webapp/views.py | 16 ++++++++-------- 14 files changed, 21 insertions(+), 21 deletions(-) rename webapp/templates/{ => kaehmy}/kaehmy.html (97%) rename webapp/templates/{ => kaehmy}/kaehmy_base.html (91%) rename webapp/templates/{ => kaehmy}/kaehmy_checkbox_option.html (100%) rename webapp/templates/{ => kaehmy}/kaehmy_error.html (89%) rename webapp/templates/{ => kaehmy}/kaehmy_export.html (92%) rename webapp/templates/{ => kaehmy}/kaehmy_footer.html (100%) rename webapp/templates/{ => kaehmy}/kaehmy_header.html (100%) rename webapp/templates/{ => kaehmy}/kaehmy_list.html (95%) rename webapp/templates/{ => kaehmy}/kaehmy_message.html (88%) rename webapp/templates/{ => kaehmy}/kaehmy_navigation.html (100%) rename webapp/templates/{ => kaehmy}/kaehmy_statistics.html (88%) rename webapp/templates/{ => ohlhafv}/ohlhafv.html (100%) rename webapp/templates/{ => ohlhafv}/ohlhafv_list.html (100%) diff --git a/webapp/templates/kaehmy.html b/webapp/templates/kaehmy/kaehmy.html similarity index 97% rename from webapp/templates/kaehmy.html rename to webapp/templates/kaehmy/kaehmy.html index e0f5a30..4e6d12e 100644 --- a/webapp/templates/kaehmy.html +++ b/webapp/templates/kaehmy/kaehmy.html @@ -1,10 +1,10 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load bootstrap3 %} {% load i18n %} {% block navigation %} - {% include "kaehmy_navigation.html" %} + {% include "kaehmy/kaehmy_navigation.html" %} {% endblock %} {% block content %} diff --git a/webapp/templates/kaehmy_base.html b/webapp/templates/kaehmy/kaehmy_base.html similarity index 91% rename from webapp/templates/kaehmy_base.html rename to webapp/templates/kaehmy/kaehmy_base.html index fdd50ac..c9c593f 100644 --- a/webapp/templates/kaehmy_base.html +++ b/webapp/templates/kaehmy/kaehmy_base.html @@ -30,12 +30,12 @@ {% block header %}
- {% include "kaehmy_header.html" %} + {% include "kaehmy/kaehmy_header.html" %}
{% endblock header %} {% block navigation %} - {% include "kaehmy_navigation.html" %} + {% include "kaehmy/kaehmy_navigation.html" %} {% endblock %}
@@ -44,7 +44,7 @@
{% block footer %} - {% include "kaehmy_footer.html" %} + {% include "kaehmy/kaehmy_footer.html" %} {% endblock footer %}
diff --git a/webapp/templates/kaehmy_checkbox_option.html b/webapp/templates/kaehmy/kaehmy_checkbox_option.html similarity index 100% rename from webapp/templates/kaehmy_checkbox_option.html rename to webapp/templates/kaehmy/kaehmy_checkbox_option.html diff --git a/webapp/templates/kaehmy_error.html b/webapp/templates/kaehmy/kaehmy_error.html similarity index 89% rename from webapp/templates/kaehmy_error.html rename to webapp/templates/kaehmy/kaehmy_error.html index cdcc0ed..a1ecfe3 100644 --- a/webapp/templates/kaehmy_error.html +++ b/webapp/templates/kaehmy/kaehmy_error.html @@ -1,4 +1,4 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load static %} {% load i18n %} diff --git a/webapp/templates/kaehmy_export.html b/webapp/templates/kaehmy/kaehmy_export.html similarity index 92% rename from webapp/templates/kaehmy_export.html rename to webapp/templates/kaehmy/kaehmy_export.html index 7d30fea..9495444 100644 --- a/webapp/templates/kaehmy_export.html +++ b/webapp/templates/kaehmy/kaehmy_export.html @@ -1,4 +1,4 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load static %} {% load i18n %} diff --git a/webapp/templates/kaehmy_footer.html b/webapp/templates/kaehmy/kaehmy_footer.html similarity index 100% rename from webapp/templates/kaehmy_footer.html rename to webapp/templates/kaehmy/kaehmy_footer.html diff --git a/webapp/templates/kaehmy_header.html b/webapp/templates/kaehmy/kaehmy_header.html similarity index 100% rename from webapp/templates/kaehmy_header.html rename to webapp/templates/kaehmy/kaehmy_header.html diff --git a/webapp/templates/kaehmy_list.html b/webapp/templates/kaehmy/kaehmy_list.html similarity index 95% rename from webapp/templates/kaehmy_list.html rename to webapp/templates/kaehmy/kaehmy_list.html index eea449a..4d8f485 100644 --- a/webapp/templates/kaehmy_list.html +++ b/webapp/templates/kaehmy/kaehmy_list.html @@ -1,10 +1,10 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load static %} {% load i18n %} {% block navigation %} - {% include "kaehmy_navigation.html" %} + {% include "kaehmy/kaehmy_navigation.html" %} {% endblock %} {% block content %} @@ -97,7 +97,7 @@
{% for message in application.messages.all %} - {% include "kaehmy_message.html" with messages=message.messages.all %} + {% include "kaehmy/kaehmy_message.html" with messages=message.messages.all %} {% endfor %}
diff --git a/webapp/templates/kaehmy_message.html b/webapp/templates/kaehmy/kaehmy_message.html similarity index 88% rename from webapp/templates/kaehmy_message.html rename to webapp/templates/kaehmy/kaehmy_message.html index f3a15fd..2dada37 100644 --- a/webapp/templates/kaehmy_message.html +++ b/webapp/templates/kaehmy/kaehmy_message.html @@ -13,7 +13,7 @@
{% for message in messages %} - {% include "kaehmy_message.html" with messages=message.messages.all %} + {% include "kaehmy/kaehmy_message.html" with messages=message.messages.all %} {% endfor %}
diff --git a/webapp/templates/kaehmy_navigation.html b/webapp/templates/kaehmy/kaehmy_navigation.html similarity index 100% rename from webapp/templates/kaehmy_navigation.html rename to webapp/templates/kaehmy/kaehmy_navigation.html diff --git a/webapp/templates/kaehmy_statistics.html b/webapp/templates/kaehmy/kaehmy_statistics.html similarity index 88% rename from webapp/templates/kaehmy_statistics.html rename to webapp/templates/kaehmy/kaehmy_statistics.html index 7c999fe..097b294 100644 --- a/webapp/templates/kaehmy_statistics.html +++ b/webapp/templates/kaehmy/kaehmy_statistics.html @@ -1,10 +1,10 @@ -{% extends "kaehmy_base.html" %} +{% extends "kaehmy/kaehmy_base.html" %} {% load bootstrap3 %} {% load i18n %} {% block navigation %} - {% include "kaehmy_navigation.html" %} + {% include "kaehmy/kaehmy_navigation.html" %} {% endblock %} {% block content %} diff --git a/webapp/templates/ohlhafv.html b/webapp/templates/ohlhafv/ohlhafv.html similarity index 100% rename from webapp/templates/ohlhafv.html rename to webapp/templates/ohlhafv/ohlhafv.html diff --git a/webapp/templates/ohlhafv_list.html b/webapp/templates/ohlhafv/ohlhafv_list.html similarity index 100% rename from webapp/templates/ohlhafv_list.html rename to webapp/templates/ohlhafv/ohlhafv_list.html diff --git a/webapp/views.py b/webapp/views.py index 63e9090..818bcaf 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -151,7 +151,7 @@ def contact_view(request, *args, **kwargs): def ohlhafv_view(request, *args, **kwargs): """Render Ohlhafv form page.""" form = OhlhafvForm() - return render(request, 'ohlhafv.html', {'form': form}) + return render(request, 'ohlhafv/ohlhafv.html', {'form': form}) @ensure_csrf_cookie @@ -186,7 +186,7 @@ def ohlhafv_list(request, *args, **kwargs): 'table': table_html, 'challenge_count': len(challenges), } - return render(request, 'ohlhafv_list.html', context) + return render(request, 'ohlhafv/ohlhafv_list.html', context) @ensure_csrf_cookie @@ -214,7 +214,7 @@ def kaehmy_list_view(request, *args, **kwargs): 'application_count': len(applications), 'filter_options': filter_options } - return render(request, 'kaehmy_list.html', context) + return render(request, 'kaehmy/kaehmy_list.html', context) @ensure_csrf_cookie @@ -242,7 +242,7 @@ def kaehmy_comment(request, *args, **kwargs): context = { 'error': form.errors } - return render(request, 'kaehmy_error.html', context) + return render(request, 'kaehmy/kaehmy_error.html', context) @require_http_methods(["GET"]) @@ -267,14 +267,14 @@ def kaehmy_statistics_view(request, *args, **kwargs): 'application_count': len(applications), 'role_list': role_list } - return render(request, 'kaehmy_statistics.html', context) + return render(request, 'kaehmy/kaehmy_statistics.html', context) @require_http_methods(["GET"]) def kaehmy_view(request, *args, **kwargs): """Render Kaehmy form page.""" form = KaehmyForm_Form() - return render(request, 'kaehmy.html', {'form': form}) + return render(request, 'kaehmy/kaehmy.html', {'form': form}) @ensure_csrf_cookie @@ -320,7 +320,7 @@ def kaehmy_submit(request, *args, **kwargs): context = { 'error': form.errors } - return render(request, 'kaehmy_error.html', context) + return render(request, 'kaehmy/kaehmy_error.html', context) return HttpResponseRedirect('/kaehmy') @@ -344,4 +344,4 @@ def kaehmy_export_view(request, *args, **kwargs): 'non_board_table': make_table(non_board), 'board_table': make_table(board), } - return render(request, 'kaehmy_export.html', context) + return render(request, 'kaehmy/kaehmy_export.html', context)