diff --git a/core/accounts/templates/accounts/base.html b/core/accounts/templates/accounts/base.html deleted file mode 100644 index 1f67ec0..0000000 --- a/core/accounts/templates/accounts/base.html +++ /dev/null @@ -1,16 +0,0 @@ -{% load static %} - - - - - - {% block title %}{% endblock %} - - - - {% include 'homepage/partials/_nav.html' %} - {% block content %} - {% endblock %} - {% include 'homepage/partials/_footer.html' %} - - \ No newline at end of file diff --git a/core/accounts/templates/core/partials/_nav.html b/core/accounts/templates/core/partials/_nav.html deleted file mode 100644 index 5fcc8d7..0000000 --- a/core/accounts/templates/core/partials/_nav.html +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/core/core/settings.py b/core/core/settings.py index f9789b6..2abadc4 100644 --- a/core/core/settings.py +++ b/core/core/settings.py @@ -58,7 +58,7 @@ ROOT_URLCONF = 'core.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [BASE_DIR / 'templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -120,7 +120,7 @@ USE_TZ = True # https://docs.djangoproject.com/en/5.1/howto/static-files/ STATIC_URL = '/static/' -BASE_DIR='static' #von ben8 hinzugefügt +STATICFILES_DIRS = [BASE_DIR / 'static'] # Default primary key field type # https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field diff --git a/core/homepage/templates/homepage/impress.html b/core/homepage/templates/homepage/impress.html deleted file mode 100644 index 6331821..0000000 --- a/core/homepage/templates/homepage/impress.html +++ /dev/null @@ -1,34 +0,0 @@ -{% load static %} - - - - - - Impressum - - - - - {% include 'homepage/partials/_nav.html' %} -
- {% block content%}{% endblock %} -
-
-
-

Impressum

-
-
- -

- Katharineum zu Lübeck -

-

- Königsstraße 27-31 -

-

- 23552 Lübeck -

-
- {% include 'homepage/partials/_footer.html' %} - - \ No newline at end of file diff --git a/core/homepage/templates/homepage/privacy.html b/core/homepage/templates/homepage/privacy.html deleted file mode 100644 index 3659d69..0000000 --- a/core/homepage/templates/homepage/privacy.html +++ /dev/null @@ -1,23 +0,0 @@ -{% load static %} - - - - - - Impressum - - - - - {% include 'homepage/partials/_nav.html' %} -
- {% block content%}{% endblock %} -
-

- Hallo, ich bin die Datenschutzerklärung! -

-
-
- {% include 'homepage/partials/_footer.html' %} - - \ No newline at end of file diff --git a/core/library/templates/library/base.html b/core/library/templates/library/base.html deleted file mode 100644 index 8220a30..0000000 --- a/core/library/templates/library/base.html +++ /dev/null @@ -1,18 +0,0 @@ -{% load static %} - - - - - - - qivip - - - {% include 'homepage/partials/_nav.html' %} -
- {% block content%}{% endblock %} -
- {% include 'homepage/partials/_footer.html' %} - {% block extra_js %}{% endblock %} - - \ No newline at end of file diff --git a/core/homepage/static/homepage/t-input.css b/core/static/homepage/t-input.css similarity index 100% rename from core/homepage/static/homepage/t-input.css rename to core/static/homepage/t-input.css diff --git a/core/homepage/static/icons/favicon.png b/core/static/icons/favicon.png similarity index 100% rename from core/homepage/static/icons/favicon.png rename to core/static/icons/favicon.png diff --git a/core/accounts/templates/accounts/home.html b/core/templates/accounts/home.html similarity index 96% rename from core/accounts/templates/accounts/home.html rename to core/templates/accounts/home.html index a074ad8..c73c060 100644 --- a/core/accounts/templates/accounts/home.html +++ b/core/templates/accounts/home.html @@ -1,4 +1,4 @@ -{% extends 'accounts/base.html'%} +{% extends 'base.html'%} {% block title %}Home{% endblock %} {% block content %} diff --git a/core/accounts/templates/accounts/login.html b/core/templates/accounts/login.html similarity index 98% rename from core/accounts/templates/accounts/login.html rename to core/templates/accounts/login.html index d716735..76c0225 100644 --- a/core/accounts/templates/accounts/login.html +++ b/core/templates/accounts/login.html @@ -1,4 +1,4 @@ -{% extends 'accounts/base.html' %} +{% extends 'base.html' %} {% load static %} {% block title %}Anmeldung{% endblock %} {% block content %} diff --git a/core/accounts/templates/accounts/register.html b/core/templates/accounts/register.html similarity index 97% rename from core/accounts/templates/accounts/register.html rename to core/templates/accounts/register.html index 1d8d7b4..57a8f4c 100644 --- a/core/accounts/templates/accounts/register.html +++ b/core/templates/accounts/register.html @@ -1,4 +1,4 @@ -{% extends 'accounts/base.html' %} +{% extends 'base.html' %} {% block title %}Registrierung{% endblock %} {% block content %}
diff --git a/core/homepage/templates/homepage/base.html b/core/templates/base.html similarity index 77% rename from core/homepage/templates/homepage/base.html rename to core/templates/base.html index a51baaa..9552c8d 100644 --- a/core/homepage/templates/homepage/base.html +++ b/core/templates/base.html @@ -9,8 +9,9 @@ qivip - {% include 'homepage/partials/_nav.html' %} + {% include 'partials/_nav.html' %} {% block content%}{% endblock %} - {% include 'homepage/partials/_footer.html' %} + {% include 'partials/_footer.html' %} + {% block extra_js %}{% endblock %} \ No newline at end of file diff --git a/core/components/templates/components/answer.html b/core/templates/components/answer.html similarity index 100% rename from core/components/templates/components/answer.html rename to core/templates/components/answer.html diff --git a/core/components/templates/components/base.html b/core/templates/components/base.html similarity index 100% rename from core/components/templates/components/base.html rename to core/templates/components/base.html diff --git a/core/components/templates/components/ranking.html b/core/templates/components/ranking.html similarity index 100% rename from core/components/templates/components/ranking.html rename to core/templates/components/ranking.html diff --git a/core/homepage/templates/homepage/home.html b/core/templates/homepage/home.html similarity index 95% rename from core/homepage/templates/homepage/home.html rename to core/templates/homepage/home.html index 4f5e999..65f0e5e 100644 --- a/core/homepage/templates/homepage/home.html +++ b/core/templates/homepage/home.html @@ -1,4 +1,4 @@ -{% extends 'homepage/base.html' %} +{% extends 'base.html' %} {% block content %}
diff --git a/core/templates/homepage/impress.html b/core/templates/homepage/impress.html new file mode 100644 index 0000000..676f9c0 --- /dev/null +++ b/core/templates/homepage/impress.html @@ -0,0 +1,22 @@ +{% extends 'base.html' %} + {% block content%} +
+
+

Impressum

+
+
+
+

+ Katharineum zu Lübeck +

+

+ Königsstraße 27-31 +

+

+ 23552 Lübeck +

+
+
+ {% endblock %} + + \ No newline at end of file diff --git a/core/templates/homepage/privacy.html b/core/templates/homepage/privacy.html new file mode 100644 index 0000000..2878136 --- /dev/null +++ b/core/templates/homepage/privacy.html @@ -0,0 +1,13 @@ +{% extends 'base.html' %} + + {% block content%} +
+

+ Hallo, ich bin die Datenschutzerklärung! +

+
+
+ + \ No newline at end of file diff --git a/core/library/templates/library/delete_confirmation.html b/core/templates/library/delete_confirmation.html similarity index 98% rename from core/library/templates/library/delete_confirmation.html rename to core/templates/library/delete_confirmation.html index d320f5f..3548e3d 100644 --- a/core/library/templates/library/delete_confirmation.html +++ b/core/templates/library/delete_confirmation.html @@ -1,4 +1,4 @@ -{% extends 'library/base.html' %} +{% extends 'base.html' %} {% block content %}
diff --git a/core/library/templates/library/detail_quiz.html b/core/templates/library/detail_quiz.html similarity index 99% rename from core/library/templates/library/detail_quiz.html rename to core/templates/library/detail_quiz.html index be78a84..d0f6a41 100644 --- a/core/library/templates/library/detail_quiz.html +++ b/core/templates/library/detail_quiz.html @@ -1,4 +1,4 @@ -{% extends 'library/base.html' %} +{% extends 'base.html' %} {% block content %}
diff --git a/core/library/templates/library/form.html b/core/templates/library/form.html similarity index 88% rename from core/library/templates/library/form.html rename to core/templates/library/form.html index 8b42edb..fd85510 100644 --- a/core/library/templates/library/form.html +++ b/core/templates/library/form.html @@ -1,4 +1,4 @@ -{% extends 'library/base.html' %} +{% extends 'base.html' %} {% block content %}

Formular

diff --git a/core/library/templates/library/overview_quiz.html b/core/templates/library/overview_quiz.html similarity index 96% rename from core/library/templates/library/overview_quiz.html rename to core/templates/library/overview_quiz.html index 4851248..3fdfd00 100644 --- a/core/library/templates/library/overview_quiz.html +++ b/core/templates/library/overview_quiz.html @@ -1,4 +1,4 @@ -{% extends 'library/base.html' %} +{% extends 'base.html' %} {% block content %}

Übersicht

diff --git a/core/library/templates/library/question/question_multiple_choice.html b/core/templates/library/question/question_multiple_choice.html similarity index 100% rename from core/library/templates/library/question/question_multiple_choice.html rename to core/templates/library/question/question_multiple_choice.html diff --git a/core/library/templates/library/question/question_true_false.html b/core/templates/library/question/question_true_false.html similarity index 100% rename from core/library/templates/library/question/question_true_false.html rename to core/templates/library/question/question_true_false.html diff --git a/core/homepage/templates/homepage/partials/_footer.html b/core/templates/partials/_footer.html similarity index 100% rename from core/homepage/templates/homepage/partials/_footer.html rename to core/templates/partials/_footer.html diff --git a/core/homepage/templates/homepage/partials/_nav.html b/core/templates/partials/_nav.html similarity index 100% rename from core/homepage/templates/homepage/partials/_nav.html rename to core/templates/partials/_nav.html