Skip to content

Commit

Permalink
Merge pull request #47 from uclouvain/feature/ON-9023
Browse files Browse the repository at this point in the history
Feature/on 9023
  • Loading branch information
mathieuzen authored Mar 12, 2024
2 parents fa1fd63 + c62b8ab commit ae988a8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
8 changes: 5 additions & 3 deletions frontend/NotificationViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
<a
class="dropdown-toggle nav-link"
data-toggle="dropdown"
data-bs-toggle="dropdown"
data-bs-auto-close="outside"
role="button"
aria-haspopup="true"
aria-expanded="false"
Expand All @@ -40,7 +42,7 @@
<span class="fas fa-bell" />
</div>
</a>
<ul class="dropdown-menu notification-dropdown">
<ul class="dropdown-menu notification-dropdown dropdown-menu-end">
<li
v-if="loading"
class="progress"
Expand All @@ -53,7 +55,7 @@
aria-valuemax="100"
style="width: 100%"
>
<span class="sr-only">
<span class="sr-only visually-hidden-focusable">
{{ $t('notification_viewer.loading') }}
</span>
</div>
Expand Down Expand Up @@ -87,7 +89,7 @@
</li>
<li
role="separator"
class="divider"
class="divider dropdown-divider"
/>
<NotificationEntry
v-for="notification in notifications"
Expand Down
1 change: 1 addition & 0 deletions frontend/components/NotificationEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
:checked="isSent"
type="radio"
data-toggle="tooltip"
data-bs-toggle="tooltip"
:data-original-title="isSent ? $t('notification.mark_as_read') : $t('notification.mark_as_unread')"
@click.prevent="$emit('toggle', uuid)"
>
Expand Down
2 changes: 1 addition & 1 deletion osis_notification/templatetags/osis_notification.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def notification_viewer(**kwargs):
for name, value in kwargs.items():
attrs['data-' + "-".join(name.lower().split("_"))] = escapejs(value)
return mark_safe(
'<li id="notification-viewer" class="dropdown" {}></li>'.format(
'<li id="notification-viewer" class="dropdown nav-item" {}></li>'.format(
" ".join('{}="{}"'.format(k, v) for k, v in attrs.items()),
)
)

0 comments on commit ae988a8

Please sign in to comment.