From 467f289970c1aad23d68bbaf7b138d2b634bbcf6 Mon Sep 17 00:00:00 2001
From: Mael <mael.thomas@data.gouv.fr>
Date: Mon, 30 Apr 2018 15:10:01 +0200
Subject: [PATCH] :art: Le menu est maintenant visible tout le temps

En mode iFrame, le logo est remplace par le mode plein ecran
---
 source/components/pages/Header.js | 56 +++++++++++++------------------
 source/locales/en.yaml            |  2 +-
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/source/components/pages/Header.js b/source/components/pages/Header.js
index 77119ca91..010bad0ad 100644
--- a/source/components/pages/Header.js
+++ b/source/components/pages/Header.js
@@ -22,41 +22,31 @@ export class Header extends Component {
 		this.setState({ mobileNavVisible: !this.state.mobileNavVisible })
 
 	render() {
-		let { location } = this.props
-		let appMode = ['/simu', '/règle'].find(t => location.pathname.includes(t))
-		if (this.props.iframe)
-			return screenfull.enabled ? (
-				<div
-					id="iframeFullscreen"
-					onClick={() => screenfull.toggle()}
-					className={appMode ? 'absolute' : ''}>
-					{!appMode && (
-						<span>
-							<Trans>Mode plein écran</Trans>
-						</span>
-					)}
-					<i
-						className="fa fa-arrows-alt"
-						aria-hidden="true"
-						style={{ color: this.props.textColourOnWhite }}
-					/>
-				</div>
-			) : null
-
-		let displayHeader = !appMode
-
-		if (!displayHeader) return null
-
 		return (
 			<div id="header">
-				<Link id="brand" to="/">
-					<img
-						id="logo"
-						src={require('Images/logo/logo-simulateur.svg')}
-						alt="Un service de l'État français"
-					/>
-					<h1>Simulateur d'embauche</h1>
-				</Link>
+				{!this.props.iframe && (
+					<Link id="brand" to="/">
+						<img
+							id="logo"
+							src={require('Images/logo/logo-simulateur.svg')}
+							alt="Un service de l'État français"
+						/>
+						<h1>Simulateur d'embauche</h1>
+					</Link>
+				)}
+				{this.props.iframe &&
+					screenfull.enabled && (
+						<div id="iframeFullscreen" onClick={() => screenfull.toggle()}>
+							<span>
+								<Trans>Plein écran</Trans>
+							</span>
+							<i
+								className="fa fa-arrows-alt"
+								aria-hidden="true"
+								style={{ color: this.props.textColourOnWhite }}
+							/>
+						</div>
+					)}
 				<div id="headerRight">
 					<nav className={this.state.mobileNavVisible ? 'visible' : ''}>
 						<Links toggle={this.togglemobileNavVisible} />
diff --git a/source/locales/en.yaml b/source/locales/en.yaml
index 523992410..e5163a06c 100644
--- a/source/locales/en.yaml
+++ b/source/locales/en.yaml
@@ -19,7 +19,7 @@ unsatisfied: Awaiting your answers…
 Échap: Esc
 Entrée: Enter
 À propos: About (fr)
-Mode plein écran: Full screen
+Plein écran: Fullscreen
 first: Your first estimate is now available!
 lastQ: One last question!
 questionsLeft: Fewer than <1>{{nbQuestions}}</1> questions to go…