From 45a4591f73970cfe22695f644838fa268706209c Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Tue, 8 Mar 2022 13:13:20 +0000
Subject: [PATCH] Added organisations to users page

---
 asset-bundles.json                         |   1 +
 assets/organisations/css/organisations.css |  16 +++-
 assets/organisations/js/pages/user.js      |   1 +
 locale/en_US/messages.php                  |   4 +
 templates/pages/user.html.twig             | 104 +++++++++++++++++++++
 5 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 templates/pages/user.html.twig

diff --git a/asset-bundles.json b/asset-bundles.json
index fb9306a..fa9029c 100644
--- a/asset-bundles.json
+++ b/asset-bundles.json
@@ -38,6 +38,7 @@
         },
         "js/pages/user": {
             "scripts": [
+                "organisations/js/widgets/members.js",
                 "organisations/js/widgets/users.js",
                 "organisations/js/pages/user.js"
             ],
diff --git a/assets/organisations/css/organisations.css b/assets/organisations/css/organisations.css
index 13d73bf..a2b3486 100644
--- a/assets/organisations/css/organisations.css
+++ b/assets/organisations/css/organisations.css
@@ -16,6 +16,20 @@
 	text-overflow: ellipsis;
 	overflow: hidden;
 	width: 100%;
-	displaY: inline-block;
+	display: inline-block;
 	white-space: nowrap;
+}
+
+.user-organisation-description {
+	text-overflow: ellipsis;
+	overflow: hidden;
+	width: 100%;
+	display: inline-block;
+	white-space: nowrap;
+	margin-top: 0.5em;
+}
+
+hr.row-divider {
+	margin-top: 0.3em;
+	width:  80%;
 }
\ No newline at end of file
diff --git a/assets/organisations/js/pages/user.js b/assets/organisations/js/pages/user.js
index 22603f0..c990021 100644
--- a/assets/organisations/js/pages/user.js
+++ b/assets/organisations/js/pages/user.js
@@ -9,5 +9,6 @@
 
 $(document).ready(function() {
     // Control buttons
+    bindMemberButtons($("#view-user"))
     bindUserButtonsExtra($("#view-user"), { delete_redirect: page.delete_redirect });
 });
diff --git a/locale/en_US/messages.php b/locale/en_US/messages.php
index 2192da0..0fbd4a8 100644
--- a/locale/en_US/messages.php
+++ b/locale/en_US/messages.php
@@ -167,6 +167,10 @@ return [
         2 => 'Administrators',
     ],
 
+    'USER' => [
+        'ORGANISATIONS' => 'User Organisations',
+    ],
+
     'CREATED_ON'                         => 'Created on',
 
     'MERGE'                              => 'Merge',
diff --git a/templates/pages/user.html.twig b/templates/pages/user.html.twig
new file mode 100644
index 0000000..feda475
--- /dev/null
+++ b/templates/pages/user.html.twig
@@ -0,0 +1,104 @@
+{% extends "@blockier-templates/pages/user.html.twig" %}
+
+
+{% block tools %}
+    <li>
+        <a href="#" class="js-user-edit" data-user_name="{{user.user_name}}">
+            <i class="fas fa-edit fa-fw"></i> {{translate('EDIT')}}
+        </a>
+    </li>
+    {% if 'password' not in tools.hidden %}
+        <li>
+            <a href="#" class="js-user-password" data-user_name="{{user.user_name}}">
+                <i class="fas fa-lock fa-fw"></i> {{translate('PASSWORD')}}
+            </a>
+        </li>
+    {% endif %}
+    {% if 'roles' not in tools.hidden %}
+        <li>
+            <a href="#" class="js-user-roles" data-user_name="{{user.user_name}}">
+                <i class="fas fa-id-card fa-fw"></i> {{translate('ROLE', 2)}}
+            </a>
+        </li>
+    {% endif %}
+    {% if 'organisations' not in tools.hidden %}
+        <li>
+            <a href="#" class="js-user-organisations" data-user_name="{{user.user_name}}">
+                <i class="fas fa-sitemap fa-fw"></i> {{translate('ORGANISATION', 2)}}
+            </a>
+        </li>
+    {% endif %}
+    {% if 'activate' not in tools.hidden and user.flag_verified == "0" %}
+        <li>
+            <a href="#" class="js-user-activate" data-user_name="{{user.user_name}}">
+                <i class="fas fa-bolt fa-fw"></i> {{translate('ACTIVATE')}}
+            </a>
+        </li>
+    {% endif %}
+    {% if 'enable' not in tools.hidden %}
+        {% if user.flag_enabled == "1" %}
+            <li>
+                <a href="#" class="js-user-disable" data-user_name="{{user.user_name}}">
+                    <i class="fas fa-minus-circle fa-fw"></i> {{translate('DISABLE')}}
+                </a>
+            </li>
+        {% else %}
+            <li>
+                <a href="#" class="js-user-enable" data-user_name="{{user.user_name}}">
+                    <i class="fas fa-plus-circle fa-fw"></i> {{translate('ENABLE')}}
+                </a>
+            </li>
+        {% endif %}
+    {% endif %}
+    {% if 'delete' not in tools.hidden %}
+        <li>
+            <a href="#" class="js-user-delete" data-user_name="{{user.user_name}}">
+                <i class="fas fa-trash-alt fa-fw"></i> {{translate('DELETE')}}
+            </a>
+        </li>
+    {% endif %}
+{% endblock %}
+
+
+{% block user_box %}
+    {{ parent() }}
+    <div class="box box-primary">
+        <div class="box-header with-border">
+            <h3 class="box-title"><i class="fas fa-sitemap"></i> {{translate('USER.ORGANISATIONS')}}</h3>
+        </div>
+        <div class="box-body">
+            <p class="box-profile-property">
+                {% for organisation in user.organisations %}
+                <div class="row">
+                    <div class="col-xs-9">
+                        <a href="{{site.uri.public}}/organisations/o/{{organisation.slug}}" class="label bg-primary {% if organisation.flag_approved != 1 %}organisation-pending{% endif %} {% if organisation.pivot.flag_admin %}organisation-admin{% endif %}" title="{{organisation.description}}" data-text="{{organisation.name}}" style="font-size: 100%;">{{organisation.name}}</a>
+                        <br>
+                        <small class="user-organisation-description">{{organisation.description}}</small>
+                    </div>
+                    {% if hasRole('site-admin') or hasRole('organisations-admin') -%}
+                    <div class="col-xs-3">
+                        <button type="button" data-slug="{{organisation.slug}}" data-user_name="{{user.user_name}}" class="btn btn-danger js-member-remove margin-r-5" style="min-width: 70px">{{translate("REMOVE")}}</button>
+                    </div>
+                    {% endif -%}
+                </div>
+                <hr class="row-divider">
+                {% endfor %}
+                {% for organisation in user.pendingOrganisations %}
+                <div class="row">
+                    <div class="col-xs-9">
+                        <a href="{{site.uri.public}}/organisations/o/{{organisation.slug}}" class="label bg-primary {% if organisation.flag_approved != 1 %}organisation-pending{% endif %} {% if organisation.pivot.flag_admin %}organisation-admin{% endif %}" title="{{organisation.description}}" data-text="{{organisation.name}}" style="font-size: 100%;">{{organisation.name}}</a>
+                        <br>
+                        <small class="user-organisation-description">{{organisation.description}}</small>
+                    </div>
+                    {% if hasRole('site-admin') or hasRole('organisations-admin') -%}
+                    <div class="col-xs-3">
+                        <button type="button" data-slug="{{organisation.slug}}" data-user_name="{{user.user_name}}" class="btn btn-danger js-member-remove margin-r-5" style="min-width: 70px">{{translate("REMOVE")}}</button>
+                    </div>
+                    {% endif -%}
+                </div>
+                <hr class="row-divider">
+                {% endfor %}
+            </p>
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file