diff --git a/config/settings.py b/config/settings.py index 387beea..efc70d6 100644 --- a/config/settings.py +++ b/config/settings.py @@ -29,8 +29,8 @@ ALLOWED_HOSTS = [] # Application definition INSTALLED_APPS = [ - 'pages', 'notes', + 'pages', 'django.contrib.admin', 'django.contrib.auth', diff --git a/notes/templates/notes/base.html b/notes/templates/notes/base.html deleted file mode 100644 index 086c05e..0000000 --- a/notes/templates/notes/base.html +++ /dev/null @@ -1,18 +0,0 @@ -{% load static %} - - - - - TJ 2023 - {% block title %}{% endblock title %} - - {% block css %}{% endblock css %} - {% block js %}{% endblock js %} - - -
- {% block body %} - - {% endblock body %} -
- - \ No newline at end of file diff --git a/notes/templates/notes/meeting.html b/notes/templates/notes/meeting.html index 60729a8..0051c3d 100644 --- a/notes/templates/notes/meeting.html +++ b/notes/templates/notes/meeting.html @@ -1,8 +1,9 @@ -{% extends 'notion/base.html' %} +{% extends 'pages/base.html' %} {% load static %} {% block css %} - + {% endblock css %} -{% block body %} -{{ html|safe }} -{% endblock body %} \ No newline at end of file + +{% block content %} + {{ html|safe }} +{% endblock content %} \ No newline at end of file diff --git a/notes/templates/notes/test.html b/notes/templates/notes/test.html index 9face0e..785c4da 100644 --- a/notes/templates/notes/test.html +++ b/notes/templates/notes/test.html @@ -1,13 +1,4 @@ - - - - - Test - - - -
-{{ html|safe }} -
- - \ No newline at end of file +{% extends 'pages/base.html' %} +{% block content %} +{{html|safe}} +{% endblock content %} \ No newline at end of file diff --git a/pages/templates/pages/base.html b/pages/templates/pages/base.html index bd838f8..014298b 100644 --- a/pages/templates/pages/base.html +++ b/pages/templates/pages/base.html @@ -12,7 +12,7 @@ - + {% block css %}{% endblock css %}