From e43f918b5fc85a8b13cf966a9c23bd7d9f344fb5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gr=C3=A9goire=20Aubert?= <gregoire.aubert@sonarsource.com>
Date: Tue, 1 May 2018 17:04:43 +0200
Subject: [PATCH] SONAR-10646 Remove black navbar on sessions pages (login,
 logout, ...)

---
 .../src/main/js/app/components/SimpleContainer.tsx    |  5 ++---
 .../components/SimpleSessionsContainer.tsx            | 11 +++++++++--
 .../sonar-web/src/main/js/app/utils/startReactApp.js  |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)
 rename server/sonar-web/src/main/js/{apps/sessions => app}/components/SimpleSessionsContainer.tsx (78%)

diff --git a/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx b/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx
index 800bbee9c22..4003c024695 100644
--- a/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx
+++ b/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx
@@ -24,17 +24,16 @@ import NavBar from '../../components/nav/NavBar';
 
 interface Props {
   children?: React.ReactNode;
-  hideLoggedInInfo?: boolean;
 }
 
-export default function SimpleContainer({ children, hideLoggedInInfo }: Props) {
+export default function SimpleContainer({ children }: Props) {
   return (
     <div className="global-container">
       <div className="page-wrapper" id="container">
         <NavBar className="navbar-global" height={theme.globalNavHeightRaw} />
         {children}
       </div>
-      <GlobalFooterContainer hideLoggedInInfo={hideLoggedInInfo} />
+      <GlobalFooterContainer />
     </div>
   );
 }
diff --git a/server/sonar-web/src/main/js/apps/sessions/components/SimpleSessionsContainer.tsx b/server/sonar-web/src/main/js/app/components/SimpleSessionsContainer.tsx
similarity index 78%
rename from server/sonar-web/src/main/js/apps/sessions/components/SimpleSessionsContainer.tsx
rename to server/sonar-web/src/main/js/app/components/SimpleSessionsContainer.tsx
index 6e7df5248e9..5f74da3b715 100644
--- a/server/sonar-web/src/main/js/apps/sessions/components/SimpleSessionsContainer.tsx
+++ b/server/sonar-web/src/main/js/app/components/SimpleSessionsContainer.tsx
@@ -18,12 +18,19 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import SimpleContainer from '../../../app/components/SimpleContainer';
+import GlobalFooterContainer from './GlobalFooterContainer';
 
 interface Props {
   children?: React.ReactNode;
 }
 
 export default function SimpleSessionsContainer({ children }: Props) {
-  return <SimpleContainer hideLoggedInInfo={true}>{children}</SimpleContainer>;
+  return (
+    <div className="global-container">
+      <div className="page-wrapper" id="container">
+        {children}
+      </div>
+      <GlobalFooterContainer hideLoggedInInfo={true} />
+    </div>
+  );
 }
diff --git a/server/sonar-web/src/main/js/app/utils/startReactApp.js b/server/sonar-web/src/main/js/app/utils/startReactApp.js
index 023bee3da4b..6d38859ecd7 100644
--- a/server/sonar-web/src/main/js/app/utils/startReactApp.js
+++ b/server/sonar-web/src/main/js/app/utils/startReactApp.js
@@ -30,7 +30,7 @@ import MigrationContainer from '../components/MigrationContainer';
 import App from '../components/App';
 import GlobalContainer from '../components/GlobalContainer';
 import SimpleContainer from '../components/SimpleContainer';
-import SimpleSessionsContainer from '../../apps/sessions/components/SimpleSessionsContainer';
+import SimpleSessionsContainer from '../components/SimpleSessionsContainer';
 import Landing from '../components/Landing';
 import ProjectAdminContainer from '../components/ProjectAdminContainer';
 import ProjectPageExtension from '../components/extensions/ProjectPageExtension';
-- 
2.39.5