SONAR-10646 Remove black navbar on sessions pages (login, logout, ...)

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 800bbee9c220381f3fb10b417a2b2cea8de4b167..4003c0246952b136a4f7b3283d912e78fbd94a8e 100644 (file)
--- 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/app/components/SimpleSessionsContainer.tsx b/server/sonar-web/src/main/js/app/components/SimpleSessionsContainer.tsx
new file mode 100644 (file)
index 0000000..5f74da3
--- /dev/null
+++ b/server/sonar-web/src/main/js/app/components/SimpleSessionsContainer.tsx
@@ -0,0 +1,36 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+import * as React from 'react';
+import GlobalFooterContainer from './GlobalFooterContainer';
+
+interface Props {
+  children?: React.ReactNode;
+}
+
+export default function SimpleSessionsContainer({ children }: Props) {
+  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 023bee3da4b27c525f847af3d997ef36e58c8417..6d38859ecd7d1bae53b85c6782e184283ee0930e 100644 (file)
--- 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';

diff --git a/server/sonar-web/src/main/js/apps/sessions/components/SimpleSessionsContainer.tsx b/server/sonar-web/src/main/js/apps/sessions/components/SimpleSessionsContainer.tsx
deleted file mode 100644 (file)
index 6e7df52..0000000
--- a/server/sonar-web/src/main/js/apps/sessions/components/SimpleSessionsContainer.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-import * as React from 'react';
-import SimpleContainer from '../../../app/components/SimpleContainer';
-
-interface Props {
-  children?: React.ReactNode;
-}
-
-export default function SimpleSessionsContainer({ children }: Props) {
-  return <SimpleContainer hideLoggedInInfo={true}>{children}</SimpleContainer>;
-}