diff --git a/public/styles/main.css b/public/styles/main.css index 64de47d..e883f01 100644 --- a/public/styles/main.css +++ b/public/styles/main.css @@ -22,19 +22,27 @@ h1 { text-transform: uppercase; - color: var(--primary); font-weight: bold; font-size: 1.5em; } +h1, h1 * { + color: var(--primary); +} + h2 { text-transform: uppercase; - color: var(--secondary); font-weight: bold; font-size: 1.5em; } -h1, h2, h3 { +h2, h2 * { + color: var(--secondary); +} + +h1, h1 *, +h2, h2 *, +h3, h3 * { font-family: 'Kanit', sans-serif; } diff --git a/templates/_includes/html/base.html.twig b/templates/_includes/html/base.html.twig index ca7a005..f013ec5 100644 --- a/templates/_includes/html/base.html.twig +++ b/templates/_includes/html/base.html.twig @@ -17,7 +17,7 @@ ]|merge(scripts|default([])) %} {% set page=page|default('N/A') %} -{% set returnLink=returnLink|default('') %} +{% set returnPath=returnPath|default([]) %} @@ -44,10 +44,10 @@

- {% if returnLink != '' %} - Retour - {% endif %} + {% for link in returnPath %} + {{ link.label|default('retour') }} + / + {% endfor %} {{ page }}

diff --git a/templates/activity/activities.html.twig b/templates/activity/activities.html.twig index 5eb181c..d40eadf 100644 --- a/templates/activity/activities.html.twig +++ b/templates/activity/activities.html.twig @@ -1,5 +1,6 @@ {% extends '_includes/html/base.html.twig' %} +{% set pageName='Activités' %} {% set page='Activités' %} {% block pageContent %} diff --git a/templates/actor/actor.html.twig b/templates/actor/actor.html.twig index f351706..a51c06d 100644 --- a/templates/actor/actor.html.twig +++ b/templates/actor/actor.html.twig @@ -1,7 +1,8 @@ {% extends '_includes/html/base.html.twig' %} -{% set page="Edition de l'acteur "~actor.displayName %} -{% set returnLink=url("actor_actors", {}, false) %} +{% set pageName='Acteurs - '~actor.displayName %} +{% set page=actor.displayName %} +{% set returnPath=[{label: 'Acteurs', url: url('actor_actors', {}, false), title: 'Liste des acteurs'}] %} {% block pageContent %}
diff --git a/templates/actor/actors.html.twig b/templates/actor/actors.html.twig index 01853bf..518cf6c 100644 --- a/templates/actor/actors.html.twig +++ b/templates/actor/actors.html.twig @@ -1,5 +1,6 @@ {% extends '_includes/html/base.html.twig' %} +{% set pageName='Acteurs' %} {% set page='Acteurs' %} {% block pageContent %}