diff --git a/.vscode/settings.json b/.vscode/settings.json index 9002598..e37d4c5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,8 @@ "[html]": { "editor.formatOnSave": false }, - "liveSassCompile.settings.includeItems": ["**/static/css/style.scss"] + "liveSassCompile.settings.includeItems": ["**/static/css/style.scss"], + "[python]": { + "editor.defaultFormatter": "ms-python.black-formatter" + } } diff --git a/accounts/views.py b/accounts/views.py index 5ce6d3e..1281d1a 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -145,7 +145,9 @@ def profile_single(request, id): @login_required @admin_required def admin_panel(request): - return render(request, "setting/admin_panel.html", {}) + return render( + request, "setting/admin_panel.html", {"title": request.user.get_full_name} + ) # ######################################################## @@ -170,7 +172,7 @@ def profile_update(request): request, "setting/profile_info_change.html", { - "title": "Setting | DjangoSMS", + "title": "Setting", "form": form, }, ) @@ -223,7 +225,7 @@ def staff_add_view(request): form = StaffAddForm() context = { - "title": "Lecturer Add | DjangoSMS", + "title": "Lecturer Add", "form": form, } @@ -250,7 +252,7 @@ def edit_staff(request, pk): request, "accounts/edit_lecturer.html", { - "title": "Edit Lecturer | DjangoSMS", + "title": "Edit Lecturer", "form": form, }, ) @@ -264,7 +266,7 @@ class LecturerListView(ListView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["title"] = "Lecturers | DjangoSMS" + context["title"] = "Lecturers" return context @@ -314,7 +316,7 @@ def student_add_view(request): return render( request, "accounts/add_student.html", - {"title": "Add Student | DjangoSMS", "form": form}, + {"title": "Add Student", "form": form}, ) @@ -339,7 +341,7 @@ def edit_student(request, pk): request, "accounts/edit_student.html", { - "title": "Edit-profile | DjangoSMS", + "title": "Edit-profile", "form": form, }, ) @@ -359,7 +361,7 @@ class StudentListView(ListView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["title"] = "Students | DjangoSMS" + context["title"] = "Students" return context diff --git a/app/views.py b/app/views.py index fa9f359..75feb6c 100644 --- a/app/views.py +++ b/app/views.py @@ -15,7 +15,7 @@ from .models import * def home_view(request): items = NewsAndEvents.objects.all().order_by("-updated_date") context = { - "title": "News & Events | DjangoSMS", + "title": "News & Events", "items": items, } return render(request, "app/index.html", context) @@ -39,7 +39,7 @@ def post_add(request): request, "app/post_add.html", { - "title": "Add Post | DjangoSMS", + "title": "Add Post", "form": form, }, ) @@ -65,7 +65,7 @@ def edit_post(request, pk): request, "app/post_add.html", { - "title": "Edit Post | DjangoSMS", + "title": "Edit Post", "form": form, }, ) diff --git a/course/views.py b/course/views.py index 091bed8..c1e9d85 100644 --- a/course/views.py +++ b/course/views.py @@ -38,7 +38,7 @@ def program_view(request): request, "course/program_list.html", { - "title": "Programs | DjangoSMS", + "title": "Programs", "programs": programs, }, ) @@ -64,7 +64,7 @@ def program_add(request): request, "course/program_add.html", { - "title": "Add Program | DjangoSMS", + "title": "Add Program", "form": form, }, ) @@ -112,7 +112,7 @@ def program_edit(request, pk): return render( request, "course/program_add.html", - {"title": "Edit Program | DjangoSMS", "form": form}, + {"title": "Edit Program", "form": form}, ) @@ -179,7 +179,7 @@ def course_add(request, pk): request, "course/course_add.html", { - "title": "Add Course | DjangoSMS", + "title": "Add Course", "form": form, "program": pk, "users": users, @@ -210,7 +210,7 @@ def course_edit(request, slug): request, "course/course_add.html", { - "title": "Edit Course | DjangoSMS", + "title": "Edit Course", # 'form': form, 'program': pk, 'course': pk "form": form, }, @@ -264,7 +264,7 @@ class CourseAllocationFormView(CreateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["title"] = "Assign Course | DjangoSMS" + context["title"] = "Assign Course" return context @@ -275,7 +275,7 @@ def course_allocation_view(request): request, "course/course_allocation_view.html", { - "title": "Course Allocations | DjangoSMS", + "title": "Course Allocations", "allocated_courses": allocated_courses, }, ) @@ -297,7 +297,7 @@ def edit_allocated_course(request, pk): return render( request, "course/course_allocation_form.html", - {"title": "Edit Course Allocated | DjangoSMS", "form": form, "allocated": pk}, + {"title": "Edit Course Allocated", "form": form, "allocated": pk}, ) @@ -334,7 +334,7 @@ def handle_file_upload(request, slug): return render( request, "upload/upload_file_form.html", - {"title": "File Upload | DjangoSMS", "form": form, "course": course}, + {"title": "File Upload", "form": form, "course": course}, ) @@ -391,7 +391,7 @@ def handle_video_upload(request, slug): return render( request, "upload/upload_video_form.html", - {"title": "Video Upload | DjangoSMS", "form": form, "course": course}, + {"title": "Video Upload", "form": form, "course": course}, ) diff --git a/result/views.py b/result/views.py index 27a2e29..a55d839 100644 --- a/result/views.py +++ b/result/views.py @@ -91,7 +91,7 @@ def add_score_for(request, id): .filter(course__semester=current_semester) ) context = { - "title": "Submit Score | DjangoSMS", + "title": "Submit Score", "courses": courses, "course": course, # "myclass": myclass, diff --git a/templates/accounts/add_staff.html b/templates/accounts/add_staff.html index 7db3bb7..4d79abb 100644 --- a/templates/accounts/add_staff.html +++ b/templates/accounts/add_staff.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/accounts/add_student.html b/templates/accounts/add_student.html index e2e1e69..44a4766 100644 --- a/templates/accounts/add_student.html +++ b/templates/accounts/add_student.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/accounts/edit_lecturer.html b/templates/accounts/edit_lecturer.html index 591d66b..224b801 100644 --- a/templates/accounts/edit_lecturer.html +++ b/templates/accounts/edit_lecturer.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/accounts/edit_student.html b/templates/accounts/edit_student.html index 7411c71..9fbd4c8 100644 --- a/templates/accounts/edit_student.html +++ b/templates/accounts/edit_student.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/accounts/lecturer_list.html b/templates/accounts/lecturer_list.html index 8845d8a..36a5eef 100644 --- a/templates/accounts/lecturer_list.html +++ b/templates/accounts/lecturer_list.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% block content %} diff --git a/templates/accounts/parent_form.html b/templates/accounts/parent_form.html index 115afcf..bcc7adb 100644 --- a/templates/accounts/parent_form.html +++ b/templates/accounts/parent_form.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html index 45a3c98..c73757a 100644 --- a/templates/accounts/profile.html +++ b/templates/accounts/profile.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %} {{ title }} | DjangoSMS{% endblock title %} +{% block title %} {{ title }} | Learning management system{% endblock title %} {% load static %} {% load i18n %} diff --git a/templates/accounts/profile_single.html b/templates/accounts/profile_single.html index 4a817ce..95f03a0 100644 --- a/templates/accounts/profile_single.html +++ b/templates/accounts/profile_single.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %} {{ title }} | DjangoSMS{% endblock title %} +{% block title %} {{ title }} | Learning management system{% endblock title %} {% load static %} {% load i18n %} {% block content %} diff --git a/templates/accounts/student_list.html b/templates/accounts/student_list.html index b6fc2b6..60d0697 100644 --- a/templates/accounts/student_list.html +++ b/templates/accounts/student_list.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% block content %} diff --git a/templates/app/dashboard.html b/templates/app/dashboard.html index 964505c..a247b5d 100644 --- a/templates/app/dashboard.html +++ b/templates/app/dashboard.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %} Dashboard | Ezod System {% endblock title %} +{% block title %} Dashboard | Learning management system {% endblock title %} {% load static %} {% block header %} diff --git a/templates/app/index.html b/templates/app/index.html index a0be7d2..57598a4 100644 --- a/templates/app/index.html +++ b/templates/app/index.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load static %} {% block content %} diff --git a/templates/app/post_add.html b/templates/app/post_add.html index e416768..0b2e7bd 100644 --- a/templates/app/post_add.html +++ b/templates/app/post_add.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/app/semester_list.html b/templates/app/semester_list.html index 7689bc0..d6a5344 100644 --- a/templates/app/semester_list.html +++ b/templates/app/semester_list.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% block content %} diff --git a/templates/app/semester_update.html b/templates/app/semester_update.html index 19e09d9..fce8442 100644 --- a/templates/app/semester_update.html +++ b/templates/app/semester_update.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/app/session_list.html b/templates/app/session_list.html index 667a615..dcadac0 100644 --- a/templates/app/session_list.html +++ b/templates/app/session_list.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% block content %} diff --git a/templates/app/session_update.html b/templates/app/session_update.html index fbadd40..362608c 100644 --- a/templates/app/session_update.html +++ b/templates/app/session_update.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/course/course_add.html b/templates/course/course_add.html index 0335fd6..ecf999b 100644 --- a/templates/course/course_add.html +++ b/templates/course/course_add.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/course/course_allocation_form.html b/templates/course/course_allocation_form.html index eac25f6..b0c02f5 100644 --- a/templates/course/course_allocation_form.html +++ b/templates/course/course_allocation_form.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/course/course_allocation_view.html b/templates/course/course_allocation_view.html index 79e41e0..2bc45a7 100644 --- a/templates/course/course_allocation_view.html +++ b/templates/course/course_allocation_view.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% block content %}
diff --git a/templates/course/course_registration.html b/templates/course/course_registration.html index cba8539..5048861 100644 --- a/templates/course/course_registration.html +++ b/templates/course/course_registration.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load static %} {% load crispy_forms_tags %} diff --git a/templates/course/course_single.html b/templates/course/course_single.html index c823ed5..050b053 100644 --- a/templates/course/course_single.html +++ b/templates/course/course_single.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }} | DjangoSMS{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load static %} {% block content %} diff --git a/templates/course/program_add.html b/templates/course/program_add.html index e8e9e13..7b8e138 100644 --- a/templates/course/program_add.html +++ b/templates/course/program_add.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load crispy_forms_tags %} {% load static %} diff --git a/templates/course/program_list.html b/templates/course/program_list.html index 5351bc6..af80cac 100644 --- a/templates/course/program_list.html +++ b/templates/course/program_list.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% block content %} diff --git a/templates/course/program_single.html b/templates/course/program_single.html index 602fc31..747ad76 100644 --- a/templates/course/program_single.html +++ b/templates/course/program_single.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %} {{ title }} | DjangoSMS{% endblock title %} +{% block title %} {{ title }} | Learning management system{% endblock title %} {% load static %} {% block content %} diff --git a/templates/course/user_course_list.html b/templates/course/user_course_list.html index 34c64c0..770dbbb 100644 --- a/templates/course/user_course_list.html +++ b/templates/course/user_course_list.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %} My Courses | DjangoSMS{% endblock title %} +{% block title %} My Courses | Learning management system{% endblock title %} {% load static %} {% block content %} diff --git a/templates/progress.html b/templates/progress.html index f637109..29bb2e2 100644 --- a/templates/progress.html +++ b/templates/progress.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %} {% trans "Progress Page" %} {% endblock %} +{% block title %} {% trans "Progress Page" %} | Learning management system {% endblock %} {% block description %} {% trans "User Progress Page" %} {% endblock %} {% block content %} diff --git a/templates/question.html b/templates/question.html index 34acc7d..1d69e01 100644 --- a/templates/question.html +++ b/templates/question.html @@ -2,7 +2,7 @@ {% load i18n%} -{% block title %} {{ quiz.title }} {% endblock %} +{% block title %} {{ quiz.title }} | Learning management system {% endblock %} {% block description %} {{ quiz.title }} - {{ quiz.description }} {% endblock %} {% block content %} diff --git a/templates/quiz/quiz_list.html b/templates/quiz/quiz_list.html index 6d33b0d..5fb8bd6 100644 --- a/templates/quiz/quiz_list.html +++ b/templates/quiz/quiz_list.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}{{ title }}{% endblock title %} +{% block title %}{{ title }} | Learning management system{% endblock title %} {% load i18n %} {% load static %} diff --git a/templates/quiz/sitting_detail.html b/templates/quiz/sitting_detail.html index f7e7a85..ad55227 100644 --- a/templates/quiz/sitting_detail.html +++ b/templates/quiz/sitting_detail.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% load i18n %} {% block title %} -{% trans "Result of" %} {{ sitting.quiz.title }} {% trans "for" %} {{ sitting.user }} +{% trans "Result of" %} {{ sitting.quiz.title }} {% trans "for" %} {{ sitting.user }} | Learning management system {% endblock %} {% block content %} diff --git a/templates/quiz/sitting_list.html b/templates/quiz/sitting_list.html index 289df74..bc8658d 100644 --- a/templates/quiz/sitting_list.html +++ b/templates/quiz/sitting_list.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} {% load i18n %} -{% block title %}{% trans "All Quizzes" %}{% endblock %} +{% block title %}{% trans "All Quizzes" %} | Learning management system{% endblock %} {% block content %}