Fixed log message for "rejected" organisation users

Accessibility updates
Upgrade to Twig 3.0 (required for php8.4 support)
2026-02-16 16:38:37 +00:00 · 2026-02-10 11:08:02 +00:00 · 2026-01-13 15:11:15 +00:00 · 2025-01-20 16:52:27 +00:00
25 changed files with 63 additions and 56 deletions
--- a/assets/organisations/css/organisations.css
+++ b/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;
--- a/src/Controller/OrganisationMembersController.php
+++ b/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,
        ]);
        
--- a/src/Controller/OrganisationRegistrationController.php
+++ b/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,
            ]);
        });
--- a/src/Twig/OrganisationsExtension.php
+++ b/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'];

--- a/templates/modals/confirm-accept-organisation-join-request.html.twig
+++ b/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>
--- a/templates/modals/confirm-cancel-organisation-join.html.twig
+++ b/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>
--- a/templates/modals/confirm-cancel-organisation-registration.html.twig
+++ b/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>
--- a/templates/modals/confirm-delete-organisation.html.twig
+++ b/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>
--- a/templates/modals/confirm-demote-organisation-member.html.twig
+++ b/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>
--- a/templates/modals/confirm-join-organisation.html.twig
+++ b/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">
--- a/templates/modals/confirm-leave-organisation.html.twig
+++ b/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>
--- a/templates/modals/confirm-permenent-delete-organisation.html.twig
+++ b/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>
--- a/templates/modals/confirm-promote-organisation-member.html.twig
+++ b/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>
--- a/templates/modals/confirm-reject-organisation-join-request.html.twig
+++ b/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>
--- a/templates/modals/confirm-remove-organisation-member.html.twig
+++ b/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>
--- a/templates/modals/organisation-merge.html.twig
+++ b/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>
--- a/templates/pages/deleted-organisations.html.twig
+++ b/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 -->
--- a/templates/pages/organisation.html.twig
+++ b/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">
--- a/templates/pages/organisations.html.twig
+++ b/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">
--- a/templates/tables/columns/organisation_members-actions.html.twig
+++ b/templates/tables/columns/organisation_members-actions.html.twig
@@ -6,41 +6,41 @@
                <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.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">
                        <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">
                        <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">
                        <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">
                        <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">
                        <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-member-password">
                        <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">
                        <i class="fas fa-door-open"></i> {% endverbatim %}{{translate("MEMBER.REMOVE")}}{% verbatim %}
                        </a>
--- a/templates/tables/columns/organisation_members-info.html.twig
+++ b/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 %}
--- a/templates/tables/columns/organisations-actions.html.twig
+++ b/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")}}
--- a/templates/tables/columns/organisations-join.html.twig
+++ b/templates/tables/columns/organisations-join.html.twig
@@ -15,7 +15,7 @@
                            </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}}">
                                {% endverbatim %}{{translate("JOIN")}}{% verbatim %}
                            </button>
                            {% endverbatim %}{% endif %}{% verbatim %}
--- a/templates/tables/columns/users-actions.html.twig
+++ b/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>
--- a/templates/tables/columns/users-organisations.html.twig
+++ b/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>
Author	SHA1	Message	Date
Craig Williams	ca49b76cb0	Fixed log message for "rejected" organisation users	2026-02-16 16:38:37 +00:00
Craig Williams	dc1ca5c14c	Accessibility updates	2026-02-10 11:08:02 +00:00
Craig Williams	c95d4708a8	Upgrade to Twig 3.0 (required for php8.4 support)	2026-01-13 15:11:15 +00:00
Craig Williams	8cc8448e18	Fixed activity type for "denied" organisations	2025-01-20 16:52:27 +00:00