Fixed organisation member action button aria labels

assets/organisations/css/organisations.css

@@ -1,8 +1,15 @@
+.user-organisation-button {
+	font-size: 12pt;
+	background-color: #275D8B;
+	font-weight: bolder;
+}
+
 .organisation-admin {
-	color:  #56d773 !important;
+	color: #8BE49F !important;
+	/* color: #56d773 !important; */
 }
 .organisation-pending {
-	background-color:  #6c757d !important;
+	background-color:  #CED2D4 !important;
 }
 .membership-pending {
 	color:  #ffd24a !important;

assets/organisations/js/widgets/members.js

@@ -137,6 +137,33 @@ function bindMemberButtons(el, options) {
                 });
         });
     });
+
+
+    // Reset member password button
+    el.find('.js-member-password').click(function(e) {
+        e.preventDefault();
+
+        var userName = $(this).data('user_name');
+        $("body").ufModal({
+            sourceUrl: site.uri.public + '/modals/organisations/o/' + $(this).data('slug') + '/members/reset-password',
+            ajaxParams: {
+                slug: $(this).data('slug'),
+                user_name: $(this).data('user_name')
+            },
+            msgTarget: $("#alerts-page")
+        });
+
+        $("body").on('renderSuccess.ufModal', function() {
+            var modal = $(this).ufModal('getModal');
+            var form = modal.find('.js-form');
+
+            form.ufForm()
+                .on("submitSuccess.ufForm", function() {
+                    // Navigate or reload page on success
+                    window.location.reload();
+                });
+        });
+    });
 }
 
 // function bindMemberCreationButton(el) {

assets/organisations/js/widgets/organisations.js

@@ -189,6 +189,13 @@ function bindOrganisationButtons(el, options) {
             var options = {
                 ajax: {
                     url: site.uri.public + '/api/organisations',
+                    data: function (params) {
+                        return {
+                            filters: {
+                                info : params.term
+                            }
+                        };
+                    },
                     processResults: function (data) {
                         var items = data.rows.filter((i) =>  i.slug != organisation_slug);
                         return {

locale/en_US/messages.php

@@ -51,7 +51,7 @@ return [
         'DELETE_YES'                     => 'Yes, delete organisation',
         'DELETION_SUCCESSFUL'            => 'Successfully deleted organisation <strong>{{name}}</strong>',
 
-        'MEMBER_COUNT'                   => '# Members <sub>(excl admins)</sub>',
+        'MEMBER_COUNT'                   => '# Members',
         'ADMIN_COUNT'                    => '# Admins',
 
         'SELF'                           => [
@@ -155,6 +155,10 @@ return [
             'DEMOTE_CONFIRM_EXTRA'      => 'Once demoted they will no longer be able to manage members and agents on the organisation\'s behalf.',
             'DEMOTE_YES'                => 'Yes, demote administrator',
             'DEMOTE_SUCCESSFUL'         => 'Successfully demoted administrator <strong>{{user_name}}</strong> from being an administrator of organisation <strong>{{name}}</strong>',
+
+            'RESET_PASSWORD'             => 'Send password reset link',
+            'SEND_PASSWORD_LINK_CONFIRM' => 'Please confirm that you wish to send a password reset link to:<br><br> <strong>{{user_name}}</strong> ({{email}}).',
+            'PASSWORD_LINK_SENT'         => 'A password reset link has successfully been sent to <strong>{{email}}</strong>.'
         ],
     ],
 
@@ -168,7 +172,7 @@ return [
         'DEMOTE'            => 'Demote to member',
 
         'EDIT'              => 'Edit member',
-        'CHANGE_PASSWORD'   => 'Change member password',
+        'RESET_PASSWORD'    => 'Send password reset link',
     ],
 
     'ADMIN' => [
@@ -201,6 +205,8 @@ return [
     'VIEW_DELETED'                       => 'View deleted',
     'DELETED'                            => 'Deleted',
     'RETURN'                             => 'Return',
+
+    'ACTIONS_FOR'                        => 'Actions for',
     
     'JOIN'                               => [
         1 => 'Join',

routes/organisation-members.php

@@ -33,6 +33,8 @@ $app->group('/api/organisations/o/{slug}/members', function () {
 
     $this->put('/m/{user_name}/promote', 'UserFrosting\Sprinkle\Organisations\Controller\OrganisationMembersController:promote');
     $this->put('/m/{user_name}/demote', 'UserFrosting\Sprinkle\Organisations\Controller\OrganisationMembersController:demote');
+
+    $this->post('/m/{user_name}/password-reset', 'UserFrosting\Sprinkle\Organisations\Controller\OrganisationMembersController:createPasswordReset');
 })->add('authGuard')->add(new NoCache());
 
 
@@ -45,4 +47,5 @@ $app->group('/modals/organisations/o/{slug}/members', function () {
     $this->get('/confirm-reject', 'UserFrosting\Sprinkle\Organisations\Controller\OrganisationMembersController:getModalConfirmReject');
     $this->get('/confirm-promote', 'UserFrosting\Sprinkle\Organisations\Controller\OrganisationMembersController:getModalConfirmPromote');
     $this->get('/confirm-demote', 'UserFrosting\Sprinkle\Organisations\Controller\OrganisationMembersController:getModalConfirmDemote');
+    $this->get('/reset-password', 'UserFrosting\Sprinkle\Organisations\Controller\OrganisationMembersController:getModalResetPassword');
 })->add('authGuard')->add(new NoCache());

src/Controller/OrganisationController.php

@@ -255,7 +255,7 @@ class OrganisationController extends SimpleController
         // Check if name or slug already exists
         if (
             isset($data['name']) &&
-            $data['name'] != $organisation->name &&
+            strtolower($data['name']) != strtolower($organisation->name) &&
             $classMapper->getClassMapping('organisation')::findUnique($data['name'], 'name')
         ) {
             $ms->addMessageTranslated('danger', 'ORGANISATION.NAME.IN_USE', $data);

src/Controller/OrganisationMembersController.php

@@ -9,6 +9,7 @@
 
 namespace UserFrosting\Sprinkle\Organisations\Controller;
 
+use Carbon\Carbon;
 use Illuminate\Database\Capsule\Manager as Capsule;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -918,6 +919,81 @@ class OrganisationMembersController extends SimpleController
         return $response->withRedirect($this->ci->router->pathFor('uri_organisation', ['slug' => $organisation->slug]));
     }
 
+    /**
+     * Processes the request to send a user a password reset email.
+     *
+     * Processes the request from the user update form, checking that:
+     * 1. The target user's new email address, if specified, is not already in use;
+     * 2. The logged-in user has the necessary permissions to update the posted field(s);
+     * 3. We're not trying to disable the master account;
+     * 4. The submitted data is valid.
+     * This route requires authentication.
+     *
+     * Request type: POST
+     *
+     * @param Request  $request
+     * @param Response $response
+     * @param string[] $args
+     *
+     * @throws NotFoundException  If user is not found
+     * @throws ForbiddenException If user is not authorized to access page
+     */
+    public function createPasswordReset(Request $request, Response $response, array $args)
+    {
+        /** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
+        $authorizer = $this->ci->authorizer;
+
+        /** @var \UserFrosting\Support\Repository\Repository $config */
+        $config = $this->ci->config;
+
+        /** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
+        $currentUser = $this->ci->currentUser;
+
+        /** @var \UserFrosting\Sprinkle\Core\Alert\AlertStream $ms */
+        $ms = $this->ci->alerts;
+
+
+        // Get the username from the URL
+        $user = $this->getUserFromParams($args);
+
+        if (!$user) {
+            throw new NotFoundException();
+        }
+
+        // Access-controlled resource - check that currentUser has permission to edit "password" for this user
+        if (!$authorizer->checkAccess($currentUser, 'update_user_field', [
+            'user'   => $user,
+            'fields' => ['password'],
+        ])) {
+            throw new ForbiddenException();
+        }
+
+        // Begin transaction - DB will be rolled back if an exception occurs
+        Capsule::transaction(function () use ($user, $config) {
+            // Create a password reset and shoot off an email
+            $passwordReset = $this->ci->repoPasswordReset->create($user, $config['password_reset.timeouts.reset']);
+
+            // Create and send welcome email with password set link
+            $message = new TwigMailMessage($this->ci->view, 'mail/password-reset.html.twig');
+
+            $message->from($config['address_book.admin'])
+                    ->addEmailRecipient(new EmailRecipient($user->email, $user->full_name))
+                    ->addParams([
+                        'user'         => $user,
+                        'token'        => $passwordReset->getToken(),
+                        'request_date' => Carbon::now()->format('Y-m-d H:i:s'),
+                    ]);
+
+            $this->ci->mailer->send($message);
+        });
+
+        $ms->addMessageTranslated('success', 'ORGANISATION.MEMBER.PASSWORD_LINK_SENT', [
+            'email' => $user->email,
+        ]);
+
+        return $response->withJson([], 200);
+    }
+
 
     /**
      * Returns a list of organisation members.
@@ -1359,6 +1435,60 @@ class OrganisationMembersController extends SimpleController
         ]);
     }
 
+    /**
+     * Renders the modal form for sending a password reset to a member.
+     *
+     * This does NOT render a complete page.  Instead, it renders the HTML for the form, which can be embedded in other pages.
+     * This page requires authentication.
+     *
+     * Request type: GET
+     *
+     * @param Request  $request
+     * @param Response $response
+     * @param string[] $args
+     *
+     * @throws NotFoundException  If user is not found
+     * @throws ForbiddenException If user is not authorized to access page
+     */
+    public function getModalResetPassword(Request $request, Response $response, array $args)
+    {
+        /** @var \UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */
+        $authorizer = $this->ci->authorizer;
+
+        /** @var \UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface $currentUser */
+        $currentUser = $this->ci->currentUser;
+
+        /** @var \UserFrosting\Support\Repository\Repository $config */
+        $config = $this->ci->config;
+
+        // GET parameters
+        $params = $request->getQueryParams();
+
+        $user = $this->getUserFromParams($params);
+
+        $organisation = $this->getOrganisationFromParams($params);
+
+        // Check organisation & user exists
+        if (!$organisation || !$user) {
+            throw new NotFoundException();
+        }
+
+        // Access-controlled resource - check that currentUser has permission to edit "password" field for this user
+        if (!$authorizer->checkAccess($currentUser, 'update_user_field', [
+            'organisation' => $organisation,
+            'user'   => $user,
+            'fields' => ['password'],
+        ])) {
+            throw new ForbiddenException();
+        }
+
+        return $this->ci->view->render($response, 'modals/member-reset-password.html.twig', [
+            'user' => $user,
+            'organisation' => $organisation,
+            'page' => [],
+        ]);
+    }
+
 
     /**
      * Send approval email for specified organisation and confirmation to user.
@@ -1516,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,
         ]);
         

src/Controller/OrganisationRegistrationController.php

@@ -462,7 +462,7 @@ class OrganisationRegistrationController extends SimpleController
 
             // Record the event in the activity log
             $this->ci->userActivityLogger->info("User {$currentUser->user_name} denied the registration request for organisation {$organisation->name}.", [
-                'type'    => 'organisation_approved',
+                'type'    => 'organisation_denied',
                 'user_id' => $currentUser->id,
             ]);
         });
@@ -552,7 +552,7 @@ class OrganisationRegistrationController extends SimpleController
 
             // Record the event in the activity log
             $this->ci->userActivityLogger->info("User {$currentUser->user_name} denied the registration request for organisation {$organisation->name}.", [
-                'type'    => 'organisation_approved',
+                'type'    => 'organisation_denied',
                 'user_id' => $currentUser->id,
             ]);
         });

src/Database/Migrations/v1_0_0/OrganisationApprovalsTable.php

@@ -7,7 +7,7 @@
  * @license   https://git.avsdev.uk/avsdev/sprinkle-organisations/blob/master/LICENSE.md (LGPL-3.0 License)
  */
 
-namespace UserFrosting\Sprinkle\Organisations\Database\Migrations\v010;
+namespace UserFrosting\Sprinkle\Organisations\Database\Migrations\v1_0_0;
 
 use Illuminate\Database\Schema\Blueprint;
 use UserFrosting\Sprinkle\Core\Database\Migration;
@@ -25,7 +25,7 @@ class OrganisationApprovalsTable extends Migration
      * {@inheritdoc}
      */
     public static $dependencies = [
-        '\UserFrosting\Sprinkle\Account\Database\Migrations\v400\UsersTable',
+        '\UserFrosting\Sprinkle\Account\Database\Migrations\v430\UpdateUsersTable',
     ];
 
     /**

src/Database/Migrations/v1_0_0/OrganisationMembersTable.php

@@ -7,7 +7,7 @@
  * @license   https://git.avsdev.uk/avsdev/sprinkle-organisations/blob/master/LICENSE.md (LGPL-3.0 License)
  */
 
-namespace UserFrosting\Sprinkle\Organisations\Database\Migrations\v010;
+namespace UserFrosting\Sprinkle\Organisations\Database\Migrations\v1_0_0;
 
 use Illuminate\Database\Schema\Blueprint;
 use UserFrosting\Sprinkle\Organisations\Database\Models\Organisation;
@@ -29,8 +29,8 @@ class OrganisationMembersTable extends Migration
      * {@inheritdoc}
      */
     public static $dependencies = [
-        '\UserFrosting\Sprinkle\Account\Database\Migrations\v400\UsersTable',
+        '\UserFrosting\Sprinkle\Account\Database\Migrations\v430\UpdateUsersTable',
-        '\UserFrosting\Sprinkle\Organisations\Database\Migrations\v010\OrganisationsTable',
+        '\UserFrosting\Sprinkle\Organisations\Database\Migrations\v1_0_0\OrganisationsTable',
     ];
 
     /**

src/Database/Migrations/v1_0_0/OrganisationMembershipApprovalsTable.php

@@ -7,7 +7,7 @@
  * @license   https://git.avsdev.uk/avsdev/sprinkle-organisations/blob/master/LICENSE.md (LGPL-3.0 License)
  */
 
-namespace UserFrosting\Sprinkle\Organisations\Database\Migrations\v010;
+namespace UserFrosting\Sprinkle\Organisations\Database\Migrations\v1_0_0;
 
 use Illuminate\Database\Schema\Blueprint;
 use UserFrosting\Sprinkle\Core\Database\Migration;
@@ -25,7 +25,7 @@ class OrganisationMembershipApprovalsTable extends Migration
      * {@inheritdoc}
      */
     public static $dependencies = [
-        '\UserFrosting\Sprinkle\Account\Database\Migrations\v400\UsersTable',
+        '\UserFrosting\Sprinkle\Account\Database\Migrations\v430\UpdateUsersTable',
     ];
 
     /**

src/Database/Migrations/v1_0_0/OrganisationsTable.php

@@ -7,7 +7,7 @@
  * @license   https://git.avsdev.uk/avsdev/sprinkle-organisations/blob/master/LICENSE.md (LGPL-3.0 License)
  */
 
-namespace UserFrosting\Sprinkle\Organisations\Database\Migrations\v010;
+namespace UserFrosting\Sprinkle\Organisations\Database\Migrations\v1_0_0;
 
 use Illuminate\Database\Schema\Blueprint;
 use UserFrosting\Sprinkle\Organisations\Database\Models\Organisation;
@@ -27,7 +27,7 @@ class OrganisationsTable extends Migration
      * {@inheritdoc}
      */
     public static $dependencies = [
-        '\UserFrosting\Sprinkle\Account\Database\Migrations\v400\UsersTable',
+        '\UserFrosting\Sprinkle\Account\Database\Migrations\v430\UpdateUsersTable',
     ];
 
     /**

src/Database/ModelTraits/UserOrganisations.php

@@ -124,7 +124,7 @@ trait UserOrganisations {
     }
 
 
-    public function bootUserOrganisations()
+    static public function bootUserOrganisations()
     {
         static::deleting(function ($user) {
             if (!$user->deleteUserOrganisations($user->isForceDeleting())) {

src/Database/Seeds/OrganisationPermissions.php

@@ -50,6 +50,11 @@ class OrganisationPermissions extends BaseSeed
             'organisations-admin'  => Role::where('slug', 'organisations-admin')->first()->id,
         ];
 
+        $canAdminOrgUsers = "(has_role(self.id,{$roleIds['organisations-admin']}) || (has_matching_organisation(self.id,user.id,1) && !has_role(user.id,{$roleIds['organisations-admin']})))";
+        $canAdminOrgAdmins = "(has_role(self.id,{$roleIds['organisations-admin']}) || has_matching_organisation(self.id,user.id,1))";
+        $excludeMasters = "(!is_master(user.id) && !has_role(user.id,{$roleIds['site-admin']}))";
+        $isSelf = "equals_num(self.id,user.id)";
+
         return [
             'create_organisation' => new Permission([
                 'slug'        => 'create_organisation',
@@ -127,12 +132,6 @@ class OrganisationPermissions extends BaseSeed
             ]),
 
 
-            // 'view_organisation_members_field' => new Permission([
-            //     'slug'        => 'view_organisation_field',
-            //     'name'        => 'View organisation members field',
-            //     'conditions'  => "in(property,['members'])",
-            //     'description' => 'View members field of any organisation.',
-            // ]),
             'view_organisation_members' => new Permission([
                 'slug'        => 'view_organisation_field',
                 'name'        => 'View organisation members',
@@ -200,12 +199,12 @@ class OrganisationPermissions extends BaseSeed
             ]),
 
 
-            // 'uri_user_in_organisation' => new Permission([
+            'uri_user_in_organisation' => new Permission([
-            //     'slug'        => 'uri_user',
+                'slug'        => 'uri_user',
-            //     'name'        => 'View user',
+                'name'        => 'View user',
-            //     'conditions'  => "has_matching_organisation(self.id,user.id,true) && !is_master(user.id) && !has_role(user.id,{$roleIds['site-admin']}) && (!has_role(user.id,{$roleIds['organisations-admin']}) || equals_num(self.id,user.id))",
+                'conditions'  => "(($canAdminOrgAdmins && $excludeMasters) || $isSelf)",
-            //     'description' => 'View the user page of any user in your group, except the master user and Site and (global) Organisation Administrators (except yourself).',
+                'description' => 'View the user page of any user in your orgnisation, except the master user and Site and (global) Organisation Administrators (except yourself).',
-            // ]),
+            ]),
             'view_user_field' => new Permission([
                 'slug'        => 'view_user_field',
                 'name'        => 'View user',
@@ -215,35 +214,43 @@ class OrganisationPermissions extends BaseSeed
             'update_user_field' => new Permission([
                 'slug'        => 'update_user_field',
                 'name'        => 'Edit user',
-                'conditions'  => "!has_role(user.id,{$roleIds['site-admin']}) && subset(fields,['organisations'])",
+                'conditions'  => "$excludeMasters && subset(fields,['organisations'])",
                 'description' => 'Edit organisations for users who are not Site Administrators.',
             ]),
 
             'view_user_field_group' => new Permission([
                 'slug'        => 'view_user_field',
                 'name'        => 'View user',
-                'conditions'  => "equals_num(self.group_id,user.group_id) && !is_master(user.id) && !has_role(user.id,{$roleIds['site-admin']}) && (!has_role(user.id,{$roleIds['group-admin']}) || equals_num(self.id,user.id)) && in(property,['organisations'])",
+                'conditions'  => "equals_num(self.group_id,user.group_id) && $excludeMasters && (!has_role(user.id,{$roleIds['group-admin']}) || equals_num(self.id,user.id)) && in(property,['organisations'])",
                 'description' => 'View organisations of any user in your own group, except the master user and Site and Group Administrators (except yourself).',
             ]),
             'update_user_field_group' => new Permission([
                 'slug'        => 'update_user_field',
                 'name'        => 'Edit group user',
-                'conditions'  => "equals_num(self.group_id,user.group_id) && !is_master(user.id) && !has_role(user.id,{$roleIds['site-admin']}) && (!has_role(user.id,{$roleIds['group-admin']}) || equals_num(self.id,user.id)) && subset(fields,['organisations'])",
+                'conditions'  => "equals_num(self.group_id,user.group_id) && $excludeMasters && (!has_role(user.id,{$roleIds['group-admin']}) || equals_num(self.id,user.id)) && subset(fields,['organisations'])",
                 'description' => 'Edit organisations for users in your own group who are not Site or Group Administrators, except yourself.',
             ]),
 
-            'view_user_field_organisation' => new Permission([
+            'view_user_field_organisation_audit' => new Permission([
                 'slug'        => 'view_user_field',
                 'name'        => 'View user',
-                'conditions'  => "has_matching_organisation(self.id,user.id) && !is_master(user.id) && !has_role(user.id,{$roleIds['site-admin']}) && (!has_role(user.id,{$roleIds['organisations-admin']}) || equals_num(self.id,user.id)) && in(property,['user_name','name','email','locale','roles','group','activities','organisations'])",
+                'conditions'  => "(($canAdminOrgUsers && $excludeMasters) || $isSelf) && in(property,['activities'])",
                 'description' => 'View certain properties of any user in your own organisation, except the master user and Site and (global) Organisation Administrators (except yourself).',
             ]),
             'update_user_field_organisation' => new Permission([
                 'slug'        => 'update_user_field',
                 'name'        => 'Edit organisation user',
-                'conditions'  => "has_matching_organisation(self.id,user.id,true) && !is_master(user.id) && !has_role(user.id,{$roleIds['site-admin']}) && (!has_role(user.id,{$roleIds['organisations-admin']}) || equals_num(self.id,user.id)) && subset(fields,['name','email','locale','flag_enabled','flag_verified','password'])",
+
+                'conditions'  => "(($canAdminOrgUsers && $excludeMasters) || $isSelf) && subset(fields,['name','email','locale','flag_enabled','flag_verified','password'])",
                 'description' => 'Edit users in your own organisation who are not Site or (global) Organisation Administrators, except yourself.',
             ]),
+
+            'view_user_field_organisation' => new Permission([
+                'slug'        => 'view_user_field',
+                'name'        => 'View user',
+                'conditions'  => "(($canAdminOrgUsers && $excludeMasters) || $isSelf) && in(property,['user_name','name','email','locale','roles','group','organisations'])",
+                'description' => 'View certain properties of any user in your own organisation, except the master user and Site and (global) Organisation Administrators (except yourself).',
+            ]),
         ];
     }
 
@@ -304,6 +311,14 @@ class OrganisationPermissions extends BaseSeed
             ]);
         }
 
+        $roleUserAdmin = Role::where('slug', 'user-admin')->first();
+        if ($roleSiteAdmin) {
+            $roleSiteAdmin->permissions()->syncWithoutDetaching([
+                $permissions['view_user_field']->id,
+                $permissions['update_user_field']->id,
+            ]);
+        }
+
         $roleGroupAdmin = Role::where('slug', 'group-admin')->first();
         if ($roleGroupAdmin) {
             $roleGroupAdmin->permissions()->sync([
@@ -328,13 +343,15 @@ class OrganisationPermissions extends BaseSeed
 
                 $permissions['uri_organisation']->id,
                 $permissions['uri_organisations']->id,
+                $permissions['uri_user_in_organisation']->id,
                 $permissions['uri_deleted_organisations']->id,
 
                 $permissions['view_organisation_members']->id,
                 $permissions['promote_organisation_member']->id,
 
-                #$permissions['view_user_field']->id,
+                $permissions['view_user_field_organisation_audit']->id,
-                #$permissions['update_user_field']->id,
+                $permissions['view_user_field_organisation']->id,
+                $permissions['update_user_field_organisation']->id,
             ]);
         }
 
@@ -352,6 +369,7 @@ class OrganisationPermissions extends BaseSeed
 
                 $permissions['uri_organisation_own']->id,
                 $permissions['uri_organisations']->id,
+                $permissions['uri_user_in_organisation']->id,
 
                 $permissions['view_user_field_organisation']->id,
                 $permissions['update_user_field_organisation']->id,

src/ServicesProvider/ServicesProvider.php

@@ -67,8 +67,10 @@ class ServicesProvider
              */
             $authorizer->addCallback('has_organisation', function ($user_id) {
                 $query = Capsule::table('organisation_members')
+                    ->join('organisations', 'organisation_members.organisation_id', 'organisations.id')
                     ->where('user_id', $user_id)
-                    ->where('flag_approved', true);
+                    ->where('organisation_members.flag_approved', true)
+                    ->where('organisations.flag_approved', true);
 
                 return $query->count() > 0;
             });
@@ -101,11 +103,12 @@ class ServicesProvider
              * @return bool true if $user is an administrator of $organisation.
              */
             $authorizer->addCallback('is_organisation_admin', function ($user_id, $organisation_id) {
-                return Capsule::table('organisation_members')
+                $query = Capsule::table('organisation_members')
                     ->where('user_id', $user_id)
                     ->where('organisation_id', $organisation_id)
-                    ->where('flag_admin', true)
+                    ->where('flag_admin', true);
-                    ->count() > 0;
+
+                return $query->count() > 0;
             });
 
             /*

src/Sprunje/OrganisationSprunje.php

@@ -125,6 +125,31 @@ class OrganisationSprunje extends Sprunje
         return $this;
     }
 
+    /**
+     * Filter by description (case insensitive).
+     *
+     * @param Builder $query
+     * @param mixed   $value
+     *
+     * @return self
+     */
+    protected function filterInfo($query, $value)
+    {
+        // Split value on separator for OR queries
+        $values = explode($this->orSeparator, $value);
+        $query->where(function ($query) use ($values) {
+            foreach ($values as $value) {
+                $query->orWhereRaw(
+                    'LOWER(name) LIKE ?', [ '%' . strtolower($value) . '%' ]
+                )->orWhereRaw(
+                    'LOWER(description) LIKE ?', [ '%' . strtolower($value) . '%' ]
+                );
+            }
+        });
+
+        return $this;
+    }
+
     /**
      * Return a list of possible user statuses.
      *

src/Sprunje/UserSprunje.php

@@ -12,7 +12,7 @@ namespace UserFrosting\Sprinkle\Organisations\Sprunje;
 use Illuminate\Database\Schema\Builder;
 use UserFrosting\Sprinkle\Core\Facades\Translator;
 use UserFrosting\Sprinkle\Core\Sprunje\Sprunje;
-use UserFrosting\Sprinkle\Admin\Sprunje\UserSprunje as UFUserSprunje;
+use UserFrosting\Sprinkle\UFTweaks\Sprunje\UserSprunje as UFUserSprunje;
 
 /**
  * UserSprunje.
@@ -29,8 +29,10 @@ class UserSprunje extends UFUserSprunje
         'last_activity',
         'status',
     ];
+    
     protected $sortable = [
         'name',
+        'organisations',
         'last_activity',
         'status',
     ];
@@ -56,6 +58,7 @@ class UserSprunje extends UFUserSprunje
      */
     protected function sortOrganisations($query, $direction)
     {
+        $query = $query->addSelect('organisations.name');
         $query->orderBy('organisations.name', $direction);
 
         return $this;
@@ -75,13 +78,64 @@ class UserSprunje extends UFUserSprunje
         $values = explode($this->orSeparator, $value);
         $query->where(function ($query) use ($values) {
             foreach ($values as $value) {
-                $query->orLike('organisations.name', $value);
+                $likeValue = '%' . mb_strtolower($value) . '%';
+                $query->orWhereRaw('LOWER(organisations.name) LIKE ?', $likeValue);
             }
         });
 
         return $this;
     }
 
+    /**
+     * Sort based on last activity time.
+     *
+     * @param Builder $query
+     * @param string  $direction
+     *
+     * @return self
+     */
+    protected function sortLastActivity($query, $direction)
+    {
+        $query = $query->addSelect('activities.occurred_at');
+        $query->orderBy('activities.occurred_at', $direction);
+
+        return $this;
+    }
+
+    /**
+     * Sort based on last name.
+     *
+     * @param Builder $query
+     * @param string  $direction
+     *
+     * @return self
+     */
+    protected function sortName($query, $direction)
+    {
+        $query = $query->addSelect('last_name');
+        $query = $query->addSelect('first_name');
+        $query->orderBy('last_name', $direction)->orderBy('first_name', $direction);
+
+        return $this;
+    }
+
+    /**
+     * Sort active, unactivated, disabled.
+     *
+     * @param Builder $query
+     * @param string  $direction
+     *
+     * @return self
+     */
+    protected function sortStatus($query, $direction)
+    {
+        $query = $query->addSelect('flag_enabled');
+        $query = $query->addSelect('flag_verified');
+        $query->orderBy('flag_enabled', $direction)->orderBy('flag_verified', $direction);
+
+        return $this;
+    }
+
     /**
      * Get the unpaginated count of items (before filtering) in this query.
      *

src/Twig/OrganisationsExtension.php

@@ -77,7 +77,7 @@ class OrganisationsExtension extends AbstractExtension implements GlobalsInterfa
         ];
     }
 
-    public function getGlobals()
+    public function getGlobals(): array
     {
         $config = $this->services->config['organisation'];
 

templates/modals/confirm-accept-organisation-join-request.html.twig

@@ -7,10 +7,10 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>
+    <p>
         {{translate("ORGANISATION.JOIN_REQUEST.ACCEPT_CONFIRM", {name: organisation.name, agent_name: agent.name})}}<br>
         <small>{{translate("ORGANISATION.JOIN_REQUEST.ACCEPT_CONFIRM_EXTRA", {name: organisation.name, agent_name: agent.name})}}</small>
-    </h4>
+    </p>
     <br>
     <div class="btn-group-action">
         <button type="submit" class="btn btn-success btn-lg btn-block">{{translate("ORGANISATION.JOIN_REQUEST.ACCEPT_YES")}}</button>

templates/modals/confirm-cancel-organisation-join.html.twig

@@ -7,7 +7,7 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>{{translate("ORGANISATION.JOIN_REQUEST.CANCEL_CONFIRM", {name: organisation.name})}}{% if delete_hard %}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small>{% endif %}</h4>
+    <p>{{translate("ORGANISATION.JOIN_REQUEST.CANCEL_CONFIRM", {name: organisation.name})}}{% if delete_hard %}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small>{% endif %}</p>
     <br>
     <div class="btn-group-action">
         <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ORGANISATION.JOIN_REQUEST.CANCEL_YES")}}</button>

templates/modals/confirm-cancel-organisation-registration.html.twig

@@ -7,7 +7,7 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>{{translate("ORGANISATION.REGISTRATION.CANCEL_CONFIRM", {name: organisation.name})}}{% if delete_hard %}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small>{% endif %}</h4>
+    <p>{{translate("ORGANISATION.REGISTRATION.CANCEL_CONFIRM", {name: organisation.name})}}{% if delete_hard %}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small>{% endif %}</p>
     <br>
     <div class="btn-group-action">
         <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ORGANISATION.REGISTRATION.CANCEL_YES")}}</button>

templates/modals/confirm-delete-organisation.html.twig

@@ -7,7 +7,7 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>{{translate("ORGANISATION.DELETE_CONFIRM", {name: organisation.name})}}{% if delete_hard %}<br><small>{{translate("DELETE_CANNOT_UNDONE")}}</small>{% endif %}</h4>
+    <p>{{translate("ORGANISATION.DELETE_CONFIRM", {name: organisation.name})}}{% if delete_hard %}<br><small>{{translate("DELETE_CANNOT_UNDONE")}}</small>{% endif %}</p>
     <br>
     <div class="btn-group-action">
         <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ORGANISATION.DELETE_YES")}}</button>

templates/modals/confirm-demote-organisation-member.html.twig

@@ -7,7 +7,7 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>{{translate("ORGANISATION.MEMBER.DEMOTE_CONFIRM", {user_name: user.user_name, name: organisation.name})}}<br><small>{{translate("ORGANISATION.MEMBER.DEMOTE_CONFIRM_EXTRA")}}</small></h4>
+    <p>{{translate("ORGANISATION.MEMBER.DEMOTE_CONFIRM", {user_name: user.user_name, name: organisation.name})}}<br><small>{{translate("ORGANISATION.MEMBER.DEMOTE_CONFIRM_EXTRA")}}</small></p>
     <br>
     <div class="btn-group-action">
         <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ORGANISATION.MEMBER.DEMOTE_YES")}}</button>

templates/modals/confirm-join-organisation.html.twig

@@ -8,12 +8,12 @@
     <div class="js-form-alerts">
     </div>
     {% if approval_required %}
-    <h4>
+    <p>
         {{translate("ORGANISATION.JOIN_REQUEST.REQUEST_CONFIRM", {name: organisation.name})}}
         <small>{{translate("ORGANISATION.JOIN_REQUEST.APPROVAL_REQUIRED")}}</small>
-    </h4>
+    </p>
     {% else %}
-    <h4>{{translate("ORGANISATION.JOIN_CONFIRM", {name: organisation.name})}}</h4>
+    <p>{{translate("ORGANISATION.JOIN_CONFIRM", {name: organisation.name})}}</p>
     {% endif %}
     <br>
     <div class="btn-group-action">

templates/modals/confirm-leave-organisation.html.twig

@@ -7,7 +7,7 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>{{translate("ORGANISATION.LEAVE_CONFIRM", {name: organisation.name})}}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small></h4>
+    <p>{{translate("ORGANISATION.LEAVE_CONFIRM", {name: organisation.name})}}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small></p>
     <br>
     <div class="btn-group-action">
         <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ORGANISATION.LEAVE_YES")}}</button>

templates/modals/confirm-permenent-delete-organisation.html.twig

@@ -7,7 +7,7 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>{{translate("ORGANISATION.PERMENENT_DELETE_CONFIRM", {name: organisation.name})}}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small></h4>
+    <p>{{translate("ORGANISATION.PERMENENT_DELETE_CONFIRM", {name: organisation.name})}}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small></p>
     <br>
     <div class="btn-group-action">
         <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ORGANISATION.PERMENENT_DELETE_YES")}}</button>

templates/modals/confirm-promote-organisation-member.html.twig

@@ -7,7 +7,7 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>{{translate("ORGANISATION.MEMBER.PROMOTE_CONFIRM", {user_name: user.user_name, name: organisation.name})}}</h4>
+    <p>{{translate("ORGANISATION.MEMBER.PROMOTE_CONFIRM", {user_name: user.user_name, name: organisation.name})}}</p>
     <br>
     <p>{{translate("ORGANISATION.MEMBER.PROMOTE_CONFIRM_EXTRA")}}</p>
     <br>

templates/modals/confirm-reject-organisation-join-request.html.twig

@@ -7,10 +7,10 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>
+    <p>
         {{translate("ORGANISATION.JOIN_REQUEST.REJECT_CONFIRM", {name: organisation.name, agent_name: agent.name})}}<br>
         <small>{{translate("ORGANISATION.JOIN_REQUEST.REJECT_CONFIRM_EXTRA", {name: organisation.name, agent_name: agent.name})}}</small>
-    </h4>
+    </p>
     <br>
     <div class="btn-group-action">
         <button type="submit" class="btn btn-success btn-lg btn-block">{{translate("ORGANISATION.JOIN_REQUEST.REJECT_YES")}}</button>

templates/modals/confirm-remove-organisation-member.html.twig

@@ -7,7 +7,7 @@
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
-    <h4>{{translate("ORGANISATION.MEMBER.REMOVE_CONFIRM", {user_name: user.user_name, name: organisation.name})}}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small></h4>
+    <p>{{translate("ORGANISATION.MEMBER.REMOVE_CONFIRM", {user_name: user.user_name, name: organisation.name})}}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small></p>
     <br>
     <div class="btn-group-action">
         <button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ORGANISATION.MEMBER.REMOVE_YES")}}</button>

templates/modals/member-reset-password.html.twig

@@ -0,0 +1,32 @@
+{% extends "modals/modal.html.twig" %}
+
+{% block modal_title %}{{translate("ORGANISATION.MEMBER.RESET_PASSWORD")}}{% endblock %}
+
+{% block modal_body %}
+<form class="js-form" method="POST" action="{{site.uri.public}}/api/organisations/o/{{organisation.slug}}/members/m/{{user.user_name}}/password-reset">
+    {% include "forms/csrf.html.twig" %}
+    <div class="js-form-alerts">
+    </div>
+    <div class="row">
+        <div class="col-sm-12">
+            {{translate("ORGANISATION.MEMBER.SEND_PASSWORD_LINK_CONFIRM", {
+                'user_name': user.user_name,
+                'email': user.email
+            })}}
+        </div>
+    </div>
+    <br>
+    <div class="row">
+        <div class="col-xs-8 col-sm-4">
+            <button type="submit" class="btn btn-block btn-lg btn-success">{{translate('CONFIRM')}}</button>
+        </div>
+        <div class="col-xs-4 col-sm-3 pull-right">
+            <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate('CANCEL')}}</button>
+        </div>
+    </div>
+</form>
+<!-- Include validation rules -->
+<script>
+    {% include "pages/partials/page.js.twig" %}
+</script>
+{% endblock %}

templates/modals/organisation-merge.html.twig

@@ -9,7 +9,7 @@
     <div class="js-form-alerts">
     </div>
     <div class="js-form-organisations">
-        <h4>{{translate("ORGANISATION.MERGE_INFORM", {name: organisation.name})}}<br><small>{{translate("MERGE_CANNOT_UNDONE")}}</small></h4>
+        <p>{{translate("ORGANISATION.MERGE_INFORM", {name: organisation.name})}}<br><small>{{translate("MERGE_CANNOT_UNDONE")}}</small></p>
         <div class="padding-bottom">
             <label>{{translate("MERGE_INTO")}}:</label>
             <select class="form-control js-select-new" type="text" name="target_slug"></select>

templates/pages/deleted-organisations.html.twig

@@ -1,4 +1,4 @@
-{% extends "@admin/pages/abstract/dashboard.html.twig" %}
+{% extends "pages/abstract/dashboard.html.twig" %}
 
 {% block stylesheets_page %}
     <!-- Page-specific CSS asset bundle -->

templates/pages/organisation.html.twig

@@ -1,4 +1,4 @@
-{% extends "@admin/pages/abstract/dashboard.html.twig" %}
+{% extends "pages/abstract/dashboard.html.twig" %}
 
 {% block stylesheets_page %}
     <!-- Page-specific CSS asset bundle -->
@@ -16,12 +16,12 @@
             {% block summary %}
             <div id="view-organisation" class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{translate('ORGANISATION.SUMMARY')}}</h3>
+                    <h2 class="box-title">{{translate('ORGANISATION.SUMMARY')}}</h2>
                     {% block menu_tools %}
                     {% if 'tools' not in tools.hidden %}
                         <div class="box-tools pull-right">
                             <div class="btn-group">
-                                <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="Expand organisation tools menu">
                                   <i class="fas fa-cog"></i> <span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu box-tool-menu">
@@ -117,7 +117,7 @@
             {% block members %}
             <div id="widget-organisation-members" class="box box-primary">
                 <div class="box-header">
-                    <h3 class="box-title"><i class="fas fa-fw fa-user"></i> {{translate('MEMBER', 2)}}</h3>
+                    <h2 class="box-title"><i class="fas fa-fw fa-user"></i> {{translate('MEMBER', 2)}}</h2>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">

templates/pages/organisations.html.twig

@@ -1,4 +1,4 @@
-{% extends "@admin/pages/abstract/dashboard.html.twig" %}
+{% extends "pages/abstract/dashboard.html.twig" %}
 
 {% block stylesheets_page %}
     <!-- Page-specific CSS asset bundle -->
@@ -15,7 +15,7 @@
         <div class="col-md-12">
             <div id="widget-organisations" class="box box-primary">
                 <div class="box-header">
-                    <h3 class="box-title"><i class="fas fa-fw fa-sitemap"></i> {{translate('ORGANISATION', 2)}}</h3>
+                    <h2 class="box-title"><i class="fas fa-fw fa-sitemap"></i> {{translate('ORGANISATION', 2)}}</h2>
                     {% include "tables/table-tool-menu.html.twig" %}
                 </div>
                 <div class="box-body">

templates/pages/user.html.twig

@@ -168,6 +168,7 @@
                 {% endblock %}
             </div>
         </div>
+        {% if checkAccess('view_user_field', { 'user': user, 'property': 'activities' }) %}
         {% if 'activities' not in widgets.hidden %}
         <div class="col-lg-8">
             {% block activity_box %}
@@ -188,6 +189,7 @@
             {% endblock %}
         </div>
         {% endif %}
+        {% endif %}
     </div>
     {% if 'permissions' not in widgets.hidden %}
     <div class="row">

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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <li role="menuitem">
-                        <a href="#" data-slug="{% endverbatim %}{{organisation.slug}}{% verbatim %}" data-user_name="{{row.user_name}}" class="js-user-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.CHANGE_PASSWORD")}}{% verbatim %}
+                        <i class="fas fa-key"></i> {% endverbatim %}{{translate("MEMBER.RESET_PASSWORD")}}{% verbatim %}
                         </a>
                     </li>
-                    <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/organisation_members-info.html.twig

@@ -12,7 +12,7 @@
         </strong>
         <div class="js-copy-container">
             <span class="js-copy-target">{{row.email}}</span>
-            <button class="btn btn-xs uf-copy-trigger js-copy-trigger"><i class="fas fa-copy"></i></button>
+            <button class="btn btn-xs uf-copy-trigger js-copy-trigger" aria-label="Copy email address"><i class="fas fa-copy"></i></button>
         </div>
     </td>
     {% endverbatim %}

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

@@ -17,7 +17,7 @@
                     {% block organisation_membership_actions %}
                         {% if organisationConfig.combine_action_buttons %}
                             {% verbatim %}{{#ifx row.is_pending '==' 1 }}{% endverbatim %}
-                                <li>
+                                <li role="menuitem">
                                     <a href="#" data-slug="{% verbatim %}{{row.slug}}{% endverbatim %}" class="js-organisation-cancelJoin">
                                         <i class="fas fa-window-close"></i>
                                         {{translate("JOIN.CANCEL")}}
@@ -25,7 +25,7 @@
                                 </li>
                             {% verbatim %}{{ else }}{% endverbatim %}
                                 {% verbatim %}{{#ifx row.is_member '==' 1 }}{% endverbatim %}
-                                    <li>
+                                    <li role="menuitem">
                                         <a href="#" data-slug="{% verbatim %}{{row.slug}}{% endverbatim %}" class="js-organisation-leave">
                                             <i class="fas fa-sign-out-alt"></i>
                                             {{translate("LEAVE")}}
@@ -33,7 +33,7 @@
                                     </li>
                                 {% verbatim %}{{ else }}{% endverbatim %}
                                     {% if (organisationConfig.membership.single_membership == 0) or ((current_user.organisations.count == 0) and (current_user.pendingOrganisations.count == 0)) %}
-                                    <li>
+                                    <li role="menuitem">
                                         <a href="#" data-slug="{% verbatim %}{{row.slug}}{% endverbatim %}" class="js-organisation-join">
                                             <i class="fas fa-sign-in-alt"></i>
                                             {{translate("JOIN")}}
@@ -63,7 +63,7 @@
                                 {% verbatim %}{{#ifx row.is_admin '==' 1 }}{% endverbatim %}
                             {% endif %}
                         {% endif %}
-                        <li>
+                        <li role="menuitem">
                             <a href="#" data-slug="{% verbatim %}{{row.slug}}{% endverbatim %}" class="js-organisation-edit">
                                 <i class="fas fa-edit"></i>
                                 {{translate("ORGANISATION.EDIT")}}
@@ -78,7 +78,7 @@
                         {% if checkAccess('approve_organisation') %}
                             {% verbatim %}{{#ifx row.flag_approved '==' 0 }}{% endverbatim %}
                                 {% verbatim %}{{#ifx row.registrant_id '==' {% endverbatim %}{{current_user.id}}{% verbatim %} }}{% endverbatim %}
-                                    <li>
+                                    <li role="menuitem">
                                         <a href="#" data-slug="{% verbatim %}{{row.slug}}{% endverbatim %}" class="js-organisation-cancelRegistration">
                                             <i class="fas fa-trash-alt"></i>
                                             {{translate("ORGANISATION.REGISTRATION.CANCEL")}}
@@ -86,12 +86,12 @@
                                     </li>
                                 {% verbatim %}{{/ifx}}{% endverbatim %}
 
-                                <li>
+                                <li role="menuitem">
                                     <a href="#" data-slug="{% verbatim %}{{row.slug}}{% endverbatim %}" class="js-organisation-approveRegistration">
                                     <i class="fas fa-thumbs-up"></i> {{translate("ORGANISATION.REGISTRATION.APPROVE")}}
                                     </a>
                                 </li>
-                                <li>
+                                <li role="menuitem">
                                     <a href="#" data-slug="{% verbatim %}{{row.slug}}{% endverbatim %}" class="js-organisation-denyRegistration">
                                         <i class="fas fa-thumbs-down"></i>
                                         {{translate("ORGANISATION.REGISTRATION.DENY")}}
@@ -102,7 +102,7 @@
 
 
                         {% if checkAccess('merge_organisations') %}
-                            <li>
+                            <li role="menuitem">
                                 <a href="#" data-slug="{% verbatim %}{{row.slug}}{% endverbatim %}" class="js-organisation-merge">
                                     <i class="fas fa-object-group"></i>
                                     {{translate("ORGANISATION.MERGE")}}
@@ -112,7 +112,7 @@
 
                         {% if checkAccess('delete_organisation') %}
                             {% verbatim %}{{#ifx row.flag_approved '==' 1 }}{% endverbatim %}
-                            <li>
+                            <li role="menuitem">
                                 <a href="#" data-slug="{% verbatim %}{{row.slug}}{% endverbatim %}" class="js-organisation-delete">
                                     <i class="fas fa-trash-alt"></i>
                                     {{translate("ORGANISATION.DELETE")}}

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">
+                            <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 %}

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

@@ -5,33 +5,33 @@
             <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button>
             <ul class="dropdown-menu dropdown-menu-right-responsive" role="menu">
                 {{#ifx row.flag_verified '==' 0 }}
-                <li>
+                <li role="menuitem">
                     <a href="#" data-user_name="{{row.user_name}}" class="js-user-activate">
                     <i class="fas fa-bolt"></i> {% endverbatim %}{{translate("USER.ACTIVATE")}}{% verbatim %}
                     </a>
                 </li>
                 {{/ifx }}
-                <li>
+                <li role="menuitem">
                     <a href="#" data-user_name="{{row.user_name}}" class="js-user-edit">
                     <i class="fas fa-edit"></i> {% endverbatim %}{{translate("USER.EDIT")}}{% verbatim %}
                     </a>
                 </li>
-                <li>
+                <li role="menuitem">
                     <a href="#" data-user_name="{{row.user_name}}" class="js-user-roles">
                     <i class="fas fa-id-card"></i> {% endverbatim %}{{translate("ROLE.MANAGE")}}{% verbatim %}
                     </a>
                 </li>
-                <li>
+                <li role="menuitem">
                     <a href="#" data-user_name="{{row.user_name}}" class="js-user-organisations">
                     <i class="fas fa-sitemap"></i> {% endverbatim %}{{translate("ORGANISATION.MANAGE")}}{% verbatim %}
                     </a>
                 </li>
-                <li>
+                <li role="menuitem">
                     <a href="#" data-user_name="{{row.user_name}}" class="js-user-password">
                     <i class="fas fa-key"></i> {% endverbatim %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% verbatim %}
                     </a>
                 </li>
-                <li>
+                <li role="menuitem">
                 {{#ifx row.flag_enabled '==' 1 }}
                     <a href="#" data-user_name="{{row.user_name}}" class="js-user-disable">
                     <i class="fas fa-minus-circle"></i> {% endverbatim %}{{translate("USER.DISABLE")}}{% verbatim %}
@@ -42,7 +42,7 @@
                     </a>
                 {{/ifx }}
                 </li>
-                <li>
+                <li role="menuitem">
                     <a href="#" data-user_name="{{row.user_name}}" class="js-user-delete">
                     <i class="fas fa-trash-alt"></i> {% endverbatim %}{{translate("USER.DELETE")}}{% verbatim %}
                     </a>

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

@@ -3,12 +3,12 @@
     <td style="line-height: 2em;">
     {{#if row.organisations.length }}
         {{#each row.organisations }}
-            <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}}" title="{{this.description}}" data-text="{{this.name}}" style="font-size: 100%;">{{this.name}}</a><br>
+            <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary user-organisation-button {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}}" title="{{this.description}}" data-text="{{this.name}}">{{this.name}}</a><br>
         {{/each}}
     {{/if }}
     {{#if row.pending_organisations.length }}
         {{#each row.pending_organisations }}
-            <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}} membership-pending" title="{{this.description}}" data-text="{{this.name}}" style="font-size: 100%;">{{this.name}}</a><br>
+            <a href="{% endverbatim %}{{site.uri.public}}{% verbatim %}/organisations/o/{{this.slug}}" class="label bg-primary user-organisation-button {{#ifx this.flag_approved '!=' 1 }}organisation-pending{{/ifx}} {{#if this.pivot.flag_admin }}organisation-admin{{/if}} membership-pending" title="{{this.description}}" data-text="{{this.name}}">{{this.name}}</a><br>
         {{/each}}
     {{/if }}
     </td>