diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/src/test/resources/templates/mentions/mention.html b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/src/test/resources/templates/mentions/mention.html index d88de1ca5163816a70ba65b8075433ad249becf4..2baf8041902d2bc4ccb21cd2024c9fe3511de6ef 100644 --- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/src/test/resources/templates/mentions/mention.html +++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/src/test/resources/templates/mentions/mention.html @@ -16,9 +16,9 @@ <div><small class="text-muted">one hundred years ago</small></div> </div> - <button class="btn btn-xs toggle-notification-event-details" type="submit"> + <button class="btn btn-xs toggle-notification-event-details" type="submit" + aria-label="notifications.macro.showEventDetails" title="notifications.macro.showEventDetails"> <span class="fa fa-ellipsis-h"></span> - <span class="sr-only">notifications.macro.showEventDetails</span> </button> </div> <div class="col-xs-12 clearfix"> @@ -43,4 +43,4 @@ </tr> </table> </div> -</div> \ No newline at end of file +</div> diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/src/main/resources/XWiki/Notifications/Code/Macro/NotificationsMacro.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/src/main/resources/XWiki/Notifications/Code/Macro/NotificationsMacro.xml index 3188cb0f9db907decff3650fd4ac5bef86228aeb..4c0701a46377d841efded55909efee3cdd17e815 100644 --- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/src/main/resources/XWiki/Notifications/Code/Macro/NotificationsMacro.xml +++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/src/main/resources/XWiki/Notifications/Code/Macro/NotificationsMacro.xml @@ -424,9 +424,9 @@ readButton.addClass('notification-event-read-button').addClass('btn btn-xs'); // Insert the cross icon and an accessible label var readButtonIcon = $("$escapetool.javascript($services.icon.renderHTML('check'))"); - var readButtonLabel= $('<span class="sr-only"/>'); - readButtonLabel.text("$escapetool.javascript($services.localization.render('notifications.macro.markEventAsRead'))"); - readButton.append(readButtonIcon).append(readButtonLabel); + readButton.attr('aria-label', "$escapetool.javascript($services.localization.render('notifications.macro.markEventAsRead'))"); + readButton.attr('title', "$escapetool.javascript($services.localization.render('notifications.macro.markEventAsRead'))"); + readButton.append(readButtonIcon); // On click readButton.on('click', function() { var notif = $(this).parents('div.notification-event'); @@ -604,9 +604,9 @@ readButton.addClass('notification-event-read-button').addClass('btn btn-xs'); // Insert the cross icon and an accessible label var readButtonIcon = $("$escapetool.javascript($services.icon.renderHTML('check'))"); - var readButtonLabel= $('<span class="sr-only"/>'); - readButtonLabel.text("$escapetool.javascript($services.localization.render('notifications.macro.markEventAsRead'))"); - readButton.append(readButtonIcon).append(readButtonLabel); + readButton.attr('aria-label', "$escapetool.javascript($services.localization.render('notifications.macro.markEventAsRead'))"); + readButton.attr('title', "$escapetool.javascript($services.localization.render('notifications.macro.markEventAsRead'))"); + readButton.append(readButtonIcon); // On click readButton.on('click', function() { var notif = $(this).parents('div.notification-event'); diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm index 08572dc42f01db7093e08c29a6205d52ecc61c62..fb45209f54d0944842a5d76cfec144b75be479fc 100644 --- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm +++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm @@ -112,10 +112,11 @@ <div class="col-xs-9 notification-content"> $content #if ($stringtool.isNotBlank($details)) - <button class="btn btn-xs toggle-notification-event-details" type="submit"> - <span class="fa fa-ellipsis-h"></span> - <span class="sr-only">$services.localization.render('notifications.macro.showEventDetails')</span> - </button> + <button class="btn btn-xs toggle-notification-event-details" type="submit" + aria-label="$services.localization.render('notifications.macro.showEventDetails')" + title="$services.localization.render('notifications.macro.showEventDetails')"> + <span class="fa fa-ellipsis-h"></span> + </button> #end </div> #if ($stringtool.isNotBlank($details)) @@ -241,4 +242,4 @@ $xwiki.getPlainUserName($user)## <div><small class="text-muted">$escapetool.xml($services.date.displayTimeAgo($compositeEvent.dates.get(0)))</small></div> #end #displayNotificationEventSkeleton($icon, 'comment', $content, '') -#end \ No newline at end of file +#end