From 0ee9b071728eeae4fec2bd3ef8cb3e7fc43343c4 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Fri, 19 Nov 2021 23:54:56 +0100
Subject: [PATCH] web/admin: show changelog on user info page

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 web/src/locales/en.po               |  1 +
 web/src/locales/fr_FR.po            |  1 +
 web/src/locales/pseudo-LOCALE.po    |  1 +
 web/src/pages/users/UserViewPage.ts | 43 ++++++++++++++++-------------
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index 56b7ef55f..3c147f89b 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -2284,6 +2284,7 @@ msgid "If your authentik_host setting does not match the URL you want to login w
 msgstr "If your authentik_host setting does not match the URL you want to login with, add this setting."
 
 #: src/pages/users/UserListPage.ts
+#: src/pages/users/UserViewPage.ts
 msgid "Impersonate"
 msgstr "Impersonate"
 
diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po
index bb44d9c9c..f6a5d9f7c 100644
--- a/web/src/locales/fr_FR.po
+++ b/web/src/locales/fr_FR.po
@@ -2267,6 +2267,7 @@ msgid "If your authentik_host setting does not match the URL you want to login w
 msgstr "Ajouter cette option si le paramètre authentik_host ne correspond pas à l'URL sur laquelle vous voulez ouvrir une session."
 
 #: src/pages/users/UserListPage.ts
+#: src/pages/users/UserViewPage.ts
 msgid "Impersonate"
 msgstr "Se faire passer pour"
 
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index e43b5cf2e..606fdd6cb 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -2276,6 +2276,7 @@ msgid "If your authentik_host setting does not match the URL you want to login w
 msgstr ""
 
 #: src/pages/users/UserListPage.ts
+#: src/pages/users/UserViewPage.ts
 msgid "Impersonate"
 msgstr ""
 
diff --git a/web/src/pages/users/UserViewPage.ts b/web/src/pages/users/UserViewPage.ts
index 71a68e97c..4f3a5086c 100644
--- a/web/src/pages/users/UserViewPage.ts
+++ b/web/src/pages/users/UserViewPage.ts
@@ -100,11 +100,11 @@ export class UserViewPage extends LitElement {
             >
                 <div class="pf-l-grid pf-m-gutter">
                     <div
-                        class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-2-col-on-xl pf-m-2-col-on-2xl"
+                        class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-3-col-on-xl pf-m-3-col-on-2xl"
                     >
                         <div class="pf-c-card__title">${t`User Info`}</div>
                         <div class="pf-c-card__body">
-                            <dl class="pf-c-description-list">
+                            <dl class="pf-c-description-list pf-m-2-col">
                                 <div class="pf-c-description-list__group">
                                     <dt class="pf-c-description-list__term">
                                         <span class="pf-c-description-list__text"
@@ -241,15 +241,36 @@ export class UserViewPage extends LitElement {
                                 ${t`Reset Password`}
                             </ak-action-button>
                         </div>
+                        <div class="pf-c-card__footer">
+                            <a
+                                class="pf-c-button pf-m-tertiary"
+                                href="${`/-/impersonation/${this.user.pk}/`}"
+                            >
+                                ${t`Impersonate`}
+                            </a>
+                        </div>
                     </div>
                     <div
-                        class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-10-col-on-xl pf-m-10-col-on-2xl"
+                        class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-9-col-on-xl pf-m-9-col-on-2xl"
                     >
                         <div class="pf-c-card__title">${t`Actions over the last 24 hours`}</div>
                         <div class="pf-c-card__body">
                             <ak-charts-user userId=${this.user.pk || 0}> </ak-charts-user>
                         </div>
                     </div>
+                    <div
+                        class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-12-col-on-xl pf-m-12-col-on-2xl"
+                    >
+                        <div class="pf-c-card__title">${t`Changelog`}</div>
+                        <div class="pf-c-card__body">
+                            <ak-object-changelog
+                                targetModelPk=${this.user.pk}
+                                targetModelApp="authentik_core"
+                                targetModelName="user"
+                            >
+                            </ak-object-changelog>
+                        </div>
+                    </div>
                 </div>
             </section>
             <section
@@ -275,22 +296,6 @@ export class UserViewPage extends LitElement {
                     </div>
                 </div>
             </section>
-            <section
-                slot="page-changelog"
-                data-tab-title="${t`Changelog`}"
-                class="pf-c-page__main-section pf-m-no-padding-mobile"
-            >
-                <div class="pf-c-card">
-                    <div class="pf-c-card__body">
-                        <ak-object-changelog
-                            targetModelPk=${this.user.pk}
-                            targetModelApp="authentik_core"
-                            targetModelName="user"
-                        >
-                        </ak-object-changelog>
-                    </div>
-                </div>
-            </section>
             <section
                 slot="page-consent"
                 data-tab-title="${t`Explicit Consent`}"