Skip to content

Commit

Permalink
change icon-yellow to icon-blue to enable better differentiation (yel…
Browse files Browse the repository at this point in the history
…low/green was too similar)
  • Loading branch information
janno42 committed Sep 9, 2024
1 parent 5a60f6d commit ead8ffd
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 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-yellow",
"fas fa-circle icon-blue",
Evaluation.State.NEW,
_("In preparation"),
),
Expand All @@ -60,7 +60,7 @@
),
Evaluation.State.EDITOR_APPROVED: StateValues(
1,
"far fa-square-check icon-yellow",
"far fa-square-check icon-blue",
Evaluation.State.EDITOR_APPROVED,
_("Approved by editor, awaiting manager review"),
),
Expand Down
4 changes: 2 additions & 2 deletions evap/results/templates/results_index_evaluation_impl.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,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-yellow" title="{% translate 'Results not yet published' %}"></span>
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-chart-simple icon-blue" title="{% translate 'Results not yet published' %}"></span>
{% elif evaluation.state == evaluation.State.REVIEWED %}
{% if evaluation.is_single_result or 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>
{% else %}
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-chart-simple icon-yellow" title="{% translate 'Results not yet published' %}"></span>
<span data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-chart-simple icon-blue" title="{% translate 'Results not yet published' %}"></span>
{% endif %}
{% endif %}
</span>
Expand Down
6 changes: 3 additions & 3 deletions evap/staff/templates/staff_semester_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ <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-yellow"></span>
<span class="fas fa-comment icon-blue"></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"
Expand All @@ -363,7 +363,7 @@ <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-yellow"></span>
<span class="fas fa-chart-simple icon-blue"></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"
Expand Down Expand Up @@ -453,7 +453,7 @@ <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-yellow"></span>
<span class="fas fa-chart-simple icon-blue"></span>
<span class="fas fa-chart-simple icon-red"></span>
{% translate 'Publish' %}
</button>
Expand Down
4 changes: 2 additions & 2 deletions evap/staff/templates/staff_semester_view_evaluation.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</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-yellow" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Text answers awaiting review' %}"></span>
<span class="fas fa-comment icon-blue" 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">
Expand All @@ -67,7 +67,7 @@
</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-yellow" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Results not yet published' %}"></span>
<span class="fas fa-chart-simple icon-blue" data-bs-toggle="tooltip" data-bs-placement="top" title="{% translate 'Results not yet published' %}"></span>
</td>
{% endif %}
{% elif state == evaluation.State.PUBLISHED %}
Expand Down
4 changes: 2 additions & 2 deletions evap/static/scss/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
color: $evap-red !important;
}

.icon-yellow {
color: $evap-dark-yellow !important;
.icon-blue {
color: $evap-dark-blue !important;
}

.icon-green {
Expand Down

0 comments on commit ead8ffd

Please sign in to comment.