Skip to content

Commit 4320e4b

Browse files
ihalaij1ihalaij1
committed
Fix more UI issues
1 parent e25529f commit 4320e4b

29 files changed

Lines changed: 165 additions & 156 deletions

File tree

‎assets/css/main.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/main.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/participants.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ function participants_list(participants, api_url, is_teacher, enrollment_statuse
169169
confirm_remove_participant(participant, row, 'REMOVED', _('Remove'));
170170
})
171171
).append(' ').append(
172-
get_row_action(_('Ban'), 'dash-circle-fill', function () {
172+
get_row_action(_('Ban'), 'ban', function () {
173173
confirm_remove_participant(participant, row, 'BANNED', _('Ban'));
174174
})
175175
);

‎assets/js/table.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ $(function() {
176176
const filterForm = $('<form/>');
177177
const filterOptions = column.data('filter-options').trim().split('|');
178178
filterOptions.forEach(function(option) {
179-
const input = $('<input type="checkbox">')
179+
const input = $('<input class="form-check-input" type="checkbox">')
180180
.attr('value', option)
181181
.data('column', i)
182182
.on('change', filterColumnWithOptions);

‎assets/sass/legacy/_main.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ iframe {
128128
}
129129

130130
.dropdown-toggle.btn {
131-
--bs-btn-border-width: 0;
132131
--bs-btn-focus-border-color: transparent;
133132
--bs-btn-active-border-color: transparent;
134133
}

‎course/templates/course/_siblings.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
{% endif %}
1212
{% if accessible and previous.is_revealed or accessible and previous.type == "module" %}
1313
<a href="{{ previous.link }}" class="nav-flex-left">
14-
<span aria-hidden="true">&laquo;</span> {{ previous.name|parse_localization }}
14+
<i class="bi bi-chevron-double-left" aria-hidden="true"></i> {{ previous.name|parse_localization }}
1515
</a>
1616
{% else %}
1717
<span class="text-muted disabled">
18-
<span aria-hidden="true">&laquo;</span> {{ previous.name|parse_localization }}
18+
<i class="bi bi-chevron-double-left" aria-hidden="true"></i> {{ previous.name|parse_localization }}
1919
{% if is_course_staff %}
2020
<a href="{{ previous.link }}">
2121
<i class="bi-lock" aria-hidden="true"></i>
@@ -42,11 +42,11 @@
4242
{% endif %}
4343
{% if accessible and next.is_revealed or accessible and next.type == "module" %}
4444
<a href="{{ next.link }}" class="nav-flex-right">
45-
{{ next.name|parse_localization }} <span aria-hidden="true">&raquo;</span>
45+
{{ next.name|parse_localization }} <i class="bi bi-chevron-double-right" aria-hidden="true"></i>
4646
</a>
4747
{% else %}
4848
<span class="text-muted disabled">
49-
{{ next.name|parse_localization }} <span aria-hidden="true">&raquo;</span>
49+
{{ next.name|parse_localization }} <i class="bi bi-chevron-double-right" aria-hidden="true"></i>
5050
{% if is_course_staff %}
5151
<a href="{{ next.link }}">
5252
<i class="bi-lock" aria-hidden="true"></i>

‎course/templates/course/staff/all_submissions_table.html‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -66,54 +66,54 @@
6666
<tbody>
6767
{% for summary in submission_data %}
6868
<tr id="summary.submission-{{ summary.submission.id }}">
69-
<td>
70-
{% profiles summary.submission.submitters.all instance summary.is_teacher %}
71-
</td>
72-
<td data-datetime="{{ summary.submission.submission_time|date:'Y-m-d H:i:s' }}">
73-
{{ summary.submission.submission_time|date:'DATETIME_SECONDS_FORMAT' }}
74-
{% if summary.submission.late_penalty_applied %}
75-
<span class="badge text-bg-warning">
76-
{% blocktranslate trimmed with percent=summary.submission.late_penalty_applied|percent %}
77-
LATE_W_PENALTY -- {{ percent }}
78-
{% endblocktranslate %}
79-
</span>
80-
{% endif %}
81-
</td>
82-
<td>
83-
{{ summary.submission.status|submission_status }}
84-
</td>
85-
<td>
86-
{% format_points summary.submission.grade True True %}
87-
</td>
88-
<td id="submission_tags">
89-
{% for tagging in summary.submission.submission_taggings.all %}
90-
{{ tagging.tag|colortag }}
91-
{% endfor %}
92-
</td>
93-
<td>
94-
{% if summary.submission.grader %}
95-
<span class="bi-check"></span>
96-
{% translate "YES" %}
97-
{% else %}
98-
<span class="bi-x"></span>
99-
{% translate "NO" %}
100-
{% endif %}
101-
</td>
102-
<td>
103-
<a href="{{ summary.submission|url:'submission-inspect' }}" class="aplus-button--secondary aplus-button--xs">
104-
<span class="bi-zoom-in" aria-hidden="true"></span>
105-
{% translate "INSPECT" %}
106-
</a>
107-
</td>
108-
<td>
109-
<a href="{{ summary.exercise|url }}">
110-
{{ summary.exercise | parse_localization }}
111-
</a>
112-
</td>
69+
<td>
70+
{% profiles summary.submission.submitters.all instance summary.is_teacher %}
71+
</td>
72+
<td data-datetime="{{ summary.submission.submission_time|date:'Y-m-d H:i:s' }}">
73+
{{ summary.submission.submission_time|date:'DATETIME_SECONDS_FORMAT' }}
74+
{% if summary.submission.late_penalty_applied %}
75+
<span class="badge text-bg-warning">
76+
{% blocktranslate trimmed with percent=summary.submission.late_penalty_applied|percent %}
77+
LATE_W_PENALTY -- {{ percent }}
78+
{% endblocktranslate %}
79+
</span>
80+
{% endif %}
81+
</td>
82+
<td>
83+
{{ summary.submission.status|submission_status }}
84+
</td>
85+
<td>
86+
{% format_points summary.submission.grade True True %}
87+
</td>
88+
<td id="submission_tags">
89+
{% for tagging in summary.submission.submission_taggings.all %}
90+
{{ tagging.tag|colortag }}
91+
{% endfor %}
92+
</td>
93+
<td>
94+
{% if summary.submission.grader %}
95+
<span class="bi-check"></span>
96+
{% translate "YES" %}
97+
{% else %}
98+
<span class="bi-x"></span>
99+
{% translate "NO" %}
100+
{% endif %}
101+
</td>
102+
<td>
103+
<a href="{{ summary.submission|url:'submission-inspect' }}" class="aplus-button--secondary aplus-button--xs">
104+
<span class="bi-zoom-in" aria-hidden="true"></span>
105+
{% translate "INSPECT" %}
106+
</a>
107+
</td>
108+
<td>
109+
<a href="{{ summary.exercise|url }}">
110+
{{ summary.exercise | parse_localization }}
111+
</a>
112+
</td>
113113
</tr>
114114
{% empty %}
115115
<tr>
116-
<td class="5">{% translate "NO_SUBMISSIONS" %}</td>
116+
<td colspan="8">{% translate "NO_SUBMISSIONS" %}</td>
117117
</tr>
118118
{% endfor %}
119119
</tbody>

‎course/templates/course/staff/groups.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<p>
1717
{% translate "NUMBER_OF_GROUPS" %} <strong>{{ groups|length }}</strong>
1818
<a class="aplus-button--default aplus-button--xs" role="button" href="{{ instance|url:'groups-add' }}">
19-
<i class="far fa-plus-sign" aria-hidden="true"></i>
19+
<i class="bi bi-plus-lg" aria-hidden="true"></i>
2020
{% translate "ADD_NEW" %}
2121
</a>
2222
</p>
@@ -38,11 +38,11 @@
3838
<td>{{ group.timestamp }}</td>
3939
<td>
4040
<a class="aplus-button--secondary aplus-button--xs" role="button" href="{% url 'groups-edit' course_slug=course.url instance_slug=instance.url group_id=group.id %}">
41-
<i class="bi-pencil-square" aria-hidden="true"></i>
41+
<i class="bi bi-pencil-square" aria-hidden="true"></i>
4242
{% translate "EDIT" %}
4343
</a>
4444
<a class="aplus-button--danger aplus-button--xs" role="button" href="{% url 'groups-delete' course_slug=course.url instance_slug=instance.url group_id=group.id %}">
45-
<i class="bi-x-lg" aria-hidden="true"></i>
45+
<i class="bi bi-x-lg" aria-hidden="true"></i>
4646
{% translate "REMOVE" %}
4747
</a>
4848
</td>

‎course/templates/course/staff/participants.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{% if is_teacher %}
1818
<p>
1919
<a class="aplus-button--default aplus-button--sm" role="button" href="{{ instance|url:'enroll-students' }}">
20-
<i class="bi-person-fill" aria-hidden="true"></i>
20+
<i class="bi bi-person-fill" aria-hidden="true"></i>
2121
{% translate "ENROLL_STUDENTS" %}
2222
</a>
2323
</p>
@@ -26,17 +26,17 @@
2626
<small class="text-body-secondary">{% trans "FILTER_USERS_BY_TAG" %}:</small>
2727
{% for tag in tags %}
2828
<button class="btn btn-sm filter-tag" style="background-color:{{ tag.color }};color:{{ tag.font_color }};" data-tagslug="{{ tag.slug }}">
29-
<i class="bi-square" aria-hidden="true"></i>
29+
<i class="bi bi-square" aria-hidden="true"></i>
3030
{{ tag.name }}
3131
</button>
3232
{% endfor %}
3333
<small class="text-body-secondary">{% trans "FILTER_USERS_BY_STATUS" %}:</small>
3434
{% for status_code, status_label in enrollment_statuses.items %}
3535
<button class="btn aplus-button--xs aplus-button--secondary filter-status" data-status="{{ status_code }}">
3636
{% if status_code == 'ACTIVE' %}
37-
<i class="bi-check-square" aria-hidden="true"></i>
37+
<i class="bi bi-check-square" aria-hidden="true"></i>
3838
{% else %}
39-
<i class="bi-square" aria-hidden="true"></i>
39+
<i class="bi bi-square" aria-hidden="true"></i>
4040
{% endif %}
4141
{{ status_label }}
4242
</button>
@@ -58,7 +58,7 @@
5858
<tr>
5959
{% if is_teacher %}
6060
<th data-filter-type="none" data-order-disable="true">
61-
<input type="checkbox" id="students-select-all" name="students" value="all" >
61+
<input class="form-check-input" type="checkbox" id="students-select-all" name="students" value="all" >
6262
</th>
6363
{% endif %}
6464
<th>{% trans "STUDENT_ID" %}</th>

‎deviations/templates/deviations/list_dl.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
<div class="col-md-12">
1616
<p>
1717
<a class="aplus-button--default aplus-button--xs" role="button" href="{{ instance|url:'deviations-add-dl' }}">
18-
<i class="bi-plus-lg" aria-hidden="true"></i>
18+
<i class="bi bi-plus-lg" aria-hidden="true"></i>
1919
{% translate "ADD_NEW_DEADLINE_DEVIATIONS" %}
2020
</a>
2121
<a class="aplus-button--default aplus-button--xs" href="{{ instance|url:'deviations-remove-dl' }}">
22-
<i class="bi-dash-circle-fill" aria-hidden="true"></i>
22+
<i class="bi bi-dash-lg" aria-hidden="true"></i>
2323
{% translate "REMOVE_DEADLINE_DEVIATIONS" %}
2424
</a>
2525
<a class="aplus-button--danger aplus-button--xs float-end" id="remove-selected-button" data-bs-toggle="modal" data-bs-target="#remove-selected-modal" role="button">
26-
<i class="bi-dash-circle-fill" aria-hidden="true"></i>
26+
<i class="bi bi-dash-lg" aria-hidden="true"></i>
2727
{% translate "REMOVE_SELECTED_DEVIATIONS" %}
2828
</a>
2929
</p>
@@ -76,10 +76,10 @@ <h5 class="card-title text-white">{% translate "DEADLINE_DEVIATIONS" %}</h5>
7676
</td>
7777
<td>
7878
{% if deviations.0.without_late_penalty %}
79-
<i class="bi-check-lg"></i>
79+
<i class="bi bi-check-lg"></i>
8080
{% translate "YES" %}
8181
{% else %}
82-
<i class="bi-x-lg"></i>
82+
<i class="bi bi-x-lg"></i>
8383
{% translate "NO" %}
8484
{% endif %}
8585
</td>
@@ -102,7 +102,7 @@ <h5 class="card-title text-white">{% translate "DEADLINE_DEVIATIONS" %}</h5>
102102
{% endif %}
103103
</td>
104104
<td>
105-
<input type="checkbox">
105+
<input class="form-check-input" type="checkbox">
106106
</td>
107107
</tr>
108108
{% endif %}
@@ -120,10 +120,10 @@ <h5 class="card-title text-white">{% translate "DEADLINE_DEVIATIONS" %}</h5>
120120
</td>
121121
<td>
122122
{% if deviation.without_late_penalty %}
123-
<i class="bi-check-lg"></i>
123+
<i class="bi bi-check-lg"></i>
124124
{% translate "YES" %}
125125
{% else %}
126-
<i class="bi-x-lg"></i>
126+
<i class="bi bi-x-lg"></i>
127127
{% translate "NO" %}
128128
{% endif %}
129129
</td>
@@ -142,7 +142,7 @@ <h5 class="card-title text-white">{% translate "DEADLINE_DEVIATIONS" %}</h5>
142142
{% endif %}
143143
</td>
144144
<td>
145-
<input type="checkbox" name="id" value="{{ deviation.id }}">
145+
<input class="form-check-input" type="checkbox" name="id" value="{{ deviation.id }}">
146146
</td>
147147
</tr>
148148
{% endfor %}

0 commit comments

Comments
 (0)