handle summary for persons programs and diplomas

config.yaml

@@ -14,7 +14,7 @@ params:
   breadcrumb:
     position: hero-start #  hero-start |  hero-end | after-hero | none
   summary:
-    position: content # content | hero
+    position: hero # content | hero
   home:
     toc:
       disabled: true
@@ -141,10 +141,6 @@ params:
           mobile:   400
           tablet:   800
           desktop:  900
-        hero_single:
-          mobile:   400
-          tablet:   800
-          desktop:  900
       persons:
         hero:
           mobile:   400

layouts/diplomas/term.html

@@ -12,7 +12,7 @@
             <a href="{{ .Permalink }}" class="title" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">
               {{- $title -}}
             </a>
-            {{ if .Params.summary }}
+            {{ if .Params }}
               <p class="description">
                 {{- partial "PrepareHTML" .Params.summary -}}
               </p>

layouts/papers/list.html

 {{ define "main" }}
-  {{- $title := or .Params.header_text .Title -}}
-  {{- partial "header/hero.html"
-        (dict
-          "title" $title
-          "image" .Params.image
-          "sizes" site.Params.image_sizes.sections.papers.hero
-          "context" .
-        ) -}}
+{{ partial "papers/hero.html" . }}
+
   <div class="document-content">
     <div class="container">
       <ul class="papers">

layouts/papers/single.html

 {{ define "main" }}
-  {{- $title := or .Params.header_text .Title -}}
-  {{- partial "header/hero.html"
-        (dict
-          "title" $title
-          "subtitle" .Params.summary
-          "image" .Params.image
-          "sizes" site.Params.image_sizes.sections.papers.hero_single
-          "context" .
-        ) -}}
+{{ partial "papers/hero.html" . }}
+
 <div class="document-content" itemscope itemtype="https://schema.org/ScholarlyArticle">
   <meta itemprop="name" content="{{ partial "PrepareHTML" .Title }}">
   {{ partial "papers/sidebar.html" . }}

layouts/partials/categories/summary.html

-{{- partial "commons/summary-wrapper.html" . -}}
+{{- partial "commons/summary-in-content.html" . -}}

layouts/partials/diplomas/hero-single.html

 {{- $title := or .Params.header_text .Title -}}
+{{ $subtitle := "" }}
+{{- $summary := partial "PrepareText" .Params.summary -}}
+{{ if and (eq site.Params.summary.position "hero") $summary }}
+  {{ $subtitle = $summary }}
+{{ end }}
+
 <header class="hero">
   <div class="container">
     {{- if .Params.breadcrumb | default true -}}
       {{ partial "header/breadcrumbs.html" . }}
     {{- end -}}
     <div class="content">
-      <h1>{{ partial "PrepareHTML" $title }}</h1>
+      {{- if $subtitle -}}
+        <hgroup>
+          <h1>{{ partial "PrepareHTML" $title }}</h1>
+          <p class="lead">{{ partial "PrepareHTML" $subtitle }}</p>
+        </hgroup>
+      {{- else -}}
+        <h1>{{ partial "PrepareHTML" $title }}</h1>
+      {{- end -}}
       {{- if .Params.image }}
         <figure>
           {{ partial "commons/image.html"

layouts/partials/diplomas/summary.html

-{{- partial "commons/summary-wrapper.html" . -}}
+{{- partial "commons/summary-in-content.html" . -}}

layouts/partials/header/hero.html

@@ -6,10 +6,12 @@
 {{ end }}
 
 {{- $summary := partial "PrepareText" .context.Params.summary -}}
+{{- $subtitle_is_summary := false -}}
 
 {{ if not $subtitle }}
   {{ if and (eq site.Params.summary.position "hero") $summary }}
    {{ $subtitle = $summary }}
+   {{ $subtitle_is_summary = true }}
   {{ end }}
 {{ end }}
 
@@ -24,7 +26,7 @@
       {{- if $subtitle -}}
         <hgroup>
           <h1>{{ partial "PrepareHTML" .title }}</h1>
-          <p>{{ partial "PrepareHTML" $subtitle }}</p>
+          <p {{ if $subtitle_is_summary -}} class="lead" {{- end -}}>{{ partial "PrepareHTML" $subtitle }}</p>
         </hgroup>
       {{- else -}}
         <h1>{{ partial "PrepareHTML" .title }}</h1>

layouts/partials/home/summary.html

-{{- partial "commons/summary-wrapper.html" . -}}
+{{- partial "commons/summary-in-content.html" . -}}

layouts/partials/organizations/summary.html

-{{- partial "commons/summary-wrapper.html" . -}}
+{{- partial "commons/summary-in-content.html" . -}}

layouts/partials/pages/summary.html

-{{- partial "commons/summary-wrapper.html" . -}}
+{{- partial "commons/summary-in-content.html" . -}}

layouts/partials/papers/hero.html

+{{- $title := or .Params.header_text .Title -}}
+{{- partial "header/hero.html"
+      (dict
+        "title" $title
+        "image" .Params.image
+        "sizes" site.Params.image_sizes.sections.papers.hero
+        "context" .
+      ) -}}
\ No newline at end of file

layouts/partials/persons/hero-single.html

+{{ $subtitle := "" }}
+{{- $summary := partial "PrepareText" .Params.summary -}}
+{{ if and (eq site.Params.summary.position "hero") $summary }}
+  {{ $subtitle = $summary }}
+{{ end }}
+
 <header class="hero">
   <div class="container">
     {{- if eq site.Params.breadcrumb.position "hero-start" -}}
       {{ partial "header/breadcrumbs.html" . }}
     {{- end -}}
     <div class="content">
-      <h1>{{ safeHTML (partial "CorrectPunctuation" .Title) }}</h1>
+      {{- if $subtitle -}}
+        <hgroup>
+          <h1>{{ partial "PrepareHTML" .Title }}</h1>
+          <p class="lead">{{ partial "PrepareHTML" $subtitle }}</p>
+        </hgroup>
+      {{- else -}}
+        <h1>{{ partial "PrepareHTML" .Title }}</h1>
+      {{- end -}}
+
       {{ if .Params.image }}
         <div class="avatar">
           {{ partial "commons/image.html"

layouts/partials/persons/summary.html

-{{- partial "commons/summary-wrapper.html" . -}}
+{{- partial "commons/summary-in-content.html" . -}}

layouts/partials/posts/summary.html

-{{- partial "commons/summary-wrapper.html" . -}}
+{{- partial "commons/summary-in-content.html" . -}}

layouts/partials/programs/hero-single.html

 {{- $title := or .Params.header_text .Title -}}
+{{ $subtitle := "" }}
+{{- $summary := partial "PrepareText" .Params.summary -}}
+{{ if and (eq site.Params.summary.position "hero") $summary }}
+  {{ $subtitle = $summary }}
+{{ end }}
 <header class="hero hero-program">
   <div class="container">
     {{- if .Params.breadcrumb | default true -}}
       {{ partial "header/breadcrumbs.html" . }}
     {{- end -}}
     <div class="content">
-      <h1>{{ partial "PrepareHTML" $title }}</h1>
+      {{- if $subtitle -}}
+        <hgroup>
+          <h1>{{ partial "PrepareHTML" $title }}</h1>
+          <p class="lead">{{ partial "PrepareHTML" $subtitle }}</p>
+        </hgroup>
+      {{- else -}}
+        <h1>{{ partial "PrepareHTML" $title }}</h1>
+      {{- end -}}
     </div>
   </div>
 

layouts/partials/programs/summary.html

-{{- partial "commons/summary-wrapper.html" . -}}
+{{- partial "commons/summary-in-content.html" . -}}

layouts/partials/sitemap/summary.html

-{{- partial "commons/summary-wrapper.html" . -}}
+{{- partial "commons/summary-in-content.html" . -}}

layouts/persons/single.html

@@ -36,11 +36,9 @@
 
       <div class="informations">
         <div>
-          {{ if (partial "GetTextFromHTML" .Params.summary) }}
-            <div class="lead" itemprop="description">
-              {{ partial "PrepareText" .Params.summary }}
-            </div>
-          {{ end }}
+          {{ partial "persons/summary.html" (dict
+            "context" .
+          ) }}
           {{ if (partial "GetTextFromHTML" .Content) }}
             <div class="rich-text">
               {{ partial "PrepareHTML" .Content }}