Fixed organisation member action button aria labels

locale/en_US/messages.php

@@ -206,6 +206,8 @@ return [
     'DELETED'                            => 'Deleted',
     'RETURN'                             => 'Return',
 
+    'ACTIONS_FOR'                        => 'Actions for',
+    
     'JOIN'                               => [
         1 => 'Join',
         'CANCEL' => 'Cancel join request',

src/Controller/OrganisationMembersController.php

@@ -1646,7 +1646,7 @@ class OrganisationMembersController extends SimpleController
         $this->sendRejectedEmail($requester, $organisation);
 
         $this->ci->userActivityLogger->info("User {$currentUser->user_name} rejected the request for user {$requester->user_name} to join organisation {$organisation->name}.", [
-            'type'    => 'organisation_member_approved',
+            'type'    => 'organisation_member_rejected',
             'user_id' => $currentUser->id,
         ]);
         

templates/tables/columns/organisation_members-actions.html.twig

@@ -3,45 +3,45 @@
         {% verbatim %}
         <td class="uf-table-fit-width">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button>
+                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-label="{% endverbatim %}{{translate("ACTIONS_FOR")}}{% verbatim %} {{row.full_name}} ({{row.user_name}})">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button>
                 <ul class="dropdown-menu dropdown-menu-right-responsive" role="menu">
                     {{#ifx row.membership_approved '!=' 1 }}
                     <li role="menuitem">
-                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-accept">
+                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-accept" aria-label="{% endverbatim %}{{translate("ORGANISATION.JOIN_REQUEST.ACCEPT")}}{% verbatim %} {{row.full_name}} ({{row.user_name}})">
                         <i class="fas fa-thumbs-up"></i> {% endverbatim %}{{translate("ORGANISATION.JOIN_REQUEST.ACCEPT")}}{% verbatim %}
                         </a>
                     </li>
                     <li role="menuitem">
-                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-reject">
+                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-reject" aria-label="{% endverbatim %}{{translate("ORGANISATION.JOIN_REQUEST.REJECT")}}{% verbatim %} {{row.full_name}} ({{row.user_name}})">
                         <i class="fas fa-thumbs-down"></i> {% endverbatim %}{{translate("ORGANISATION.JOIN_REQUEST.REJECT")}}{% verbatim %}
                         </a>
                     </li>
                     {{ else }}
                     {{#ifx row.organisation_admin '==' 1 }}
                     <li role="menuitem">
-                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-demote">
+                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-demote" aria-label="{% endverbatim %}{{translate("MEMBER.DEMOTE")}}{% verbatim %}: {{row.full_name}} ({{row.user_name}})">
                         <i class="fas fa-angle-double-down"></i> {% endverbatim %}{{translate("MEMBER.DEMOTE")}}{% verbatim %}
                         </a>
                     </li>
                     {{ else }}
                     <li role="menuitem">
-                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-promote">
+                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-promote" aria-label="{% endverbatim %}{{translate("MEMBER.PROMOTE")}}{% verbatim %}: {{row.full_name}} ({{row.user_name}})">
                         <i class="fas fa-angle-double-up"></i> {% endverbatim %}{{translate("MEMBER.PROMOTE")}}{% verbatim %}
                         </a>
                     </li>
                     {{/ifx}}
                     <li role="menuitem">
-                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-user-edit">
+                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-user-edit" aria-label="{% endverbatim %}{{translate("MEMBER.EDIT")}}{% verbatim %}: {{row.full_name}} ({{row.user_name}})">
                         <i class="fas fa-edit"></i> {% endverbatim %}{{translate("MEMBER.EDIT")}}{% verbatim %}
                         </a>
                     </li>
                     <li role="menuitem">
-                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-password">
+                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-password" aria-label="{% endverbatim %}{{translate("MEMBER.RESET_PASSWORD")}}{% verbatim %}: {{row.full_name}} ({{row.user_name}})">
                         <i class="fas fa-key"></i> {% endverbatim %}{{translate("MEMBER.RESET_PASSWORD")}}{% verbatim %}
                         </a>
                     </li>
                     <li role="menuitem">
-                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-remove">
+                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-member-remove" aria-label="{% endverbatim %}{{translate("MEMBER.REMOVE")}}{% verbatim %}: {{row.full_name}} ({{row.user_name}})">
                         <i class="fas fa-door-open"></i> {% endverbatim %}{{translate("MEMBER.REMOVE")}}{% verbatim %}
                         </a>
                     </li>

templates/tables/columns/organisations-join.html.twig

@@ -10,12 +10,12 @@
                         </button>
                     {{ else }}
                         {{#ifx row.is_member '==' 1 }}
-                            <button type="button" data-slug="{{row.slug}}" class="btn btn-danger js-organisation-leave" style="min-width: 70px">
+                            <button type="button" data-slug="{{row.slug}}" class="btn btn-danger js-organisation-leave" style="min-width: 70px" title="{% endverbatim %}{{translate("LEAVE")}}{% verbatim %} {{row.name}}" aria-label="{% endverbatim %}{{translate("LEAVE")}}{% verbatim %} {{row.name}}">
                                 {% endverbatim %}{{translate("LEAVE")}}{% verbatim %}
                             </button>
                         {{ else }}
                             {% endverbatim %}{% if (organisationConfig.membership.single_membership == 0) or ((current_user.organisations.count == 0) and (current_user.pendingOrganisations.count == 0)) %}{% verbatim %}
-                            <button type="button" data-slug="{{row.slug}}" class="btn btn-success js-organisation-join" style="min-width: 70px" title="{% endverbatim %}{{translate("JOIN")}}{% verbatim %} {{row.name}}">
+                            <button type="button" data-slug="{{row.slug}}" class="btn btn-success js-organisation-join" style="min-width: 70px" title="{% endverbatim %}{{translate("JOIN")}}{% verbatim %} {{row.name}}"  aria-label="{% endverbatim %}{{translate("JOIN")}}{% verbatim %} {{row.name}}">
                                 {% endverbatim %}{{translate("JOIN")}}{% verbatim %}
                             </button>
                             {% endverbatim %}{% endif %}{% verbatim %}