Skip to content
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion evap/cms/templates/cms_evaluation_merge_selection.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{% extends 'staff_base.html' %}

{% load staff_templatetags %}

{% block title %}
{% translate 'Merge evaluations' %}
{{ block.super }}
{% endblock %}

{% block breadcrumb %}
{{ block.super }}
<li class="breadcrumb-item">{% translate 'Merge evaluations' %}</li>
{% breadcrumb_item %}
{% translate 'Merge evaluations' %}
{% endbreadcrumb_item %}
{% endblock %}

{% block content %}
Expand Down
9 changes: 7 additions & 2 deletions evap/contributor/templates/contributor_evaluation_form.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
{% extends 'base.html' %}

{% load evaluation_filters %}
{% load staff_templatetags %}

{% block title %}{% translate 'Your EvaP' %} - {{ block.super }}{% endblock %}

{% block breadcrumb_bar %}
<div class="breadcrumb-bar">
<ul class="breadcrumb">
<li class="breadcrumb-item">{{ evaluation.course.semester.name }}</li>
<li class="breadcrumb-item">{{ evaluation.full_name }}</li>
{% breadcrumb_item %}
{{ evaluation.course.semester.name }}
{% endbreadcrumb_item %}
{% breadcrumb_item %}
{{ evaluation.full_name }}
{% endbreadcrumb_item %}
</ul>
</div>
{% endblock %}
Expand Down
6 changes: 5 additions & 1 deletion evap/development/templates/development_components.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
{% extends 'base.html' %}

{% load staff_templatetags %}

{% block title %}{% translate 'Development' %} - {{ block.super }}{% endblock %}

{% block breadcrumb_bar %}
<div class="breadcrumb-bar">
<ul class="breadcrumb">
{% block breadcrumb %}
<li class="breadcrumb-item">{% translate 'Development' %}</li>
{% breadcrumb_item %}
{% translate 'Development' %}
{% endbreadcrumb_item %}
{% endblock %}
</ul>
</div>
Expand Down
13 changes: 8 additions & 5 deletions evap/grades/templates/grades_base.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{% extends 'base.html' %}
{% load staff_templatetags %}

{% block title %}{% translate 'Grade publishing' %} - {{ block.super }}{% endblock %}

{% block breadcrumb_bar %}
<div class="breadcrumb-bar">
<ul class="breadcrumb">
{% block breadcrumb %}
{% if disable_breadcrumb_grades or not user.is_grade_publisher %}
<li class="breadcrumb-item">{% translate 'Grade publishing' %}</li>
{% if not user.is_grade_publisher %}
{% breadcrumb_item %}
{% translate 'Grade publishing' %}
{% endbreadcrumb_item %}
{% else %}
<li class="breadcrumb-item">
<a href="{% url 'grades:index' %}">{% translate 'Grade publishing' %}</a>
</li>
{% breadcrumb_item_url 'grades:index' %}
{% translate 'Grade publishing' %}
{% endbreadcrumb_item_url %}
{% endif %}
{% endblock %}
</ul>
Expand Down
9 changes: 4 additions & 5 deletions evap/grades/templates/grades_course_base.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{% extends 'grades_semester_base.html' %}
{% load staff_templatetags %}

{% block title %}{{ course.name }} - {{ block.super }}{% endblock %}

{% block breadcrumb %}
{{ block.super }}
{% if course %}
{% if disable_breadcrumb_course %}
<li class="breadcrumb-item">{{ course.name }}</li>
{% else %}
<li class="breadcrumb-item"><a href="{% url 'grades:course_view' course.id %}">{{ course.name }}</a></li>
{% endif %}
{% breadcrumb_item_url 'grades:course_view' course.id %}
{{ course.name }}
{% endbreadcrumb_item_url %}
{% endif %}
{% endblock %}
13 changes: 8 additions & 5 deletions evap/grades/templates/grades_semester_base.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
{% extends 'grades_base.html' %}

{% load evaluation_filters %}
{% load staff_templatetags %}

{% block title %}{{ semester.name }} - {{ block.super }}{% endblock %}

{% block breadcrumb %}
{{ block.super }}
{% if semester %}
{% if disable_breadcrumb_semester or not user.is_grade_publisher %}
<li class="breadcrumb-item">{{ semester.name }}</li>
{% if not user.is_grade_publisher %}
{% breadcrumb_item %}
{{ semester.name }}
{% endbreadcrumb_item %}
{% else %}
<li class="breadcrumb-item">
<a href="{% url 'grades:semester_view' semester.id %}">{{ semester.name }}</a>
</li>
{% breadcrumb_item_url 'grades:semester_view' semester.id %}
{{ semester.name }}
{% endbreadcrumb_item_url %}
{% endif %}
{% endif %}
{% endblock %}
6 changes: 5 additions & 1 deletion evap/grades/templates/grades_upload_form.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{% extends 'grades_course_base.html' %}

{% load staff_templatetags %}

{% block breadcrumb %}
{{ block.super }}
<li class="breadcrumb-item">{% translate "Upload document" %}</li>
{% breadcrumb_item %}
{% translate "Upload document" %}
{% endbreadcrumb_item %}
{% endblock %}

{% block content %}
Expand Down
9 changes: 2 additions & 7 deletions evap/grades/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ class IndexView(TemplateView):

def get_context_data(self, **kwargs) -> dict[str, Any]:
return super().get_context_data(**kwargs) | {
"semesters": Semester.objects.filter(grade_documents_are_deleted=False),
"disable_breadcrumb_grades": True,
"semesters": Semester.objects.filter(grade_documents_are_deleted=False)
}


Expand Down Expand Up @@ -69,10 +68,7 @@ def get_context_data(self, **kwargs) -> dict[str, Any]:
)
courses = course_grade_document_count_tuples(query)

return super().get_context_data(**kwargs) | {
"courses": courses,
"disable_breadcrumb_semester": True,
}
return super().get_context_data(**kwargs) | {"courses": courses}


@grade_publisher_or_manager_required
Expand All @@ -91,7 +87,6 @@ def get_context_data(self, **kwargs) -> dict[str, Any]:
return super().get_context_data(**kwargs) | {
"semester": self.object.semester,
"grade_documents": self.object.grade_documents.all(),
"disable_breadcrumb_course": True,
}


Expand Down
9 changes: 7 additions & 2 deletions evap/results/templates/results_evaluation_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@
{% load static %}
{% load evaluation_filters %}
{% load results_templatetags %}
{% load staff_templatetags %}

{% block title %}{{ evaluation.full_name }} - {{ evaluation.course.semester.name }} - {% translate 'Results' %} -
{{ block.super }}{% endblock %}

{% block breadcrumb_bar %}
<div class="breadcrumb-bar">
<ul class="breadcrumb">
<li class="breadcrumb-item">{{ evaluation.course.semester.name }}</li>
<li class="breadcrumb-item">{{ evaluation.full_name }}</li>
{% breadcrumb_item %}
{{ evaluation.course.semester.name }}
{% endbreadcrumb_item %}
{% breadcrumb_item %}
{{ evaluation.full_name }}
{% endbreadcrumb_item %}
</ul>
</div>
{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{% extends 'staff_base.html' %}

{% load staff_templatetags %}

{% block breadcrumb %}
{{ block.super }}
<li class="breadcrumb-item">
<a
href="{% url 'rewards:reward_point_redemption_events' %}"
>{% translate 'Reward Point Redemption Events' %}</a>
</li>
<li class="breadcrumb-item">{% translate 'Edit event' %}</li>
{% breadcrumb_item_url 'rewards:reward_point_redemption_events' %}
{% translate 'Reward Point Redemption Events' %}
{% endbreadcrumb_item_url %}
{% breadcrumb_item %}
{% translate 'Edit event' %}
{% endbreadcrumb_item %}
{% endblock %}

{% block content %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{% extends 'staff_base.html' %}

{% load static %}
{% load staff_templatetags %}

{% block breadcrumb %}
{{ block.super }}
<li class="breadcrumb-item">{% translate 'Reward Point Redemption Events' %}</li>
{% breadcrumb_item %}
{% translate 'Reward Point Redemption Events' %}
{% endbreadcrumb_item %}
{% endblock %}

{% block content %}
Expand Down
11 changes: 8 additions & 3 deletions evap/staff/templates/staff_base.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
{% extends 'base.html' %}
{% load staff_templatetags %}

{% block title %}{% translate 'Manage' %} - {{ block.super }}{% endblock %}

{% block breadcrumb_bar %}
<div class="breadcrumb-bar">
<ul class="breadcrumb">
{% block breadcrumb %}
{% if disable_breadcrumb_manager or not user.is_manager %}
<li class="breadcrumb-item">{% translate 'Manage' %}</li>
{% if not user.is_manager %}
{% breadcrumb_item %}
{% translate 'Manage' %}
{% endbreadcrumb_item %}
{% else %}
<li class="breadcrumb-item"><a href="{% url 'staff:index' %}">{% translate 'Manage' %}</a></li>
{% breadcrumb_item_url 'staff:index' %}
{% translate 'Manage' %}
{% endbreadcrumb_item_url %}
{% endif %}
{% endblock %}
</ul>
Expand Down
15 changes: 7 additions & 8 deletions evap/staff/templates/staff_course_base.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% extends 'staff_semester_base.html' %}
{% load staff_templatetags %}

{% block title %}
{% if course %}
Expand All @@ -12,14 +13,12 @@
{% block breadcrumb %}
{{ block.super }}
{% if course %}
{% if disable_breadcrumb_course %}
Comment thread
LukasMansour marked this conversation as resolved.
<li class="breadcrumb-item">{{ course.name }}</li>
{% else %}
<li class="breadcrumb-item"><a href="{% url 'staff:course_edit' course.id %}">{{ course.name }}</a></li>
{% endif %}
{% breadcrumb_item_url 'staff:course_edit' course.id %}
{{ course.name }}
{% endbreadcrumb_item_url %}
{% elif evaluation.course %}
<li class="breadcrumb-item">
<a href="{% url 'staff:course_edit' evaluation.course.id %}">{{ evaluation.course.name }}</a>
</li>
{% breadcrumb_item_url 'staff:course_edit' evaluation.course.id %}
{{ evaluation.course.name }}
{% endbreadcrumb_item_url %}
{% endif %}
{% endblock %}
6 changes: 5 additions & 1 deletion evap/staff/templates/staff_course_type_index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{% extends 'staff_base.html' %}

{% load staff_templatetags %}
{% load static %}

{% block breadcrumb %}
{{ block.super }}
<li class="breadcrumb-item">{% translate 'Course types' %}</li>

{% breadcrumb_item %}
{% translate 'Course types' %}
{% endbreadcrumb_item %}
{% endblock %}

{% block content %}
Expand Down
10 changes: 8 additions & 2 deletions evap/staff/templates/staff_course_type_merge.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{% extends 'staff_base.html' %}

{% load evaluation_filters %}
{% load staff_templatetags %}

{% block breadcrumb %}
{{ block.super }}
<li class="breadcrumb-item"><a href="{% url 'staff:course_type_index' %}">{% translate 'Course types' %}</a></li>
<li class="breadcrumb-item">{% translate 'Merge course types' %}</li>
{% breadcrumb_item_url 'staff:course_type_index' %}
{% translate 'Course types' %}
{% endbreadcrumb_item_url %}

{% breadcrumb_item_url 'staff:course_type_merge_selection' %}
{% translate 'Merge course types' %}
{% endbreadcrumb_item_url %}
{% endblock %}

{% block content %}
Expand Down
11 changes: 9 additions & 2 deletions evap/staff/templates/staff_course_type_merge_selection.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
{% extends 'staff_base.html' %}

{% load staff_templatetags %}

{% block breadcrumb %}
{{ block.super }}
<li class="breadcrumb-item"><a href="{% url 'staff:course_type_index' %}">{% translate 'Course types' %}</a></li>
<li class="breadcrumb-item">{% translate 'Merge course types' %}</li>
{% breadcrumb_item_url 'staff:course_type_index' %}
{% translate 'Course types' %}
{% endbreadcrumb_item_url %}

{% breadcrumb_item %}
{% translate 'Merge course types' %}
{% endbreadcrumb_item %}
{% endblock %}

{% block content %}
Expand Down
9 changes: 7 additions & 2 deletions evap/staff/templates/staff_evaluation_base.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends 'staff_course_base.html' %}

{% load staff_templatetags %}
{% block title %}
{% if evaluation.name %}
{{ evaluation.name }} -
Expand All @@ -11,9 +12,13 @@
{{ block.super }}
{% if evaluation %}
{% if evaluation.name %}
<li class="breadcrumb-item">{{ evaluation.name }}</li>
{% breadcrumb_item_url 'staff:evaluation_edit' evaluation.id %}
{{ evaluation.name }}
{% endbreadcrumb_item_url %}
{% else %}
<li class="breadcrumb-item">{{ evaluation.course.name }}</li>
{% breadcrumb_item_url 'staff:evaluation_edit' evaluation.id %}
{{ evaluation.course.name }}
Comment thread
LukasMansour marked this conversation as resolved.
{% endbreadcrumb_item_url %}
{% endif %}
{% endif %}
{% endblock %}
15 changes: 9 additions & 6 deletions evap/staff/templates/staff_evaluation_textanswer_edit.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
{% extends 'staff_evaluation_base.html' %}

{% load staff_templatetags %}
{% block breadcrumb %}
{{ block.super }}
<li class="breadcrumb-item">
<a
href="{% url 'staff:evaluation_textanswers' evaluation.id %}#{{ textanswer.id }}"
>{% translate 'Text answers' %}</a>
</li>
<li class="breadcrumb-item">{{ textanswer.id }}</li>

{% breadcrumb_item_url 'staff:evaluation_textanswers' evaluation.id fragment=textanswer.id|stringformat:"s" %}
{% translate 'Text answers' %}
{% endbreadcrumb_item_url %}

{% breadcrumb_item %}
{{ textanswer.id }}
{% endbreadcrumb_item %}
{% endblock %}

{% block content %}
Expand Down
Loading