diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 781c77db3764d5440f2664fec2c40b4611b323dd..999bd8b8ce1db09b83fb7631fd39a44efc2c19c6 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -275,39 +275,60 @@ $breadcrumb-icon-color: var(--color-text-alt) !default
// Icons
$icons: ()
$icons: map-merge($icons, ("arrow": "\ff01"))
+$icons: map-merge($icons, ("arrow-raw": "\e93a"))
$icons: map-merge($icons, ("arrow-first": "\e906"))
$icons: map-merge($icons, ("arrow-last": "\e907"))
$icons: map-merge($icons, ("arrow-left": "\ff02"))
+$icons: map-merge($icons, ("arrow-left-raw": "\e938"))
$icons: map-merge($icons, ("arrow-next": "\e909"))
$icons: map-merge($icons, ("arrow-previous": "\e908"))
$icons: map-merge($icons, ("arrow-right": "\ff00"))
+$icons: map-merge($icons, ("arrow-right-raw": "\e939"))
+$icons: map-merge($icons, ("arrow-alt": "\e931"))
+$icons: map-merge($icons, ("arrow-alt-raw": "\e936"))
$icons: map-merge($icons, ("burger": "\e902"))
$icons: map-merge($icons, ("burger-close": "\e905"))
$icons: map-merge($icons, ("caret": "\e904"))
+$icons: map-merge($icons, ("caret-raw": "\e940"))
+$icons: map-merge($icons, ("caret-bottom": "\e911"))
+$icons: map-merge($icons, ("caret-bottom-raw": "\e944"))
+$icons: map-merge($icons, ("caret-left": "\e912"))
+$icons: map-merge($icons, ("caret-left-raw": "\e942"))
$icons: map-merge($icons, ("caret-top": "\e914"))
+$icons: map-merge($icons, ("caret-top-raw": "\e941"))
$icons: map-merge($icons, ("caret-right": "\e913"))
-$icons: map-merge($icons, ("caret-left": "\e912"))
-$icons: map-merge($icons, ("caret-bottom": "\e911"))
+$icons: map-merge($icons, ("caret-right-raw": "\e943"))
$icons: map-merge($icons, ("check": "\ff06"))
$icons: map-merge($icons, ("check-inline": "\ff07"))
+$icons: map-merge($icons, ("check-inline-raw": "\e945"))
$icons: map-merge($icons, ("close": "\e90e"))
$icons: map-merge($icons, ("copy": "\ff03"))
+$icons: map-merge($icons, ("copy-raw": "\e946"))
$icons: map-merge($icons, ("copy-inline": "\ff04"))
$icons: map-merge($icons, ("download": "\e900"))
$icons: map-merge($icons, ("download-inline": "\e92f"))
+$icons: map-merge($icons, ("download-raw": "\e937"))
$icons: map-merge($icons, ("eye": "\e901"))
$icons: map-merge($icons, ("facebook": "\e90b"))
+$icons: map-merge($icons, ("facebook-raw": "\e93e"))
$icons: map-merge($icons, ("globe": "\ff10"))
+$icons: map-merge($icons, ("globe-raw": "\e934"))
$icons: map-merge($icons, ("instagram": "\e90a"))
+$icons: map-merge($icons, ("instagram-raw": "\e93b"))
$icons: map-merge($icons, ("link-blank": "\e903"))
$icons: map-merge($icons, ("link-blank-block": "\ff05"))
+$icons: map-merge($icons, ("link-blank-raw": "\e932"))
$icons: map-merge($icons, ("linkedin": "\e90c"))
+$icons: map-merge($icons, ("linkedin-raw": "\e93c"))
$icons: map-merge($icons, ("list-hyphen": "\e917"))
+$icons: map-merge($icons, ("list-hyphen-raw": "\e93f"))
$icons: map-merge($icons, ("pause": "\e90f"))
$icons: map-merge($icons, ("play": "\e910"))
$icons: map-merge($icons, ("search": "\e916"))
$icons: map-merge($icons, ("search-inline": "\ee13"))
+$icons: map-merge($icons, ("search-raw": "\e933"))
$icons: map-merge($icons, ("social": "\e915"))
+$icons: map-merge($icons, ("social-raw": "\e935"))
$icons: map-merge($icons, ("social-inline": "\e92e"))
$icons: map-merge($icons, ("social-facebook": "\ee01"))
$icons: map-merge($icons, ("social-instagram": "\ee02"))
@@ -323,6 +344,7 @@ $icons: map-merge($icons, ("social-github": "\ee10"))
$icons: map-merge($icons, ("social-email": "\ee11"))
$icons: map-merge($icons, ("toc": "\e918"))
$icons: map-merge($icons, ("twitter": "\e90d"))
+$icons: map-merge($icons, ("twitter-raw": "\e90d"))
$icons: map-merge($icons, ("whatsapp": "\e919"))
$icons: map-merge($icons, ("email": "\e920"))
$icons: map-merge($icons, ("telegram": "\e921"))
diff --git a/assets/sass/_theme/design-system/button.sass b/assets/sass/_theme/design-system/button.sass
index bae206c7cd3f03235d86a9d88dd8e83969d4b5ae..fffdd2dbb288563a23417ef62283ca352feb4b52 100644
--- a/assets/sass/_theme/design-system/button.sass
+++ b/assets/sass/_theme/design-system/button.sass
@@ -57,18 +57,6 @@
border-color: transparent
color: var(--color-background)
-
-// TODO: check usage in journal
-.link-btn
- @extend .button
- @include media-breakpoint-up(desktop)
- padding: $spacing-2
- &[target="_blank"]:not(.icon)
- display: flex
- justify-content: space-between
- align-items: center
- @include icon-block(link-blank-block, after)
-
@mixin link-icon($icon: false)
@include button-reset
line-height: $body-line-height
@@ -86,6 +74,9 @@
@if $icon
@include icon($icon, after)
+a.btn[target="_blank"]
+ @include button-icon(link-blank-raw)
+
.dropdown-share
position: relative
.dropdown-menu
diff --git a/assets/sass/_theme/design-system/hero.sass b/assets/sass/_theme/design-system/hero.sass
index 2231ea2659bb27611337e57ef9c80877cc533726..6f6f6118019fc9398f7c23965d3d6d87b12f63fd 100644
--- a/assets/sass/_theme/design-system/hero.sass
+++ b/assets/sass/_theme/design-system/hero.sass
@@ -15,7 +15,6 @@
outline-color: $hero-color
.content
align-items: start
- padding-top: $spacing-5
.hero-text
margin-top: $spacing-5
h1 + p
@@ -47,6 +46,8 @@
> a
@include stretched-link
@include media-breakpoint-down(desktop)
+ .content
+ padding-top: 0
&--with-image
padding-bottom: 0
.content
@@ -66,6 +67,8 @@
margin-bottom: calc(#{-$spacing-7} + #{$spacing-4})
@include media-breakpoint-up(desktop)
+ .content
+ padding-top: $spacing-5
.hero-text
width: columns(9)
&--with-image
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index 015b2557837a6e6d540fb7d438447d9320e182f7..d2895899dece67290a8aa77ae3c05244e2754557 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -21,14 +21,14 @@ ol.programs
justify-content: end
.container
position: relative
+
&:not(.full-width)
.document-content
.lead
font-family: $lead-font-family
+ font-size: var(--lead-size)
font-weight: $lead-weight
- line-height: $lead-line-height
- @include media-breakpoint-up(desktop)
- font-size: $lead-size-desktop
+ line-height: var(--lead-line-height)
ol.programs
margin-bottom: $spacing-5
@@ -36,9 +36,10 @@ ol.programs
line-height: 1
.document-content
- @include media-breakpoint-up(desktop)
+ .program-summary
+ margin-bottom: $spacing-5
.lead
- padding-bottom: $spacing-4
+ margin-bottom: $spacing-3
.content
padding-bottom: $spacing-4
section:not(.block) > * + *
@@ -69,6 +70,8 @@ ol.programs
margin-top: $spacing-5
@include media-breakpoint-up(desktop)
.document-content
+ .program-summary
+ margin-bottom: $spacing-6
.content
@include grid(12, desktop)
position: relative
diff --git a/i18n/fr.yml b/i18n/fr.yml
index cfc4cd02c44ea65690469b99ce44e38d55cc24a2..086bae77aa0f0e8353c210a5209bc27a80887f84 100644
--- a/i18n/fr.yml
+++ b/i18n/fr.yml
@@ -262,6 +262,10 @@ programs:
prerequisites: Prérequis
presentation: En bref
pricing: Tarifs
+ pricing_initial: Coûts de la formation initiale
+ pricing_continuing: Coûts de la formation continue
+ pricing_apprenticeship: Coûts de l'apprentissage
+ website: Visiter le site web
registration: Modalités et délais d’accès
roles: Organisation
teachers: Enseignants·es
diff --git a/layouts/partials/footer/debug.html b/layouts/partials/footer/debug.html
index 2dc6e28a593fba575c8c177d9601c8f4c75826ad..ed9ccda3fa809a7848866fb727fb1f5c00dcfcae 100644
--- a/layouts/partials/footer/debug.html
+++ b/layouts/partials/footer/debug.html
@@ -114,7 +114,6 @@
left: 0;
pointer-events: none;
width: 100%;
- mix-blend-mode: difference;
opacity: 0.5;
font-family: sans-serif;
font-size: 12px;
@@ -131,7 +130,7 @@
}
.d-spacing > div {
width: 100%;
- border-bottom: 1px solid white;
+ border-bottom: 1px solid var(--color-text);;
display: block;
color: white;
text-indent: 5px;
diff --git a/layouts/partials/header/hero.html b/layouts/partials/header/hero.html
index 6502a11031969532c00893dc8e088afc69943aa2..388a3a3df4564862b086aac7c8731c85728bf0de 100644
--- a/layouts/partials/header/hero.html
+++ b/layouts/partials/header/hero.html
@@ -11,6 +11,8 @@
{{ $summary := .context.Params.summary | safeHTML }}
{{ $subtitle_is_summary := false }}
+{{ $button := .button | default .context.Params.header_cta }}
+
{{ if not $subtitle }}
{{ if and (eq site.Params.summary.position "hero") $summary }}
{{ $subtitle = $summary }}
@@ -38,7 +40,8 @@
{{ else }}
<h1>{{ partial "PrepareHTML" .title }}</h1>
{{ end }}
- {{ with .context.Params.header_cta }}
+
+ {{ with $button }}
{{ if and .display .target .label }}
<a href="{{ .target }}" class="btn">{{ .label }}</a>
{{ end }}
diff --git a/layouts/partials/programs/admission.html b/layouts/partials/programs/admission.html
index 50d5ec348d9344bfbf1e2af0a6510036c62efa21..ca69bfbba868559f585c332d6ece9a47cd1e8062 100644
--- a/layouts/partials/programs/admission.html
+++ b/layouts/partials/programs/admission.html
@@ -18,6 +18,27 @@
</section>
{{- end -}}
+ {{- if partial "GetTextFromHTML" .Params.pricing_initial -}}
+ <section id="{{ urlize (i18n "programs.pricing_initial") }}">
+ <h3>{{ i18n "programs.pricing_initial" }}</h3>
+ {{- partial "PrepareHTML" .Params.pricing_initial -}}
+ </section>
+ {{- end -}}
+
+ {{- if partial "GetTextFromHTML" .Params.pricing_continuing -}}
+ <section id="{{ urlize (i18n "programs.pricing_continuing") }}">
+ <h3>{{ i18n "programs.pricing_continuing" }}</h3>
+ {{- partial "PrepareHTML" .Params.pricing_continuing -}}
+ </section>
+ {{- end -}}
+
+ {{- if partial "GetTextFromHTML" .Params.pricing_apprenticeship -}}
+ <section id="{{ urlize (i18n "programs.pricing_apprenticeship") }}">
+ <h3>{{ i18n "programs.pricing_apprenticeship" }}</h3>
+ {{- partial "PrepareHTML" .Params.pricing_apprenticeship -}}
+ </section>
+ {{- end -}}
+
{{- if partial "GetTextFromHTML" .Params.registration -}}
<section id="{{ urlize (i18n "programs.registration") }}">
<h3>{{ i18n "programs.registration" }}</h3>
diff --git a/layouts/partials/programs/essential.html b/layouts/partials/programs/essential.html
index 9d35596d885faf6708701fbece43e4ef00f663c8..9e02eda1e47036aa0425e7b656fa043140db8bbb 100644
--- a/layouts/partials/programs/essential.html
+++ b/layouts/partials/programs/essential.html
@@ -1,6 +1,5 @@
<div class="essential-container" id="#{{ urlize (i18n "programs.toc.essential") }}">
<div class="container">
-
{{ $parent := .Params.parent }}
{{- with .Params.diplomas -}}
{{- $diploma := site.GetPage (printf "/diplomas/%s" .) -}}
diff --git a/layouts/partials/programs/hero-single.html b/layouts/partials/programs/hero-single.html
index 96357ec373647c0e43568e650525330e607e3b04..eb7dd28515f74043a151f17f10a099eaea83707c 100644
--- a/layouts/partials/programs/hero-single.html
+++ b/layouts/partials/programs/hero-single.html
@@ -1,7 +1,17 @@
{{- $title := or .Params.header_text .Title -}}
+{{- $button := false -}}
+{{- if and (eq site.Params.summary.position "hero") .Params.website_url -}}
+ {{ $button = (dict
+ "display" true
+ "target" .Params.website_url
+ "label" (i18n "programs.website")
+ ) }}
+{{- end -}}
+
{{ partial "header/hero.html"
(dict
"title" $title
"context" .
+ "button" $button
"hero_complement" "programs/essential.html"
)}}
diff --git a/layouts/partials/programs/summary.html b/layouts/partials/programs/summary.html
index 85e4edf81a14c7fedc7c790f755b91710a4d9224..d5dec153c5ee5107a5d8c8bf83c9b67c80c8dea9 100644
--- a/layouts/partials/programs/summary.html
+++ b/layouts/partials/programs/summary.html
@@ -1 +1,11 @@
-{{- partial "commons/summary-in-content.html" . -}}
+{{ $summary := .summary | default (.context.Params.summary | safeHTML) }}
+{{ if and (eq site.Params.summary.position "content") $summary }}
+ <div class="container program-summary">
+ <p class="lead" role="heading" aria-level="2">
+ {{ $summary }}
+ </p>
+ {{ if .context.Params.website_url }}
+ <a href="{{- .context.Params.website_url -}}" target="_blank" class="btn">{{ i18n "programs.website" }}</a>
+ {{ end }}
+ </div>
+{{ end }}
diff --git a/static/assets/fonts/fonticons/IconFont.ttf b/static/assets/fonts/fonticons/IconFont.ttf
index 650452b6b0509f1a439a8a7ec317436b0a56c8f0..9db0243c3b7db2c95cf174f6c6122aa31f156b21 100644
Binary files a/static/assets/fonts/fonticons/IconFont.ttf and b/static/assets/fonts/fonticons/IconFont.ttf differ
diff --git a/static/assets/fonts/fonticons/IconFont.woff b/static/assets/fonts/fonticons/IconFont.woff
index 43bf09ec3bdb53bede37a91a8b553a0682c6232d..3803db73637ce37756dc81f5b5c3bdcc5b7d4685 100644
Binary files a/static/assets/fonts/fonticons/IconFont.woff and b/static/assets/fonts/fonticons/IconFont.woff differ
diff --git a/static/assets/fonts/fonticons/IconFont.woff2 b/static/assets/fonts/fonticons/IconFont.woff2
index b068507042fbf5f24819392520ca94b96453c663..95f9347c48c39145ff8c6ba9efc9e5741f41b741 100644
Binary files a/static/assets/fonts/fonticons/IconFont.woff2 and b/static/assets/fonts/fonticons/IconFont.woff2 differ