From 4a7b83ae3b84d9b2c816e61d4497121d59ffd164 Mon Sep 17 00:00:00 2001
From: Gaspard Jankowiak <jankowiak@ceremade.dauphine.fr>
Date: Fri, 8 Mar 2013 13:14:26 +0100
Subject: [PATCH] more flexible header configuration

---
 _config.yml           |  5 +++++
 _layouts/default.html | 29 ++++++++++++++++++++++++++---
 en.markdown           |  4 +++-
 index.markdown        |  1 -
 4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/_config.yml b/_config.yml
index b290479..cd5041a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -9,3 +9,8 @@ safe: true
 pygments: true
 
 style: light
+
+title: 'Gaspard Jankowiak &middot; Ceremade &middot; Université Paris Dauphine'
+header-title: 'Page personnelle de Gaspard Jankowiak'
+header-subtitle: 'Thésard au Ceremade &mdash; Université Paris Dauphine'
+header-homelink: '/'
diff --git a/_layouts/default.html b/_layouts/default.html
index ab26d1e..74c5bde 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -2,7 +2,13 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>{{ page:title }}</title>
+        <title>
+        {% if page:title  %}
+            {{ page:title }}
+        {% else %}
+            {{ site:title }}
+        {% endif %}
+        </title>
         <link rel="icon" href="/images/favicon.png">
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         <script type="text/x-mathjax-config">
@@ -32,8 +38,25 @@
 
                 <section>
                 <div id="title">
-                    <h1><a href="/">Page personnelle de Gaspard Jankowiak</a></h1>
-                    <p>Thésard au Ceremade — Université Paris-Dauphine</p>
+                    {% if page:header-homelink %}
+                    {% assign homelink = page:header-homelink %}
+                    {% else %}
+                    {% assign homelink = site:header-homelink %}
+                    {% endif %}
+                    <h1><a href="{{ homelink }}">
+                        {% if page:header-title  %}
+                            {{ page:header-title }}
+                        {% else %}
+                            {{ site:header-title }}
+                        {% endif %}
+                    </a></h1>
+                    <p>
+                    {% if page:header-subtitle  %}
+                        {{ page:header-subtitle }}
+                    {% else %}
+                        {{ site:header-subtitle }}
+                    {% endif %}
+                    </p>
                     <hr>
                 </div>
 
diff --git a/en.markdown b/en.markdown
index bf55c8b..1d07c31 100644
--- a/en.markdown
+++ b/en.markdown
@@ -1,6 +1,8 @@
 ---
-title: Gaspard Jankowiak · Ceremade · Université Paris Dauphine
 layout: default
+header-title: Gaspard Jankowiak's homepage
+header-subtitle: PhD student at Ceremade &mdash; Université Paris Dauphine
+header-homelink: /en
 ---
 
 [FR](/)\|EN
diff --git a/index.markdown b/index.markdown
index d052aff..e2b8c39 100644
--- a/index.markdown
+++ b/index.markdown
@@ -1,5 +1,4 @@
 ---
-title: Gaspard Jankowiak · Ceremade · Université Paris Dauphine
 layout: default
 ---
 
