From c191ae373a98fa1952d0e72bdbc7932046c2f640 Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Thu, 18 Jun 2020 10:11:24 +0200
Subject: [PATCH] KEYCLOAK-14499 added toggle menu back on welcome screen

---
 .../theme/keycloak-preview/account/index.ftl      |  8 +++-----
 .../account/resources/welcome-page-scripts.js     | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
index ebf5468db2..56867b0a01 100644
--- a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
+++ b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
@@ -186,15 +186,11 @@
               <button id="landingSignOutButton" tabindex="0" style="display:none" onclick="keycloak.logout();" class="pf-c-button pf-m-primary" type="button">${msg("doSignOut")}</button>
             </div>
 
-            <div class="pf-l-toolbar__group" style="margin-left: 10px;">
-                <span id="landingLoggedInUser"></span>
-            </div>
-
             <!-- Kebab for mobile -->
             <div class="pf-c-page__header-tools-group">
                 <div id="landingMobileKebab" class="pf-c-dropdown pf-m-mobile" onclick="toggleMobileDropdown();"> <!-- pf-m-expanded -->
                     <button aria-label="Actions" tabindex="0" id="landingMobileKebabButton" class="pf-c-dropdown__toggle pf-m-plain" type="button" aria-expanded="true" aria-haspopup="true">
-                        <i class="fas fa-ellipsis-v" aria-hidden="false"></i>
+                        <svg fill="currentColor" height="1em" width="1em" viewBox="0 0 192 512" aria-hidden="true" role="img" style="vertical-align: -0.125em;"><path d="M96 184c39.8 0 72 32.2 72 72s-32.2 72-72 72-72-32.2-72-72 32.2-72 72-72zM24 80c0 39.8 32.2 72 72 72s72-32.2 72-72S135.8 8 96 8 24 40.2 24 80zm0 352c0 39.8 32.2 72 72 72s72-32.2 72-72-32.2-72-72-72-72 32.2-72 72z" transform=""></path></svg>
                     </button>
                     <ul id="landingMobileDropdown" aria-labelledby="landingMobileKebabButton" class="pf-c-dropdown__menu pf-m-align-right" role="menu" style="display:none">
                         <#if referrer?has_content && referrer_uri?has_content>
@@ -213,6 +209,8 @@
                 </div>
             </div>
 
+            <span id="landingLoggedInUser"></span>
+
         </div> <!-- end header tools -->
       </header>
 
diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/welcome-page-scripts.js b/themes/src/main/resources/theme/keycloak-preview/account/resources/welcome-page-scripts.js
index b49bcaa5bc..3559d65ab6 100644
--- a/themes/src/main/resources/theme/keycloak-preview/account/resources/welcome-page-scripts.js
+++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/welcome-page-scripts.js
@@ -58,6 +58,21 @@ function loggedInUserName() {
     return userName;
 }
 
+var toggleMobileDropdown = function () {	
+    var mobileDropdown = document.getElementById("landingMobileDropdown");
+    var mobileKebab = document.getElementById("landingMobileKebab");
+    var mobileKebabButton = document.getElementById("landingMobileKebabButton");
+    if (mobileDropdown.style.display === 'none') {
+        mobileDropdown.style.display = 'block';
+        mobileKebab.classList.add("pf-m-expanded");
+        mobileKebabButton.setAttribute("aria-expanded", "true");
+    } else {
+        mobileDropdown.style.display = 'none';
+        mobileKebab.classList.remove("pf-m-expanded");
+        mobileKebabButton.setAttribute("aria-expanded", "false");
+    }
+}
+
 var loadjs = function (url, loadListener) {
     const script = document.createElement("script");
     script.src = resourceUrl + url;