Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions evap/evaluation/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'images/favicon_16.png' %}" />
{% endif %}
{% endblock %}
<script type="module" src="{% static 'js/color-mode-toggler.js' %}"></script>
</head>
<body{% if not plain_page %} class="mb-footer"{% endif %}>
<script type="text/javascript" src="{% static 'bootstrap/dist/js/bootstrap.bundle.min.js' %}"></script>
Expand Down
10 changes: 10 additions & 0 deletions evap/evaluation/templates/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,16 @@
</div>
</li>
{% endif %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="bd-theme" data-bs-toggle="dropdown">
<span id="span-toggle-color-mode-dropdown" class="fas fa-circle-half-stroke"></span>
</a>
<div class="dropdown-menu dropdown-menu-end dropdown-menu-tight" aria-labelledby="bd-theme">
<button type="button" class="dropdown-item" data-bs-theme-value="light">{% translate 'Light' %}</button>
<button type="button" class="dropdown-item" data-bs-theme-value="dark">{% translate 'Dark' %}</button>
<button type="button" class="dropdown-item" data-bs-theme-value="auto">{% translate 'Auto' %}</button>
</div>
</li>
</ul>
</div>
</nav>
6 changes: 3 additions & 3 deletions evap/evaluation/templatetags/evaluation_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
APPROVAL_STATES = {
Evaluation.State.NEW: StateValues(
0,
"fas fa-circle icon-blue",
"fas fa-circle icon-primary",
Evaluation.State.NEW,
_("In preparation"),
),
Expand All @@ -60,12 +60,12 @@
),
Evaluation.State.EDITOR_APPROVED: StateValues(
1,
"far fa-square-check icon-blue",
"far fa-square-check icon-primary",
Evaluation.State.EDITOR_APPROVED,
_("Approved by editor, awaiting manager review"),
),
Evaluation.State.APPROVED: StateValues(
3, "far fa-square-check icon-green", Evaluation.State.APPROVED, _("Approved by manager")
3, "far fa-square-check icon-success", Evaluation.State.APPROVED, _("Approved by manager")
),
}

Expand Down
6 changes: 3 additions & 3 deletions evap/results/templates/results_index_evaluation_impl.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
{% if evaluation.state == evaluation.State.IN_EVALUATION %}
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-play icon-gray" title="{% translate 'This evaluation is still running' %}"></span>
{% elif evaluation.state == evaluation.State.EVALUATED %}
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-chart-simple icon-blue" title="{% translate 'Results not yet published' %}"></span>
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-chart-simple icon-primary" title="{% translate 'Results not yet published' %}"></span>
{% elif evaluation.state == evaluation.State.REVIEWED %}
{% if evaluation.grading_process_is_finished %}
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-chart-simple icon-red" title="{% translate 'Results not yet published although grading process is finished' %}"></span>
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-chart-simple icon-danger" title="{% translate 'Results not yet published although grading process is finished' %}"></span>
{% else %}
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-chart-simple icon-blue" title="{% translate 'Results not yet published' %}"></span>
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-chart-simple icon-primary" title="{% translate 'Results not yet published' %}"></span>
{% endif %}
{% endif %}
</span>
Expand Down
2 changes: 1 addition & 1 deletion evap/staff/templates/staff_evaluation_textanswers.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name
{% if evaluation.state == evaluation.State.IN_EVALUATION %}
<span class="badge bg-warning"><span class="fas fa-play icon-gray"></span> {% translate 'Still in evaluation' %}</span>
{% else %}
<span class="badge bg-light"><span class="fas fa-stop icon-green"></span> {% translate 'Evaluation finished' %}</span>
<span class="badge bg-light"><span class="fas fa-stop icon-success"></span> {% translate 'Evaluation finished' %}</span>
{% endif %}
{% include 'evaluation_badges.html' with mode='manager' %}
</div>
Expand Down
20 changes: 10 additions & 10 deletions evap/staff/templates/staff_semester_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
<button type="button" class="btn btn-sm btn-light" data-filter="evaluated"
data-bs-toggle="tooltip" data-bs-placement="top" data-container=".btn-switch"
title="{% translate 'Evaluated' %}">
<span class="fas fa-stop icon-green"></span>
<span class="fas fa-stop icon-success"></span>
</button>
</div>
<div class="btn-switch btn-group icon-buttons">
Expand All @@ -333,17 +333,17 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
<button type="button" class="btn btn-sm btn-light" data-filter="unreviewed_textanswers"
data-bs-toggle="tooltip" data-bs-placement="top" data-container=".btn-switch"
title="{% translate 'Text answers awaiting review' %}">
<span class="fas fa-comment icon-blue"></span>
<span class="fas fa-comment icon-primary"></span>
</button>
<button type="button" class="btn btn-sm btn-light" data-filter="unreviewed_textanswers_urgent"
data-bs-toggle="tooltip" data-bs-placement="top" data-container=".btn-switch"
title="{% translate 'Text answers awaiting urgent review because grading process is finished' %}">
<span class="fas fa-comment icon-red"></span>
<span class="fas fa-comment icon-danger"></span>
</button>
<button type="button" class="btn btn-sm btn-light" data-filter="textanswers_reviewed"
data-bs-toggle="tooltip" data-bs-placement="top" data-container=".btn-switch"
title="{% translate 'Text answers reviewed' %}">
<span class="fas fa-comment icon-green"></span>
<span class="fas fa-comment icon-success"></span>
</button>
</div>
<div class="btn-switch btn-group icon-buttons">
Expand All @@ -355,17 +355,17 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
<button type="button" class="btn btn-sm btn-light" data-filter="results_not_yet_published"
data-bs-toggle="tooltip" data-bs-placement="top" data-container=".btn-switch"
title="{% translate 'Results not yet published' %}">
<span class="fas fa-chart-simple icon-blue"></span>
<span class="fas fa-chart-simple icon-primary"></span>
</button>
<button type="button" class="btn btn-sm btn-light" data-filter="results_not_published"
data-bs-toggle="tooltip" data-bs-placement="top" data-container=".btn-switch"
title="{% translate 'Results not yet published although grading process is finished' %}">
<span class="fas fa-chart-simple icon-red"></span>
<span class="fas fa-chart-simple icon-danger"></span>
</button>
<button type="button" class="btn btn-sm btn-light" data-filter="results_published"
data-bs-toggle="tooltip" data-bs-placement="top" data-container=".btn-switch"
title="{% translate 'Results published' %}">
<span class="fas fa-chart-simple icon-green"></span>
<span class="fas fa-chart-simple icon-success"></span>
</button>
</div>
</div>
Expand Down Expand Up @@ -458,13 +458,13 @@ <h3 class="m-0 me-1">{{ semester.name }}</h3>
</button>
<button name="target_state" value="{{ Evaluation.State.PUBLISHED }}" type="submit" class="btn btn-sm btn-light"
data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Unpublished evaluations' %}">
<span class="fas fa-chart-simple icon-blue"></span>
<span class="fas fa-chart-simple icon-red"></span>
<span class="fas fa-chart-simple icon-primary"></span>
<span class="fas fa-chart-simple icon-danger"></span>
{% translate 'Publish' %}
</button>
<button name="target_state" value="{{ Evaluation.State.REVIEWED }}" type="submit" class="btn btn-sm btn-light"
data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Published evaluations' %}">
<span class="fas fa-chart-simple icon-green"></span>
<span class="fas fa-chart-simple icon-success"></span>
{% translate 'Unpublish' %}
</button>
</div>
Expand Down
14 changes: 7 additions & 7 deletions evap/staff/templates/staff_semester_view_evaluation.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</td>
{% elif state >= evaluation.State.EVALUATED %}
<td class="icon" data-col="state-evaluating" data-order="3" data-filter="evaluated">
<span class="fas fa-stop icon-green" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Evaluated' %}"></span>
<span class="fas fa-stop icon-success" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Evaluated' %}"></span>
</td>
{% endif %}

Expand All @@ -43,15 +43,15 @@
</td>
{% elif evaluation.textanswer_review_state == evaluation.TextAnswerReviewState.REVIEW_URGENT %}
<td class="icon" data-col="state-textanswers" data-order="1" data-filter="unreviewed_textanswers_urgent">
<span class="fas fa-comment icon-red" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Text answers awaiting urgent review because grading process is finished' %}"></span>
<span class="fas fa-comment icon-danger" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Text answers awaiting urgent review because grading process is finished' %}"></span>
</td>
{% elif evaluation.textanswer_review_state == evaluation.TextAnswerReviewState.REVIEW_NEEDED %}
<td class="icon" data-col="state-textanswers" data-order="2" data-filter="unreviewed_textanswers">
<span class="fas fa-comment icon-blue" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Text answers awaiting review' %}"></span>
<span class="fas fa-comment icon-primary" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Text answers awaiting review' %}"></span>
</td>
{% else %}
<td class="icon" data-col="state-textanswers" data-order="4" data-filter="textanswers_reviewed">
<span class="fas fa-comment icon-green" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Text answers reviewed' %}"></span>
<span class="fas fa-comment icon-success" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Text answers reviewed' %}"></span>
</td>
{% endif %}

Expand All @@ -62,16 +62,16 @@
{% elif state == evaluation.State.REVIEWED %}
{% if evaluation.grading_process_is_finished %}
<td class="icon text-center" data-col="state-results" data-order="0" data-filter="results_not_published">
<span class="fas fa-chart-simple icon-red" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Results not yet published although grading process is finished' %}"></span>
<span class="fas fa-chart-simple icon-danger" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Results not yet published although grading process is finished' %}"></span>
</td>
{% else %}
<td class="icon text-center" data-col="state-results" data-order="1" data-filter="results_not_yet_published">
<span class="fas fa-chart-simple icon-blue" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Results not yet published' %}"></span>
<span class="fas fa-chart-simple icon-primary" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Results not yet published' %}"></span>
</td>
{% endif %}
{% elif state == evaluation.State.PUBLISHED %}
<td class="icon" data-col="state-results" data-order="3" data-filter="results_published">
<span class="fas fa-chart-simple icon-green" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Results published' %}"></span>
<span class="fas fa-chart-simple icon-success" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Results published' %}"></span>
</td>
{% endif %}

Expand Down
Loading