diff --git a/app/views.py b/app/views.py index e06dc3c..db89485 100644 --- a/app/views.py +++ b/app/views.py @@ -298,33 +298,3 @@ def semester_delete_view(request, pk): @admin_required def dashboard_view(request): return render(request, "app/dashboard.html") - - -# ######################################################## - - -def handler404(request, exception, template_name="common/404.html"): - response = render(request, "common/404.html") - response.status_code = 404 - return response - - -def handler500(request, *args, **argv): - response = render(request, "common/500.html") - response.status_code = 500 - - return response - - -def handler400(request, exception, template_name="common/400.html"): - response = render(request, "common/400.html") - response.status_code = 400 - - return response - - -def handler403(request, exception, template_name="common/403.html"): - response = render(request, "common/403.html") - response.status_code = 403 - - return response diff --git a/config/urls.py b/config/urls.py index 1becddc..fbf2baa 100644 --- a/config/urls.py +++ b/config/urls.py @@ -47,7 +47,3 @@ if settings.DEBUG: ), path("500/", default_views.server_error), ] - -handler404 = "app.views.handler404" -handler500 = "app.views.handler500" -handler400 = "app.views.handler400" diff --git a/static/css/font-face.css b/static/css/font-face.css deleted file mode 100644 index a3b7cdb..0000000 --- a/static/css/font-face.css +++ /dev/null @@ -1,234 +0,0 @@ -/* poppins-100 - latin */ -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 100; - src: url('../fonts/poppins/poppins-v5-latin-100.eot'); /* IE9 Compat Modes */ - src: local('Poppins Thin'), local('Poppins-Thin'), - url('../fonts/poppins/poppins-v5-latin-100.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-100.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-100.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-100.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-100.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-200 - latin */ -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 200; - src: url('../fonts/poppins/poppins-v5-latin-200.eot'); /* IE9 Compat Modes */ - src: local('Poppins ExtraLight'), local('Poppins-ExtraLight'), - url('../fonts/poppins/poppins-v5-latin-200.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-200.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-200.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-200.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-200.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-200italic - latin */ -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 200; - src: url('../fonts/poppins/poppins-v5-latin-200italic.eot'); /* IE9 Compat Modes */ - src: local('Poppins ExtraLight Italic'), local('Poppins-ExtraLightItalic'), - url('../fonts/poppins/poppins-v5-latin-200italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-200italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-200italic.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-200italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-200italic.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-100italic - latin */ -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 100; - src: url('../fonts/poppins/poppins-v5-latin-100italic.eot'); /* IE9 Compat Modes */ - src: local('Poppins Thin Italic'), local('Poppins-ThinItalic'), - url('../fonts/poppins/poppins-v5-latin-100italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-100italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-100italic.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-100italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-100italic.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-300 - latin */ -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 300; - src: url('../fonts/poppins/poppins-v5-latin-300.eot'); /* IE9 Compat Modes */ - src: local('Poppins Light'), local('Poppins-Light'), - url('../fonts/poppins/poppins-v5-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-300.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-300.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-300.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-300italic - latin */ -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 300; - src: url('../fonts/poppins/poppins-v5-latin-300italic.eot'); /* IE9 Compat Modes */ - src: local('Poppins Light Italic'), local('Poppins-LightItalic'), - url('../fonts/poppins/poppins-v5-latin-300italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-300italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-300italic.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-300italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-300italic.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-regular - latin */ -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 400; - src: url('../fonts/poppins/poppins-v5-latin-regular.eot'); /* IE9 Compat Modes */ - src: local('Poppins Regular'), local('Poppins-Regular'), - url('../fonts/poppins/poppins-v5-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-regular.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-regular.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-italic - latin */ -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 400; - src: url('../fonts/poppins/poppins-v5-latin-italic.eot'); /* IE9 Compat Modes */ - src: local('Poppins Italic'), local('Poppins-Italic'), - url('../fonts/poppins/poppins-v5-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-italic.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-italic.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-500 - latin */ -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 500; - src: url('../fonts/poppins/poppins-v5-latin-500.eot'); /* IE9 Compat Modes */ - src: local('Poppins Medium'), local('Poppins-Medium'), - url('../fonts/poppins/poppins-v5-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-500.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-500.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-500.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-500italic - latin */ -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 500; - src: url('../fonts/poppins/poppins-v5-latin-500italic.eot'); /* IE9 Compat Modes */ - src: local('Poppins Medium Italic'), local('Poppins-MediumItalic'), - url('../fonts/poppins/poppins-v5-latin-500italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-500italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-500italic.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-500italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-500italic.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-600 - latin */ -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 600; - src: url('../fonts/poppins/poppins-v5-latin-600.eot'); /* IE9 Compat Modes */ - src: local('Poppins SemiBold'), local('Poppins-SemiBold'), - url('../fonts/poppins/poppins-v5-latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-600.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-600.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-600.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-600italic - latin */ -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 600; - src: url('../fonts/poppins/poppins-v5-latin-600italic.eot'); /* IE9 Compat Modes */ - src: local('Poppins SemiBold Italic'), local('Poppins-SemiBoldItalic'), - url('../fonts/poppins/poppins-v5-latin-600italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-600italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-600italic.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-600italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-600italic.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-700 - latin */ -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 700; - src: url('../fonts/poppins/poppins-v5-latin-700.eot'); /* IE9 Compat Modes */ - src: local('Poppins Bold'), local('Poppins-Bold'), - url('../fonts/poppins/poppins-v5-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-700.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-700.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-700.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-700italic - latin */ -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 700; - src: url('../fonts/poppins/poppins-v5-latin-700italic.eot'); /* IE9 Compat Modes */ - src: local('Poppins Bold Italic'), local('Poppins-BoldItalic'), - url('../fonts/poppins/poppins-v5-latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-700italic.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-700italic.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-800 - latin */ -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 800; - src: url('../fonts/poppins/poppins-v5-latin-800.eot'); /* IE9 Compat Modes */ - src: local('Poppins ExtraBold'), local('Poppins-ExtraBold'), - url('../fonts/poppins/poppins-v5-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-800.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-800.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-800.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-800italic - latin */ -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 800; - src: url('../fonts/poppins/poppins-v5-latin-800italic.eot'); /* IE9 Compat Modes */ - src: local('Poppins ExtraBold Italic'), local('Poppins-ExtraBoldItalic'), - url('../fonts/poppins/poppins-v5-latin-800italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-800italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-800italic.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-800italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-800italic.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-900 - latin */ -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 900; - src: url('../fonts/poppins/poppins-v5-latin-900.eot'); /* IE9 Compat Modes */ - src: local('Poppins Black'), local('Poppins-Black'), - url('../fonts/poppins/poppins-v5-latin-900.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-900.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-900.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-900.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-900.svg#Poppins') format('svg'); /* Legacy iOS */ -} -/* poppins-900italic - latin */ -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 900; - src: url('../fonts/poppins/poppins-v5-latin-900italic.eot'); /* IE9 Compat Modes */ - src: local('Poppins Black Italic'), local('Poppins-BlackItalic'), - url('../fonts/poppins/poppins-v5-latin-900italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/poppins/poppins-v5-latin-900italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-900italic.woff') format('woff'), /* Modern Browsers */ - url('../fonts/poppins/poppins-v5-latin-900italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/poppins/poppins-v5-latin-900italic.svg#Poppins') format('svg'); /* Legacy iOS */ -} diff --git a/templates/common/400.html b/templates/400.html similarity index 72% rename from templates/common/400.html rename to templates/400.html index b70ce22..dfcb0be 100644 --- a/templates/common/400.html +++ b/templates/400.html @@ -1,7 +1,7 @@ -{% extends 'common/_base.html' %} +{% extends 'error_handler_base.html' %} {% block content %} -
+

Bad request

Please make sure the form is correctly filled.

← Return to the app diff --git a/templates/common/403.html b/templates/403.html similarity index 73% rename from templates/common/403.html rename to templates/403.html index 4002522..e7087c7 100644 --- a/templates/common/403.html +++ b/templates/403.html @@ -1,7 +1,7 @@ -{% extends 'common/_base.html' %} +{% extends 'error_handler_base.html' %} {% block content %} -
+

403, forbidden

You need the proper permission to make that request.

← Return to the app diff --git a/templates/common/404.html b/templates/404.html similarity index 73% rename from templates/common/404.html rename to templates/404.html index f4c39c0..f724f19 100644 --- a/templates/common/404.html +++ b/templates/404.html @@ -1,7 +1,7 @@ -{% extends 'common/_base.html' %} +{% extends 'error_handler_base.html' %} {% block content %} -
+

404

Looks like the page you're looking for is does not exist.

← Return to the app diff --git a/templates/common/500.html b/templates/500.html similarity index 70% rename from templates/common/500.html rename to templates/500.html index ca49985..f7d2b28 100644 --- a/templates/common/500.html +++ b/templates/500.html @@ -1,7 +1,7 @@ -{% extends 'common/_base.html' %} +{% extends 'error_handler_base.html' %} {% block content %} -
+

Server error

Please try again later.

← Return to the app diff --git a/templates/accounts/lecturer_list.html b/templates/accounts/lecturer_list.html index 36a5eef..25be0c2 100644 --- a/templates/accounts/lecturer_list.html +++ b/templates/accounts/lecturer_list.html @@ -77,9 +77,7 @@ {% empty %} - - - + No Lecturer(s). {% if request.user.is_superuser %} @@ -91,9 +89,6 @@ - - - diff --git a/templates/accounts/student_list.html b/templates/accounts/student_list.html index b22f9a4..3417f2c 100644 --- a/templates/accounts/student_list.html +++ b/templates/accounts/student_list.html @@ -84,9 +84,7 @@ {% empty %} - - - + No Student. {% if request.user.is_superuser %} @@ -98,9 +96,6 @@ - - - diff --git a/templates/app/index.html b/templates/app/index.html index 57598a4..230e3f6 100644 --- a/templates/app/index.html +++ b/templates/app/index.html @@ -53,8 +53,8 @@
News & Events
-
    -
  • +
      +
    • News
    • diff --git a/templates/base.html b/templates/base.html index 5675743..1cc447d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -10,7 +10,6 @@ {% block title %}DjangoSMS{% endblock title %} - @@ -23,15 +22,22 @@ - {% include 'aside.html' %} + {% block sidebar %} + {% include 'aside.html' %} + {% endblock %} + + {% block maincontent %}
      - {% include 'navbar.html' %} + {% block topbar %} + {% include 'navbar.html' %} + {% endblock %}
      {% block content %}{% endblock content %}
      + {% endblock %} diff --git a/templates/common/_base.html b/templates/common/_base.html deleted file mode 100644 index 523a520..0000000 --- a/templates/common/_base.html +++ /dev/null @@ -1,31 +0,0 @@ -{% load static %} - - - - - - - - - {% block title %}Django Learning Management System{% endblock title %} - - - - - - - - - - - -
      - -
      - {% block content %}{% endblock content %} -
      - -
      - - - diff --git a/templates/course/program_single.html b/templates/course/program_single.html index d2f3d2d..819125b 100644 --- a/templates/course/program_single.html +++ b/templates/course/program_single.html @@ -87,7 +87,7 @@ {% if request.user.is_superuser %}