From d38196fdcb63211b6f5316c1f3af4a7d8182730e Mon Sep 17 00:00:00 2001
From: Mathieu De Keyzer <me@theus.be>
Date: Tue, 30 Jan 2024 13:58:36 +0100
Subject: [PATCH] refactor: sidebar control (#736)

---
 .../Resources/translations/elements.en.xlf    |  8 ++++++
 .../views/bootstrap5/base/admin.html.twig     |  1 +
 .../elements/control-sidebar.html.twig        | 27 +++++++++++++++++++
 .../bootstrap5/elements/footer.html.twig      |  2 +-
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/EMS/admin-ui-bundle/src/Resources/translations/elements.en.xlf b/EMS/admin-ui-bundle/src/Resources/translations/elements.en.xlf
index 2310fe593..aaf7d774d 100644
--- a/EMS/admin-ui-bundle/src/Resources/translations/elements.en.xlf
+++ b/EMS/admin-ui-bundle/src/Resources/translations/elements.en.xlf
@@ -73,6 +73,14 @@
         <source>elements.user-image.anonymous</source>
         <target>Anonymous user</target>
       </trans-unit>
+      <trans-unit id="8ZArGEQ" resname="sidebar.tab.home.label">
+        <source>sidebar.tab.home.label</source>
+        <target>Recent Activities</target>
+      </trans-unit>
+      <trans-unit id="9VXm7JM" resname="sidebar.tab.jobs.label">
+        <source>sidebar.tab.jobs.label</source>
+        <target>Last commands</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/base/admin.html.twig b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/base/admin.html.twig
index 7ae706e59..ff7b70232 100644
--- a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/base/admin.html.twig
+++ b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/base/admin.html.twig
@@ -57,6 +57,7 @@
             </div>
 
             {{ include('@EMSAdminUI/bootstrap5/elements/footer.html.twig') }}
+            {{ include('@EMSAdminUI/bootstrap5/elements/control-sidebar.html.twig') }}
         </div>
     {% endapply %}
 
diff --git a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/control-sidebar.html.twig b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/control-sidebar.html.twig
index a8eadc3ea..5c45f4daf 100644
--- a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/control-sidebar.html.twig
+++ b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/control-sidebar.html.twig
@@ -1,4 +1,31 @@
 {%- trans_default_domain 'elements' -%}
 
 <aside class="control-sidebar control-sidebar-dark">
+    <ul class="nav nav-tabs" id="custom-tabs-two-tab" role="tablist">
+        <li class="nav-item">
+            <a title="{{ 'sidebar.tab.home.label'|trans|e('html_attr') }}" class="nav-link active" id="control-sidebar-home-tab-label" data-bs-toggle="pill"  href="#" data-bs-target="#control-sidebar-home-tab" role="tab" aria-controls="control-sidebar-home-tab" aria-selected="true">
+                <i class="fa fa-home"></i><span class="visually-hidden">{{ 'sidebar.tab.home.label'|trans }}</span>
+            </a>
+        </li>
+        <li class="nav-item">
+            <a title="{{ 'sidebar.tab.jobs.label'|trans|e('html_attr') }}" class="nav-link" id="control-sidebar-jobs-tab-label" data-bs-toggle="pill" href="#" data-bs-target="#control-sidebar-jobs-tab" role="tab" aria-controls="control-sidebar-jobs-tab" aria-selected="false">
+                <i class="fa fa-terminal"></i><span class="visually-hidden">{{ 'sidebar.tab.jobs.label'|trans }}</span>
+            </a>
+        </li>
+    </ul>
+    <div class="tab-content" id="control-sidebar-tab-content">
+        <div class="tab-pane fade dark show active" id="control-sidebar-home-tab" role="tabpanel" aria-labelledby="control-sidebar-home-tab-label">
+            <h3 class="control-sidebar-heading h4">{{ 'sidebar.tab.home.label'|trans }}</h3>
+        </div>
+        <div class="tab-pane fade dark" id="control-sidebar-jobs-tab" role="tabpanel" aria-labelledby="custom-tabs-two-profile-label">
+            <h3 class="control-sidebar-heading h4">{{ 'sidebar.tab.jobs.label'|trans }}</h3>
+            <ul class="control-sidebar-menu" id="commands-log">
+                {% if app.user %}
+                    {{ render(controller('EMS\\CoreBundle\\Controller\\TwigElementsController::jobs', {
+                        'username' : app.user.username
+                    } ) ) }}
+                {% endif %}
+            </ul>
+        </div>
+    </div>
 </aside>
diff --git a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/footer.html.twig b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/footer.html.twig
index 1fa250c04..2fdc23f6b 100644
--- a/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/footer.html.twig
+++ b/EMS/admin-ui-bundle/src/Resources/views/bootstrap5/elements/footer.html.twig
@@ -1,6 +1,6 @@
 {%- trans_default_domain 'emsco-core' -%}
 
-<footer class="main-footer">
+<footer class="main-footer no-print"">
     <a href="https://elasticms.fgov.be/" target="_blank">elastic<strong>MS</strong></a>
     <div class="float-end d-none d-sm-inline-block">
         {{ 'core.version'|trans({ '%core%': ems_version('core'), '%symfony%': ems_version('symfony') }) }}