Fix most of html templates

infoscreen/views/admin_views.py

@@ -36,7 +36,7 @@ from infoscreen.models import (
 @permission_required("infoscreen.change_infoinstance", raise_exception=True)
 def admin(request, *args, **kwargs):
     """Render infoscreen admin page."""
-    return render(request, "infoscreen:infoscreen_admin.html", {})
+    return render(request, "infoscreen/infoscreen_admin.html", {})
 
 
 def create_item_generator(model):

infoscreen/views/public_views.py

@@ -15,7 +15,7 @@ import requests
 @require_http_methods(["GET"])
 def index(request, idx, *args, **kwargs):
     """Render infoscreen index page."""
-    return render(request, "infoscreen_index.html", {"rotation": idx})
+    return render(request, "infoscreen/infoscreen_index.html", {"rotation": idx})
 
 
 @require_http_methods(["GET"])

kaehmy/forms.py

@@ -6,7 +6,7 @@ from kaehmy.models import PresetRole, CustomRole, Application, Comment, KaehmyBa
 
 
 class CheckboxSelectMultiple(forms.widgets.CheckboxSelectMultiple):
-    option_template_name = "checkbox_option.html"
+    option_template_name = "kaehmy/checkbox_option.html"
 
     def create_option(
         self, name, value, label, selected, index, subindex=None, attrs=None

kaehmy/views.py

@@ -52,7 +52,7 @@ def list_view(request, *args, **kwargs):
         "filter_options": filter_options,
     }
 
-    return render(request, "kaehmy:list.html", context)
+    return render(request, "kaehmy/kaehmy_list.html", context)
 
 
 @ensure_csrf_cookie
@@ -77,7 +77,7 @@ def comment(request, *args, **kwargs):
         return redirect("/kaehmy")
     else:
         context = {"error": form.errors}
-        return render(request, "kaehmy:error.html", context)
+        return render(request, "kaehmy/kaehmy_error.html", context)
 
 
 @require_http_methods(["GET"])
@@ -102,14 +102,14 @@ def statistics_view(request, *args, **kwargs):
         "application_count": len(applications),
         "role_list": role_list,
     }
-    return render(request, "kaehmy:statistics.html", context)
+    return render(request, "kaehmy/statistics.html", context)
 
 
 @require_http_methods(["GET"])
 def view(request, *args, **kwargs):
     """Render Kaehmy form page."""
     form = ApplicationForm()
-    return render(request, "kaehmy:kaehmy.html", {"form": form})
+    return render(request, "kaehmy/kaehmy.html", {"form": form})
 
 
 @ensure_csrf_cookie
@@ -144,7 +144,7 @@ def submit(request, *args, **kwargs):
         processHooks(message=f"Uusi New kaehmy! {name} -> {url}", eventType="kaehmy")
     else:
         context = {"error": form.errors}
-        return render(request, "kaehmy:error.html", context)
+        return render(request, "kaehmy/error.html", context)
     return HttpResponseRedirect("/kaehmy")
 
 
@@ -171,4 +171,4 @@ def 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/export.html", context)

members/views/applications.py

@@ -41,7 +41,7 @@ def application_list(request, *args, **kwargs):
         "application_count": application_count,
         "notification": request.GET.get("notification", None),
     }
-    return render(request, "application_list.html", context)
+    return render(request, "members/application_list.html", context)
 
 
 @ensure_csrf_cookie
@@ -57,7 +57,9 @@ def application_edit(request, *args, **kwargs):
         application = Request.objects.get(id=i)
         form = ApplicationForm(instance=application)
         return render(
-            request, "application_edit.html", {"application_id": i, "form": form}
+            request,
+            "members/application_edit.html",
+            {"application_id": i, "form": form},
         )
 
 
@@ -101,7 +103,7 @@ def application_accept(request, *args, **kwargs):
             subject = _("Jäsenhakemuksesi Sähköinsinöörikiltaan on hyväksytty!")
 
             message = render_to_string(
-                "email_application_accept.html",
+                "members/email_application_accept.html",
                 {"first_name": application.first_name},
             )
             send_email(member.email, subject, message, True)
@@ -158,7 +160,7 @@ def application_delete_confirm(request, *args, **kwargs):
         form = ApplicationForm(instance=application)
         return render(
             request,
-            "application_delete_confirm.html",
+            "members/application_delete_confirm.html",
             {"application_id": i, "form": form},
         )
 
@@ -167,7 +169,7 @@ def application_delete_confirm(request, *args, **kwargs):
 def application_form(request, *args, **kwargs):
     """Render member application form."""
     form = ApplicationForm()
-    return render(request, "application_index.html", {"form": form})
+    return render(request, "members/application_index.html", {"form": form})
 
 
 @ensure_csrf_cookie
@@ -186,7 +188,7 @@ def application_submit(request, *args, **kwargs):
             )
 
             message = render_to_string(
-                "email_application_submit.html",
+                "members/email_application_submit.html",
                 {
                     "application": application,
                     "ayy": _("Kyllä") if application.AYY else _("Ei"),
@@ -195,6 +197,6 @@ def application_submit(request, *args, **kwargs):
             )
             send_email(email, subject, message)
         finally:
-            return render(request, "application_success.html", {})
+            return render(request, "members/application_success.html", {})
     else:
         return error_view(request, form.errors)

members/views/members.py

@@ -70,7 +70,7 @@ def member_list(request, *args, **kwargs):
         "paid_count": len(queryset.filter(last_paid__gte=filter_date)),
         "notification": request.GET.get("notification", None),
     }
-    return render(request, "member_list.html", context)
+    return render(request, "members/member_list.html", context)
 
 
 @ensure_csrf_cookie
@@ -80,7 +80,7 @@ def member_list(request, *args, **kwargs):
 def member_add(request, *args, **kwargs):
     """Render add member page."""
     form = MemberForm()
-    return render(request, "member_add.html", {"form": form})
+    return render(request, "members/member_add.html", {"form": form})
 
 
 @ensure_csrf_cookie
@@ -96,7 +96,9 @@ def member_delete_confirm(request, *args, **kwargs):
         member = Member.objects.get(id=i)
         form = MemberForm(instance=member)
         return render(
-            request, "member_delete_confirm.html", {"member_id": i, "form": form}
+            request,
+            "members/member_delete_confirm.html",
+            {"member_id": i, "form": form},
         )
 
 
@@ -106,7 +108,7 @@ def member_delete_confirm(request, *args, **kwargs):
 @permission_required("members.add_member", raise_exception=True)
 def member_add_many(request, *args, **kwargs):
     """Render add multiple members page."""
-    return render(request, "member_add_many.html", {})
+    return render(request, "members/member_add_many.html", {})
 
 
 @ensure_csrf_cookie
@@ -233,7 +235,9 @@ def member_edit(request, *args, **kwargs):
     else:
         member = Member.objects.get(id=i)
         form = MemberForm(instance=member)
-        return render(request, "member_edit.html", {"member_id": i, "form": form})
+        return render(
+            request, "members/member_edit.html", {"member_id": i, "form": form}
+        )
 
 
 @method_decorator(login_required(login_url="/admin/login"), name="dispatch")

members/views/payments.py

@@ -43,7 +43,7 @@ def payment_list(request, *args, **kwargs):
         "payment_count": len(payments),
         "notification": request.GET.get("notification", None),
     }
-    return render(request, "payment_list.html", context)
+    return render(request, "members/payment_list.html", context)
 
 
 @ensure_csrf_cookie
@@ -53,7 +53,7 @@ def payment_list(request, *args, **kwargs):
 def payment_add(request, *args, **kwargs):
     """Render add payment form."""
     form = PaymentForm()
-    return render(request, "payment_add.html", {"form": form})
+    return render(request, "members/payment_add.html", {"form": form})
 
 
 @ensure_csrf_cookie
@@ -92,7 +92,9 @@ def payment_edit(request, *args, **kwargs):
     else:
         payment = Payment.objects.get(id=i)
         form = PaymentForm(instance=payment)
-        return render(request, "payment_edit.html", {"payment_id": i, "form": form})
+        return render(
+            request, "members/payment_edit.html", {"payment_id": i, "form": form}
+        )
 
 
 @ensure_csrf_cookie
@@ -108,7 +110,9 @@ def payment_delete_confirm(request, *args, **kwargs):
         payment = Payment.objects.get(id=i)
         form = PaymentForm(instance=payment)
         return render(
-            request, "payment_delete_confirm.html", {"payment_id": i, "form": form}
+            request,
+            "members/payment_delete_confirm.html",
+            {"payment_id": i, "form": form},
         )
 
 

members/views/utils.py

@@ -46,7 +46,7 @@ class MemberDetail(generics.RetrieveAPIView):
 
 
 def error_view(request, message, status=400):
-    return render(request, "error.html", {"error": message}, status=400)
+    return render(request, "members/error.html", {"error": message}, status=400)
 
 
 def validate_recaptcha(response):
@@ -100,7 +100,7 @@ def convert_table_to_html(table, request):
 @permission_required("members.change_member", raise_exception=True)
 def settings_page(request, *args, **kwargs):
     """Render member app settings page."""
-    return render(request, "settings.html", {})
+    return render(request, "members/settings.html", {})
 
 
 @ensure_csrf_cookie
@@ -155,7 +155,7 @@ def import_csv(request, *args, **kwargs):
     request.session["models"] = result
     request.session["payment_source"] = payment_source
     context = {"members": member_table_html, "payments": payment_table_html}
-    return render(request, "member_add_many_confirm.html", context)
+    return render(request, "members/member_add_many_confirm.html", context)
 
 
 def make_excel_response(Resource):

ohlhafv/views.py

@@ -18,7 +18,7 @@ from webapp.models import processHooks
 def ohlhafv_view(request, *args, **kwargs):
     """Render Ohlhafv form page."""
     form = OhlhafvForm()
-    return render(request, "ohlhafv:new.html", {"form": form})
+    return render(request, "ohlhafv/new.html", {"form": form})
 
 
 @ensure_csrf_cookie
@@ -32,7 +32,7 @@ def ohlhafv_submit(request, *args, **kwargs):
         url = f"https://{URL}/ohlhafv/list"
 
         email_body = render_to_string(
-            "ohlhafv:email.html",
+            "ohlhafv/email.html",
             {
                 "challenge": challenge,
                 "url": url,
@@ -46,7 +46,7 @@ def ohlhafv_submit(request, *args, **kwargs):
 
         try:
             webhook_message = render_to_string(
-                "ohlhafv:tgmsg.tpl", {"challenge": challenge, "url": url}
+                "ohlhafv/tgmsg.tpl", {"challenge": challenge, "url": url}
             )
             processHooks(message=webhook_message, eventType="ohlhafv")
         except Exception:
@@ -67,4 +67,4 @@ def ohlhafv_list(request, *args, **kwargs):
         "challenges": challenges,
         "challenge_count": len(challenges),
     }
-    return render(request, "ohlhafv:list.html", context)
+    return render(request, "ohlhafv/list.html", context)

templates/error.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load static %}
 {% load i18n %}

templates/infoscreen/infoscreen_admin.html

@@ -1,4 +1,4 @@
-{% extends "infoscreen:base.html" %}
+{% extends "infoscreen/base.html" %}
 
 {% load i18n %}
 {% load static %}
@@ -32,13 +32,13 @@
             <h1>{% trans "Infoscreen Admin Pane" %}</h1>
         </div>
     </div>
-    {% include "infoscreen:nav.html" %}
+    {% include "infoscreen/nav.html" %}
     <div class="tab-content" id="tabContent">
-        {% include "infoscreen:tabs/slides.html" %}
-        {% include "infoscreen:tabs/rotations.html" %}
-        {% include "infoscreen:tabs/add_remove.html" %}
+        {% include "infoscreen/tabs/slides.html" %}
+        {% include "infoscreen/tabs/rotations.html" %}
+        {% include "infoscreen/tabs/add_remove.html" %}
     </div>
 </div>
 
-{% include "footer.html" %}
+{% include "webapp/footer.html" %}
 {% endblock body %}

templates/infoscreen/infoscreen_index.html

@@ -1,4 +1,4 @@
-{% extends "infoscreen:base.html" %}
+{% extends "infoscreen/base.html" %}
 {% load static %}
 {% load i18n %}
 

templates/kaehmy/base.html

@@ -14,12 +14,12 @@
 
 {% block header %}
 <div class="kaehmy_header">
-    {% include "kaehmy:header.html" %}
+    {% include "kaehmy/header.html" %}
 </div>
 {% endblock header %}
 
 {% block navigation %}
-    {% include "kaehmy:navigation.html" %}
+    {% include "kaehmy/navigation.html" %}
 {% endblock %}
 
 <div class="kaehmy-content">
@@ -28,7 +28,7 @@
 </div>
 <div class="footer">
     {% block footer %}
-        {% include "kaehmy:footer.html" %}
+        {% include "kaehmy/footer.html" %}
     {% endblock footer %}
 </div>
 

templates/kaehmy/error.html

@@ -1,4 +1,4 @@
-{% extends "kaehmy:base.html" %}
+{% extends "kaehmy/base.html" %}
 
 {% load static %}
 {% load i18n %}

templates/kaehmy/kaehmy.html

@@ -1,10 +1,10 @@
-{% extends "kaehmy:base.html" %}
+{% extends "kaehmy/base.html" %}
 
 {% load bootstrap3 %}
 {% load i18n %}
 
 {% block navigation %}
-    {% include "kaehmy:navigation.html" %}
+    {% include "kaehmy/navigation.html" %}
 {% endblock %}
 
 {% block content %}

templates/kaehmy/list.html

@@ -1,10 +1,10 @@
-{% extends "kaehmy:base.html" %}
+{% extends "kaehmy/base.html" %}
 
 {% load static %}
 {% load i18n %}
 
 {% block navigation %}
-    {% include "kaehmy:navigation.html" %}
+    {% include "kaehmy/navigation.html" %}
 {% endblock %}
 
 {% block content %}
@@ -97,7 +97,7 @@
 
             <div class="collapse" id="collapse_{{ application.id }}">
                 {% for message in application.messages.all %}
-                    {% include "kaehmy:message.html" with messages=message.messages.all %}
+                    {% include "kaehmy/message.html" with messages=message.messages.all %}
                 {% endfor %}
             </div>
         </div>

templates/kaehmy/message.html

@@ -13,7 +13,7 @@
         </div>
         <div>
             {% for message in messages %}
-                {% include "message.html" with messages=message.messages.all %}
+                {% include "kaehmy/message.html" with messages=message.messages.all %}
             {% endfor %}
         </div>
 

templates/kaehmy/statistics.html

@@ -1,10 +1,10 @@
-{% extends "kaehmy:base.html" %}
+{% extends "kaehmy/base.html" %}
 
 {% load bootstrap3 %}
 {% load i18n %}
 
 {% block navigation %}
-    {% include "kaehmy:navigation.html" %}
+    {% include "kaehmy/navigation.html" %}
 {% endblock %}
 
 {% block content %}

templates/members/application_delete_confirm.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load i18n %}
 {% load bootstrap3 %}

templates/members/application_edit.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load i18n %}
 {% load bootstrap3 %}

templates/members/application_form_base.html

@@ -35,6 +35,6 @@
     <body>
         {% block content %}
         {% endblock content %}
-        {% include "footer.html" %}
+        {% include "webapp/footer.html" %}
     </body>
 </html>

templates/members/application_index.html

@@ -1,4 +1,4 @@
-{% extends "application_form_base.html" %}
+{% extends "members/application_form_base.html" %}
 {% load static %}
 {% load bootstrap3 %}
 {% load i18n %}

templates/members/application_list.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load i18n %}
 

templates/members/application_success.html

@@ -1,4 +1,4 @@
-{% extends "application_form_base.html" %}
+{% extends "members/application_form_base.html" %}
 {% load static %}
 {% load bootstrap3 %}
 {% load i18n %}

templates/members/base.html

@@ -91,6 +91,6 @@
             </div>
         </div>
 
-        {% include "footer.html" %}
+        {% include "webapp/footer.html" %}
     </body>
 </html>

templates/members/member_add.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load bootstrap3 %}
 {% load i18n %}

templates/members/member_add_many.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load i18n %}
 {% load static %}

templates/members/member_add_many_confirm.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load i18n %}
 

templates/members/member_delete_confirm.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load i18n %}
 {% load bootstrap3 %}

templates/members/member_edit.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load i18n %}
 {% load bootstrap3 %}

templates/members/member_list.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load static %}
 {% load i18n %}

templates/members/payment_add.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load bootstrap3 %}
 {% load i18n %}

templates/members/payment_delete_confirm.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load i18n %}
 {% load bootstrap3 %}

templates/members/payment_edit.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load i18n %}
 {% load bootstrap3 %}

templates/members/payment_list.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load static %}
 {% load i18n %}

templates/members/upload_form.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% block content %}
 <h1>{{ title }}</h1>

templates/ohlhafv/base.html

@@ -11,18 +11,18 @@
 
 {% block body %}
 {% block header %}
-    {% include "ohlhafv:header.html" %}
+    {% include "ohlhafv/header.html" %}
 {% endblock header %}
 
 {% block navigation %}
-    {% include "ohlhafv:navigation.html" %}
+    {% include "ohlhafv/navigation.html" %}
 {% endblock %}
 
 {% block content %}
 {% endblock %}
 
 {% block footer %}
-    {% include "ohlhafv:footer.html" %}
+    {% include "ohlhafv/footer.html" %}
 {% endblock footer %}
 
 {% endblock body %}

templates/ohlhafv/list.html

@@ -1,4 +1,4 @@
-{% extends "ohlhafv:base.html" %}
+{% extends "ohlhafv/base.html" %}
 
 {% load static %}
 {% load i18n %}

templates/ohlhafv/new.html

@@ -1,10 +1,10 @@
-{% extends "ohlhafv:base.html" %}
+{% extends "ohlhafv/base.html" %}
 
 {% load bootstrap3 %}
 {% load i18n %}
 
 {% block navigation %}
-    {% include "ohlhafv:navigation.html" %}
+    {% include "ohlhafv/navigation.html" %}
 {% endblock %}
 
 {% block content %}

templates/webapp/base.html

@@ -14,14 +14,14 @@
     <div class="row">
         <div class="col">
             {% block header %}
-                {% include "header.html" %}
+                {% include "webapp/header.html" %}
             {% endblock %}
         </div>
     </div>
     <div class="row">
         <div class="col">
             {% block navigation %}
-                {% include "navigation.html" %}
+                {% include "webapp/navigation.html" %}
             {% endblock %}
         </div>
     </div>
@@ -33,6 +33,6 @@
     </div>
 </div>
 {% block footer %}
-    {% include "footer.html" %}
+    {% include "webapp/footer.html" %}
 {% endblock footer %}
 {% endblock %}

templates/webapp/contact.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "webapp/base.html" %}
 {% block content %}
 
 {% load i18n %}

templates/webapp/event_calendar.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "webapp/base.html" %}
 {% block content %}
 
 {% load i18n %}

templates/webapp/freshmen.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "webapp/base.html" %}
 {% block content %}
 
 {% load i18n %}

templates/webapp/guild.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "webapp/base.html" %}
 {% block content %}
 
 {% load i18n %}

templates/webapp/index.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "webapp/base.html" %}
 {% load i18n %}
 
 {% block content %}

templates/webapp/international.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "webapp/base.html" %}
 {% block content %}
 
 {% load i18n %}

templates/webapp/jobs.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "webapp/base.html" %}
 {% block content %}
 
 {% load i18n %}

templates/webapp/sosso.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "webapp/base.html" %}
 {% block content %}
 
 {% load i18n %}

webapp/utils.py

@@ -106,7 +106,7 @@ def send_email(to: str, subject: str, body: str, html: bool = False):
 
 def send_signup_email(to, subject, id, uuid, content):
     message = render_to_string(
-        "signup_email.html",
+        "webapp/signup_email.html",
         {
             "url": f"https://{FRONTEND_URL}/signup/edit/{id}/{uuid}",
             "content": markdown.markdown(content),