more bootstrap nav convresion

This commit is contained in:
Ross
2024-12-23 10:36:03 +00:00
parent 1fdb4c9159
commit 178ec034a3
21 changed files with 189 additions and 126 deletions
+34 -11
View File
@@ -5,17 +5,40 @@
{% endblock %}
{% block navigation %}
Anatomy:
{% if request.user.is_authenticated %}
<a href="{% url 'anatomy:index' %}">Packets</a> /
<a href="{% url 'anatomy:exam_list' %}">Exams</a> /
<a href="{% url 'anatomy:exam_create' %}" title="Create a new exam">Create Exam</a> /
<a href="{% url 'anatomy:question_list' %}">Questions</a> /
<a href="{% url 'anatomy:anatomy_question_create' %}" title="Create a new question">Create Question</a>
{% if request.user.is_superuser %}
/ <a href="{% url 'anatomy:user_answer_table_view' %}" title="User answers">Answers</a>
{% endif %}
{% endif %}
<nav class="navbar navbar-expand-lg navbar-dark submenu">
<div class="container-fluid">
<a class="navbar-brand" href="{% url 'anatomy:index' %}">Anatomy</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse">
<ul class="navbar-nav">
{% if request.user.is_authenticated %}
<li class="nav-item">
<a class="nav-link" href="{% url 'anatomy:exam_list' %}"><i class="bi bi-mortarboard"></i> Exams</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'anatomy:question_view' %}"><i class="bi bi-question-circle"></i> Questions</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><i class="bi bi-file-earmark-plus"></i> Create</a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="{% url 'anatomy:exam_create' %}" title="Create a new exam"><i class="bi bi-mortarboard"></i> Exam</a></li>
<li><a class="dropdown-item" href="{% url 'anatomy:question_create' %}" title="Create a new question"><i class="bi bi-question-circle"></i> Question</a></li>
</ul>
</li>
{% if request.user.is_superuser %}
<li class="nav-item">
<a class="nav-link" href="{% url 'anatomy:user_answer_table_view' %}" title="User answers">Answers</a>
</li>
{% endif %}
{% endif %}
</ul>
</div>
</div>
</nav>
{% endblock %}
{% block content %}
{% if simple_content %}
+3 -8
View File
@@ -7,21 +7,16 @@ from django.views.decorators.cache import cache_page
app_name = "anatomy"
urlpatterns = [
# path('', views.question_list, name='question_list'),
# path('', views.question_view, name='question_view'),
path(
"question/",
views.AnatomyQuestionView.as_view(),
name="question_list",
name="question_view",
),
path(
"question/create/",
views.AnatomyQuestionCreate.as_view(),
name="anatomy_question_create",
),
path(
"create/exam/<int:pk>",
views.AnatomyQuestionCreate.as_view(),
name="anatomy_create_exam",
name="question_create",
),
path(
"question/<int:pk>/update",
+3 -3
View File
@@ -109,14 +109,14 @@ def user_is_admin(user):
return False
def question_list(request):
def question_view(request):
questions = AnatomyQuestion.objects.all()
if not request.user.groups.filter(name="anatomy_checker").exists():
questions = questions.filter(open_access=False)
# raise PermissionDenied()
return render(request, "anatomy/question_list.html", {"questions": questions})
return render(request, "anatomy/question_view.html", {"questions": questions})
@login_required
@@ -794,7 +794,7 @@ class UserAnswerDelete(SuperuserRequiredMixin, DeleteView):
class QuestionDelete(AuthorOrCheckerRequiredMixin, DeleteView):
model = AnatomyQuestion
success_url = reverse_lazy("anatomy:question_list")
success_url = reverse_lazy("anatomy:question_view")
class ExamCreate(ExamCreateBase):