From 18a7e3205ddb51c80906ace6184859f478696979 Mon Sep 17 00:00:00 2001
From: Mael Thomas <mael.thomas@data.gouv.fr>
Date: Fri, 16 Dec 2016 17:28:42 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20du=20titre=20de=20la=20page=20r=C3=A8gl?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                           |  3 ++-
 .../rémunération-travail/cdd/indemnité_fin_contrat.yaml |  2 +-
 source/components/Rule.css                             |  8 ++++++++
 source/components/Rule.js                              |  6 +++++-
 source/containers/Layout.css                           |  5 +++++
 source/containers/Layout.js                            | 10 +++++++++-
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 01c8f8434..8f62df844 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "yaml-loader": "^0.2.0"
   },
   "scripts": {
-    "start": "node source/server.js"
+    "start": "node source/server.js",
+    "compile": "NODE_ENV='production' webpack --config source/webpack.config.js --optimize-minimize --optimize-dedupe --optimize-occurrence-order"
   }
 }
diff --git a/règles/rémunération-travail/cdd/indemnité_fin_contrat.yaml b/règles/rémunération-travail/cdd/indemnité_fin_contrat.yaml
index 575e24240..631a88290 100644
--- a/règles/rémunération-travail/cdd/indemnité_fin_contrat.yaml
+++ b/règles/rémunération-travail/cdd/indemnité_fin_contrat.yaml
@@ -1,4 +1,4 @@
-- Cotisation: Indemnité de Fin de Contrat
+- Cotisation: Indemnité de fin de contrat
   attributs:
     type: indemnité
   alias: Prime de précarité
diff --git a/source/components/Rule.css b/source/components/Rule.css
index ef80ecfb0..86e7279b6 100644
--- a/source/components/Rule.css
+++ b/source/components/Rule.css
@@ -1,3 +1,11 @@
 #variable {
 	font-size: 150%;
 }
+
+#variable h1 {
+	padding: 0 3em;
+}
+
+#variable pre {
+	padding: 1em 2em;
+}
diff --git a/source/components/Rule.js b/source/components/Rule.js
index 535da7d5f..3fd8bb92f 100644
--- a/source/components/Rule.js
+++ b/source/components/Rule.js
@@ -5,10 +5,14 @@ import JSONTree from 'react-json-tree'
 
 export default class Rule extends Component {
 	render() {
-		let json = findRuleByName(this.props.params.name)[2]
+		let {
+			name
+		} = this.props.params,
+			json = findRuleByName(name)[2]
 
 		return (
 			<div id="variable">
+				<h1>{name}</h1>
 				<pre>
 					<code className="yaml">
 						<JSONTree getItemString={() => ''} theme={theme} hideRoot="true" shouldExpandNode={() => true} data={json} />
diff --git a/source/containers/Layout.css b/source/containers/Layout.css
index f87ad7b4d..73d9e40de 100644
--- a/source/containers/Layout.css
+++ b/source/containers/Layout.css
@@ -2,6 +2,11 @@ body {
 	font-family: 'Open Sans';
 }
 
+#site-logo {
+	position: fixed;
+	left: 1em;
+	top: 1.5em;
+}
 
 #warning {
 	padding: .2em 0;
diff --git a/source/containers/Layout.js b/source/containers/Layout.js
index 736d67804..91b8e3644 100644
--- a/source/containers/Layout.js
+++ b/source/containers/Layout.js
@@ -1,10 +1,18 @@
 import React, { Component } from 'react'
 import './Layout.css'
+import {Link} from 'react-router'
 
 export default class Layout extends Component {
 	render() {
 		return (<div>
-			<div id="header"></div>
+			<div id="header">
+				{
+					this.props.location.pathname != '/' &&
+					<Link to="/">
+						<img id="site-logo" src={require('../images/logo.png')} style={{width: '100px'}} />
+					</Link>
+				}
+			</div>
 			{this.props.children}
 			<div id="warning">
 				Attention ! Tout le contenu de ce site est hautement expérimental.