Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
janno42 committed Sep 24, 2023
2 parents 8dd30b5 + de46a49 commit d64ece3
Show file tree
Hide file tree
Showing 58 changed files with 2,988 additions and 1,336 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ not touched by the software license.

```
EvaP – Evaluation Platform
Copyright (C) 2011-2022 by Johannes Wolf, Johannes Linke, Michael Grünewald,
Copyright (C) 2011-2023 by Johannes Wolf, Johannes Linke, Michael Grünewald,
Stefan Richter, and Richard Ebeling
Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
8 changes: 7 additions & 1 deletion evap/contributor/templates/contributor_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<a href="{% url 'contributor:export' %}" class="btn btn-sm btn-light">{% trans 'Export results' %}</a>
</div>
{% if user.is_delegate %}
<div class="btn-switch btn-switch-light mb-auto ms-2 d-print-none">
<div class="btn-switch btn-switch-light ms-2 d-print-none">
<div class="btn-switch-label"><span class="fas fa-people-arrows-left-right"></span> {% trans 'Delegated evaluations' %}</div>
<div class="btn-switch btn-group">
<a href="{% url 'contributor:index' %}?show_delegated=true" role="button" class="btn btn-sm btn-light{% if show_delegated %} active{% endif %}">
Expand All @@ -28,6 +28,12 @@
</div>
</div>
{% endif %}
{% if user.show_startpage_button %}
<div class="ms-2 d-print-none">
{% include 'startpage_button.html' with page='CO' btnClass='btn-sm' %}
</div>
{% endif %}

</div>

{% for semester in semester_list %}
Expand Down
Loading

0 comments on commit d64ece3

Please sign in to comment.