From f53e23ca757845f5fd48a9cda853b21286b12e46 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sat, 24 Aug 2024 23:21:57 -0700
Subject: [PATCH] GUACAMOLE-1866: Remove application header from home page.

---
 .../src/app/home/controllers/homeController.js    |  8 +++++---
 .../app/home/directives/guacRecentConnections.js  | 10 ----------
 .../main/frontend/src/app/home/styles/home.css    |  5 -----
 .../app/home/templates/guacRecentConnections.html |  2 +-
 .../frontend/src/app/home/templates/home.html     | 15 +++++++--------
 .../frontend/src/app/index/styles/headers.css     |  9 ++++++---
 6 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/guacamole/src/main/frontend/src/app/home/controllers/homeController.js b/guacamole/src/main/frontend/src/app/home/controllers/homeController.js
index 92c149e6b..8d84b49e1 100644
--- a/guacamole/src/main/frontend/src/app/home/controllers/homeController.js
+++ b/guacamole/src/main/frontend/src/app/home/controllers/homeController.js
@@ -62,12 +62,14 @@ angular.module('home').controller('homeController', ['$scope', '$injector',
     ];
     
     /**
-     * Returns true if recent connections should be displayed on the Guacamole
-     * home page, otherwise false.
+     * Returns whether the "Recent Connections" section should be displayed on
+     * the home screen.
      * 
      * @returns {!boolean}
+     *     true if recent connections should be displayed on the home screen,
+     *     false otherwise.
      */
-    $scope.willShowRecentConnections = function willShowRecentConnections() {
+    $scope.isRecentConnectionsVisible = function isRecentConnectionsVisible() {
         return preferenceService.preferences.showRecentConnections;
     };
 
diff --git a/guacamole/src/main/frontend/src/app/home/directives/guacRecentConnections.js b/guacamole/src/main/frontend/src/app/home/directives/guacRecentConnections.js
index 57f141f3f..4be606524 100644
--- a/guacamole/src/main/frontend/src/app/home/directives/guacRecentConnections.js
+++ b/guacamole/src/main/frontend/src/app/home/directives/guacRecentConnections.js
@@ -74,16 +74,6 @@ angular.module('home').directive('guacRecentConnections', [function guacRecentCo
                         && guacHistory.removeEntry(recentConnection.entry.id));
             };
             
-            /**
-             * Returns whether or not recent connections should be displayed.
-             * 
-             * @returns {!boolean}
-             *     true if recent connections should be displayed, otherwise false.
-             */
-            $scope.willShowRecentConnections = function willShowRecentConnections() {
-                return preferenceService.preferences.showRecentConnections;
-            };
-
             /**
              * Returns whether recent connections are available for display.
              *
diff --git a/guacamole/src/main/frontend/src/app/home/styles/home.css b/guacamole/src/main/frontend/src/app/home/styles/home.css
index 5a0d9d216..8ae0486ed 100644
--- a/guacamole/src/main/frontend/src/app/home/styles/home.css
+++ b/guacamole/src/main/frontend/src/app/home/styles/home.css
@@ -77,11 +77,6 @@ a.home-connection, .empty.balancer a.home-connection-group {
     display: none;
 }
 
-.header-app-name {
-    font-size: 0.85em;
-    box-shadow: none;
-}
-
 .recent-connections .connection .remove-recent {
     visibility: hidden;
 }
diff --git a/guacamole/src/main/frontend/src/app/home/templates/guacRecentConnections.html b/guacamole/src/main/frontend/src/app/home/templates/guacRecentConnections.html
index d24397445..2d25bc1db 100644
--- a/guacamole/src/main/frontend/src/app/home/templates/guacRecentConnections.html
+++ b/guacamole/src/main/frontend/src/app/home/templates/guacRecentConnections.html
@@ -1,4 +1,4 @@
-<div class="recent-connections" ng-show="willShowRecentConnections()">
+<div class="recent-connections">
 
     <!-- Text displayed if no recent connections exist -->
     <p class="placeholder" ng-hide="hasRecentConnections()">{{'HOME.INFO_NO_RECENT_CONNECTIONS' | translate}}</p>
diff --git a/guacamole/src/main/frontend/src/app/home/templates/home.html b/guacamole/src/main/frontend/src/app/home/templates/home.html
index 6ba553025..872ac9803 100644
--- a/guacamole/src/main/frontend/src/app/home/templates/home.html
+++ b/guacamole/src/main/frontend/src/app/home/templates/home.html
@@ -2,16 +2,14 @@
 
     <div class="connection-list-ui">
 
-        <div class="header header-app-name">
-            <h2 id="section-header-app-name">{{'APP.NAME' | translate}}</h2>
+        <!-- The recent connections for this user -->
+        <div class="header" ng-show="isRecentConnectionsVisible()">
+            <h2 id="section-header-recent-connections">{{'HOME.SECTION_HEADER_RECENT_CONNECTIONS' | translate}}</h2>
             <guac-user-menu></guac-user-menu>
         </div>
-        
-        <!-- The recent connections for this user -->
-        <div class="header" ng-show="willShowRecentConnections()">
-            <h2 id="section-header-recent-connections">{{'HOME.SECTION_HEADER_RECENT_CONNECTIONS' | translate}}</h2>
-        </div>
-        <guac-recent-connections root-groups="rootConnectionGroups" ng-show="willShowRecentConnections()"></guac-recent-connections>
+        <guac-recent-connections
+            root-groups="rootConnectionGroups"
+            ng-show="isRecentConnectionsVisible()"></guac-recent-connections>
 
         <!-- All connections for this user -->
         <div class="header">
@@ -21,6 +19,7 @@
                 placeholder="'HOME.FIELD_PLACEHOLDER_FILTER' | translate"
                 connection-properties="filteredConnectionProperties"
                 connection-group-properties="filteredConnectionGroupProperties"></guac-group-list-filter>
+            <guac-user-menu></guac-user-menu>
         </div>
         <div class="all-connections">
             <guac-group-list
diff --git a/guacamole/src/main/frontend/src/app/index/styles/headers.css b/guacamole/src/main/frontend/src/app/index/styles/headers.css
index 245fa398c..457eb5210 100644
--- a/guacamole/src/main/frontend/src/app/index/styles/headers.css
+++ b/guacamole/src/main/frontend/src/app/index/styles/headers.css
@@ -78,9 +78,8 @@ h2 {
     margin-bottom: 0;
 }
 
-.header ~ * .header,
-.header ~ .header {
-    margin-top: 0;
+.header:not(.ng-hide) ~ * .header,
+.header:not(.ng-hide) ~ .header {
     border-top: 1px solid rgba(0, 0, 0, 0.125);
 }
 
@@ -106,3 +105,7 @@ h2 {
     border-left: 1px solid rgba(0, 0, 0, 0.125);
     background-color: transparent;
 }
+
+.header:not(.ng-hide) ~ .header .user-menu {
+    display: none;
+}