+ {% if page.lang == 'en' %}
+ {% if page.fr_url == '' %}
+ FR|EN
+ {% else %}
+ FR|EN
+ {% endif %}
+ {% include nav_en.html %}
+ {% else %}
+ {% if page.en_url == '' %}
+ FR|EN
+ {% else %}
+ FR|EN
+ {% endif %}
+ {% include nav_fr.html %}
+ {% endif %}
+
+
+
+ {{ page.subtitle }}
+
+
{{ content }}
diff --git a/css/screen.scss b/css/screen.scss
index 4cb760c..a0e4e87 100644
--- a/css/screen.scss
+++ b/css/screen.scss
@@ -122,7 +122,9 @@ ol li:hover { border-right: 3px solid $links; padding-right: 7px; }
#info span { display: inline-block; width: 100%; max-width: 618px; vertical-align: middle; }
-#cv_title { font-family: "OpenSansLight",sans; font-size: 2em; margin: 1em; }
+#page_subtitle { font-family: "OpenSansLight",sans; font-size: 2em; margin: 1em; }
+
+#main_email { padding: 0.5em; }
#http_code { text-align: center; font-size: 10em; line-height: 1em; }
diff --git a/cv.markdown b/cv.markdown
index e33537a..a9111ee 100644
--- a/cv.markdown
+++ b/cv.markdown
@@ -1,16 +1,10 @@
---
layout: default
math: false
-title: 'Vitæ · Gaspard Jankowiak'
+subtitle: 'Vitæ'
---
{% assign authors = site.data.authors %}
-FR\|[EN](/en/cv)
-{: .switcher}
-{% include nav_fr.html %}
-
-Vitæ
-
* Né le 30 juin 1987 à Chambéry, France
# Thèmes de recherche
diff --git a/divers.markdown b/divers.markdown
index 234166b..3524f8d 100644
--- a/divers.markdown
+++ b/divers.markdown
@@ -1,14 +1,10 @@
---
layout: default
math: true
+subtitle: Divers
+en_url: /en/misc
---
-FR\|[EN](/en/misc)
-{: .switcher}
-{% include nav_fr.html %}
-
-# Divers
-
## Accès aux articles de l'université de Vienne via u:access
Les personnes ayant un compte à l'université de Vienne (étudiants, chercheurs, invités...) peuvent accéder à certaines revues via le proxy u:access. Pour cela, on va sur la page où le papier est proposé au téléchargement, et on change le domaine (la partie avec `.com`) en remplaçant tous les `.` par `-` et en rajoutant `.uaccess.univie.ac.at`. Par exemple
diff --git a/en/cv.markdown b/en/cv.markdown
index 1e01c57..1eaf617 100644
--- a/en/cv.markdown
+++ b/en/cv.markdown
@@ -1,16 +1,11 @@
---
layout: default
math: false
-title: 'Vitæ · Gaspard Jankowiak'
+subtitle: 'Vitæ'
+lang: en
---
{% assign authors = site.data.authors %}
-[FR](/cv)\|EN
-{: .switcher}
-{% include nav_en.html %}
-
-Vitæ
-
* Born on June 30, 1987 in Chambéry, France
# Research interests
diff --git a/en/index.markdown b/en/index.markdown
index 441c0e3..5038d47 100644
--- a/en/index.markdown
+++ b/en/index.markdown
@@ -5,10 +5,6 @@ lang: en
---
{% assign authors = site.data.authors %}
-[FR](/)\|EN
-{: .switcher}
-{% include nav_en.html %}
-
Currently, I am a postdoc at the RICAM, where I'm working with {{authors['mtw'].fullname}} on designing and analyzing models in the context of crowd motion and cell biology, including membranes of crawling lymphocytes.
More generally, I am also interested in analysis of non linear PDEs, of drift-diffusion type in particular, just like the Keller and Segel model for chemotaxis.
diff --git a/en/misc.markdown b/en/misc.markdown
index 76c00be..c7386de 100644
--- a/en/misc.markdown
+++ b/en/misc.markdown
@@ -2,14 +2,10 @@
layout: default
math: false
lang: en
+subtitle: 'Miscellaneous'
+fr_url: /divers
---
-[FR](/divers)\|EN
-{: .switcher}
-{% include nav_en.html %}
-
-# Miscellaneous
-
## u:access at the University of Vienna
People with an account at the university of Vienna can use u:access to download papers from certain subscription only scientific journals. This can be done by looking for a given paper via u:find, or by directly using the u:access proxy. This is easily done by modifying the URL of the page of the paper: replace `.` by `-` in the domain part, and append `.uaccess.univie.ac.at`, still to the domain part. For example
diff --git a/en/publications.markdown b/en/publications.markdown
index 6388ba7..f416fe4 100644
--- a/en/publications.markdown
+++ b/en/publications.markdown
@@ -2,22 +2,20 @@
layout: default
math: false
lang: en
+subtitle: 'Publications'
---
-[FR](/publications)\|EN
-{: .switcher}
-{% include nav_en.html %}
-
-# Publications & preprints
-
{% assign authors = site.data.authors %}
+# Preprints
+
+
+{% for pub in site.data.submitted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
+
+
+# Published articles
+
{% for pub in site.data.published %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
-## Submitted articles
-
-
-{% for pub in site.data.submitted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
-
diff --git a/enseignement/index.markdown b/enseignement/index.markdown
index c055269..0adc153 100644
--- a/enseignement/index.markdown
+++ b/enseignement/index.markdown
@@ -1,11 +1,10 @@
---
layout: default
-title: Enseignement
+subtitle: Enseignement
math: false
+en_url: /enseignement
---
-{% include nav_fr.html %}
-
# Paris-Dauphine (MIDO)
## 2013-2014
diff --git a/index.markdown b/index.markdown
index de43d19..9ca3386 100644
--- a/index.markdown
+++ b/index.markdown
@@ -4,10 +4,6 @@ math: false
---
{% assign authors = site.data.authors %}
-FR\|[EN](/en/)
-{: .switcher}
-{% include nav_fr.html %}
-
Actuellement postdoc au RICAM, je travaille avec {{authors['mtw'].fullname}} sur la formulation et l'analyse de modèles pour les déplacements piétonniers et la biologie, et plus particulièrement la membrane de lymphocytes.
Je m'intéresse plus généralement à l'analyse des EDP non linéaires, en particulier celle de type dérive-diffusion, comme le modèle de Keller et Segel pour la chimiotaxie.
diff --git a/publications.markdown b/publications.markdown
index 5be9db1..b9b77a7 100644
--- a/publications.markdown
+++ b/publications.markdown
@@ -1,22 +1,19 @@
---
layout: default
math: false
+subtitle: Publications
---
-FR\|[EN](/en/publications)
-{: .switcher}
-{% include nav_fr.html %}
-
-# Publications & preprints
-
{% assign authors = site.data.authors %}
-
-{% for pub in site.data.published %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
-
-
-## Articles soumis
+# Articles soumis (preprints)
{% for pub in site.data.submitted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
+
+# Articles publiés
+
+
+{% for pub in site.data.published %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
+