Merge pull request #65 from noesya/fix/chapo

replace chapo by summary

assets/sass/_theme/blocks/chapo.sass → assets/sass/_theme/blocks/summary.sass

@@ -1,4 +1,4 @@
-.block-chapo
+.block-summary
     @include in-page-without-sidebar
         padding-top: 0
         margin-top: $spacing3

assets/sass/_theme/hugo-osuny.sass

@@ -30,7 +30,6 @@
 
 // Blocks
 @import "blocks/base"
-@import "blocks/chapo"
 @import "blocks/datatable"
 @import "blocks/call_to_action"
 @import "blocks/chapter"
@@ -46,6 +45,7 @@
 @import "blocks/partners"
 @import "blocks/posts"
 @import "blocks/programs"
+@import "blocks/summary"
 @import "blocks/testimonials"
 @import "blocks/timeline"
 @import "blocks/video"

layouts/_default/list.html

@@ -12,7 +12,7 @@
         )
     }}
 
-    {{ partial "pages/chapo.html" (dict
+    {{ partial "pages/summary.html" (dict
         "context" .
         "block_wrapped" true
       ) }}

layouts/_default/single.html

@@ -12,7 +12,7 @@
         )
     }}
 
-    {{ partial "pages/chapo.html" (dict
+    {{ partial "pages/summary.html" (dict
         "context" .
         "block_wrapped" true
       ) }}

layouts/administrators/list.html

@@ -4,7 +4,7 @@
 
   <div class="document-content">
 
-    {{ partial "persons/chapo.html" (dict
+    {{ partial "persons/summary.html" (dict
         "with_container" true
         "context" .
       ) }}

layouts/authors/list.html

@@ -4,7 +4,7 @@
 
   <div class="document-content">
 
-    {{ partial "persons/chapo.html" (dict
+    {{ partial "persons/summary.html" (dict
         "with_container" true
         "context" .
       ) }}

layouts/categories/term.html

@@ -9,7 +9,7 @@
         )
     }}
 
-    {{ partial "posts/chapo.html" (dict
+    {{ partial "posts/summary.html" (dict
       "context" .
       "block_wrapped" true
       ) }}

layouts/diplomas/list.html

@@ -3,7 +3,7 @@
 
   <div class="document-content">
 
-    {{ partial "diplomas/chapo.html" (dict
+    {{ partial "diplomas/summary.html" (dict
         "with_container" true
         "context" .
       ) }}

layouts/index.html

@@ -11,7 +11,7 @@
       }}
     {{- end -}}
 
-    {{ partial "home/chapo.html" (dict
+    {{ partial "home/summary.html" (dict
         "block_wrapped" true
         "context" .
       ) }}

layouts/organizations/single.html

@@ -10,7 +10,7 @@
 
     <div class="container">
       <div itemprop="articleBody" class="rich-text">
-        {{ partial "pages/chapo.html" (dict
+        {{ partial "pages/summary.html" (dict
           "context" .
         ) }}
 

layouts/pages/list.html

@@ -12,7 +12,7 @@
         )
     }}
 
-    {{ partial "pages/chapo.html" (dict
+    {{ partial "pages/summary.html" (dict
         "context" .
         "block_wrapped" true
       ) }}

layouts/partials/blocks/templates/organization_chart.html

@@ -38,8 +38,8 @@ <h1 class="name" itemprop="name">
                   <p itemprop="jobTitle">
                     {{- if (partial "GetTextFromHTML" .role) }}
                       {{ partial "PrepareHTML" .role }}
-                    {{- else if partial "GetTextFromHTML" $person.Params.description_short }}
-                      {{- partial "PrepareHTML" $person.Params.description_short -}}
+                    {{- else if partial "GetTextFromHTML" $person.Params.summary }}
+                      {{- partial "PrepareHTML" $person.Params.summary -}}
                     {{ else if (partial "GetTextFromHTML" $person.Content) }}
                       {{- partial "GetTruncateContent" ( dict "text" $person.Content ) -}}
                     {{ end -}}

layouts/partials/blocks/templates/pages.html

@@ -42,11 +42,11 @@
     {{ end }}
     {{ if site.Params.pages.list.truncate_description }}
       {{- $main_description = partial "GetTruncateContent" ( dict 
-          "text" .Params.description_short
+          "text" .Params.summary
           "length" site.Params.pages.list.truncate_description
           ) -}}
     {{ else }}
-      {{- $main_description = partial "PrepareHTML" .Params.description_short -}}
+      {{- $main_description = partial "PrepareHTML" .Params.summary -}}
     {{ end }}
   {{ end -}}
 

layouts/partials/blocks/templates/pages/cards.html

@@ -15,14 +15,14 @@ <h1>
           </a>
         </h1>
 
-        {{ if and $show_descriptions .Params.description_short }}
+        {{ if and $show_descriptions .Params.summary }}
           {{ if site.Params.pages.list.truncate_description }}
             <p>{{ partial "GetTruncateContent" ( dict 
-              "text" .Params.description_short
+              "text" .Params.summary
               "length" site.Params.pages.list.truncate_description
               ) }}</p>
           {{ else }}
-            <p>{{ partial "PrepareHTML" .Params.description_short }}</p>
+            <p>{{ partial "PrepareHTML" .Params.summary }}</p>
           {{ end }}
         {{ end }}
 

layouts/partials/blocks/templates/pages/grid.html

@@ -23,14 +23,14 @@ <h1>
             {{- partial "PrepareHTML" .Title -}}
           </a>
         </h1>
-        {{ if and $show_descriptions .Params.description_short }}
+        {{ if and $show_descriptions .Params.summary }}
           {{ if site.Params.pages.list.truncate_description }}
             <p>{{ partial "GetTruncateContent" ( dict 
-              "text" .Params.description_short
+              "text" .Params.summary
               "length" site.Params.pages.list.truncate_description
               ) }}</p>
           {{ else }}
-            <p>{{ partial "PrepareHTML" .Params.description_short }}</p>
+            <p>{{ partial "PrepareHTML" .Params.summary }}</p>
           {{ end }}
         {{ end }}
         {{ if $show_images }}

layouts/partials/blocks/templates/posts/highlight.html

@@ -21,14 +21,14 @@ <h1 itemprop="headline"><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "com
               {{ if site.Params.posts.list.show_categories }}
                 {{- partial "posts/categories" . -}}
               {{ end }}
-              {{- if (partial "GetTextFromHTML" .Params.description_short) -}}
+              {{- if (partial "GetTextFromHTML" .Params.summary) -}}
                 {{ if site.Params.posts.list.truncate_description }}
                   <p itemprop="articleBody">{{ partial "GetTruncateContent" ( dict 
-                    "text" .Params.description_short
+                    "text" .Params.summary
                     "length" site.Params.posts.list.truncate_description
                     ) }}</p>
                 {{ else }}
-                  <p itemprop="articleBody">{{ partial "PrepareHTML" .Params.description_short }}</p>
+                  <p itemprop="articleBody">{{ partial "PrepareHTML" .Params.summary }}</p>
                 {{ end }}
               {{- end -}}
               <time itemprop="datePublished" datetime="{{ .Date.Format "2006-01-02T15:04" }}">{{ .Date | time.Format ":date_long" }}</time>

layouts/partials/categories/summary.html

@@ -0,0 +1 @@
+{{- partial "commons/summary.html" . -}}

layouts/partials/commons/chapo.html → layouts/partials/commons/summary.html

@@ -1,17 +1,17 @@
-{{- $text := (partial "GetTextFromHTML" .context.Params.description_short) -}}
+{{- $text := (partial "GetTextFromHTML" .context.Params.summary) -}}
 
 {{- if $text -}}
 
   {{- if .block_wrapped -}}
-  <section class="block block-chapo">
+  <section class="block block-summary">
     <div class="container">
       <div class="block-content">
   {{- else if .with_container -}}
   <div class="container">
   {{- end -}}
 
     <p class="lead">
-      {{ partial "PrepareHTML" .context.Params.description_short }}
+      {{ partial "PrepareHTML" .context.Params.summary }}
     </p>
 
   {{- if .block_wrapped -}}

layouts/partials/diplomas/diplomas.html

@@ -11,7 +11,7 @@
       </a>
       <div class="content">
         <div class="description">
-          {{- partial "PrepareHTML" .Params.description_short -}}
+          {{- partial "PrepareHTML" .Params.summary -}}
         </div>
 
         <ol class="programs">

layouts/partials/diplomas/summary.html

@@ -0,0 +1 @@
+{{- partial "commons/summary.html" . -}}

layouts/partials/head/seo.html

@@ -5,8 +5,8 @@
 {{- $seoDescription := "" -}}
 {{- if .Params.description -}}
   {{- $seoDescription = partial "PrepareHTML" .Params.description -}}
-{{- else if .Params.description_short -}}
-  {{- $seoDescription = partial "PrepareHTML" .Params.description_short -}}
+{{- else if .Params.summary -}}
+  {{- $seoDescription = partial "PrepareHTML" .Params.summary -}}
 {{- else if .Content -}}
   {{- $seoDescription = partial "GetTruncateContent" ( dict "text" .Content ) -}}
 {{- else if .Params.legacy_text -}}

layouts/partials/home/summary.html

@@ -0,0 +1 @@
+{{- partial "commons/summary.html" . -}}

layouts/partials/organizations/summary.html

@@ -0,0 +1 @@
+{{- partial "commons/summary.html" . -}}

layouts/partials/pages/page.html

@@ -16,8 +16,8 @@
         {{- partial "PrepareHTML" .Title -}}
       </a>
     {{- partial "PrepareHTML" (printf "</%s>" $heading) -}}
-    {{- if .Params.description_short }}
-      <p>{{ partial "PrepareHTML" .Params.description_short }}</p>
+    {{- if .Params.summary }}
+      <p>{{ partial "PrepareHTML" .Params.summary }}</p>
     {{ end -}}
   </div>
 </article>

layouts/partials/pages/summary.html

@@ -0,0 +1 @@
+{{- partial "commons/summary.html" . -}}

layouts/partials/persons/list-item.html

@@ -1,6 +1,6 @@
 <li itemscope itemtype="https://schema.org/Person">
   <p itemprop="name"><a href="{{ .Permalink }}">{{ partial "PrepareHTML" .Title }}</a></p>
-  {{- if partial "GetTextFromHTML" .Params.description_short }}
-    <p itemprop="jobTitle">{{- partial "PrepareHTML" .Params.description_short -}}</p>
+  {{- if partial "GetTextFromHTML" .Params.summary }}
+    <p itemprop="jobTitle">{{- partial "PrepareHTML" .Params.summary -}}</p>
   {{ end -}}
 </li>

layouts/partials/persons/person.html

@@ -2,8 +2,8 @@
   <div class="description">
     {{- $title := partial "PrepareHTML" .Title }}
     <p class="name"><a href="{{ .Permalink }}">{{- $title -}}</a></p>
-    {{- if partial "GetTextFromHTML" .Params.description_short }}
-      <p>{{- partial "PrepareHTML" .Params.description_short -}}</p>
+    {{- if partial "GetTextFromHTML" .Params.summary }}
+      <p>{{- partial "PrepareHTML" .Params.summary -}}</p>
     {{ else if (partial "GetTextFromHTML" .Content) }}
       <p>{{- partial "GetTruncateContent" ( dict "text" .Content ) -}}</p>
     {{ end -}}

layouts/partials/persons/summary.html

@@ -0,0 +1 @@
+{{- partial "commons/summary.html" . -}}

layouts/partials/posts/post.html

@@ -5,14 +5,14 @@ <h1 itemprop="headline"><a href="{{ .Permalink }}" title="{{ safeHTML (i18n "com
     {{ if $.Site.Params.posts.list.show_categories }}
       {{- partial "posts/categories" . -}}
     {{ end }}
-    {{- if (partial "GetTextFromHTML" .Params.description_short) -}}
+    {{- if (partial "GetTextFromHTML" .Params.summary) -}}
       {{ if $.Site.Params.posts.list.truncate_description }}
         <p itemprop="articleBody">{{ partial "GetTruncateContent" ( dict 
-          "text" .Params.description_short
+          "text" .Params.summary
           "length" $.Site.Params.posts.list.truncate_description
           ) }}</p>
       {{ else }}
-        <p itemprop="articleBody">{{ partial "PrepareHTML" .Params.description_short }}</p>
+        <p itemprop="articleBody">{{ partial "PrepareHTML" .Params.summary }}</p>
       {{ end }}
     {{- end -}}
 

layouts/partials/posts/summary.html

@@ -0,0 +1 @@
+{{- partial "commons/summary.html" . -}}

layouts/partials/programs/list.html

@@ -5,7 +5,7 @@
           "context" .
       )
     }}
-  {{ partial "programs/chapo.html" (dict
+  {{ partial "programs/summary.html" (dict
       "with_container" true
       "context" .
     ) }}

layouts/partials/programs/single.html

@@ -25,7 +25,7 @@
     {{- end -}}
   {{- end -}}
 
-  {{ partial "programs/chapo.html" (dict
+  {{ partial "programs/summary.html" (dict
       "with_container" true
       "context" .
     ) }}

layouts/partials/programs/summary.html

@@ -0,0 +1 @@
+{{- partial "commons/summary.html" . -}}

layouts/persons/list.html

@@ -17,17 +17,17 @@
         )
     }}
 
-    {{ $chapo_block := false }}
+    {{ $summary_block := false }}
     {{ if .Params.blocks }}
       {{ if gt (len .Params.blocks) 1 }}
-        {{ $chapo_block = true }}
+        {{ $summary_block = true }}
       {{ end }}
     {{ end }}
 
-    {{ partial "persons/chapo.html" (dict
+    {{ partial "persons/summary.html" (dict
         "context" .
-        "with_container" (not $chapo_block)
-        "block_wrapped" $chapo_block
+        "with_container" (not $summary_block)
+        "block_wrapped" $summary_block
       ) }}
 
     <div class="container">

layouts/persons/single.html

@@ -35,9 +35,9 @@
 
       <div class="informations">
         <div>
-          {{ if (partial "GetTextFromHTML" .Params.description_short) }}
+          {{ if (partial "GetTextFromHTML" .Params.summary) }}
             <div class="lead" itemprop="description">
-              {{ partial "PrepareHTML" .Params.description_short }}
+              {{ partial "PrepareHTML" .Params.summary }}
             </div>
           {{ end }}
           {{ if (partial "GetTextFromHTML" .Content) }}

layouts/posts/list.html

@@ -3,7 +3,7 @@
   <div class="document-content">
     {{ partial "commons/list-content.html" . }}
 
-    {{ partial "posts/chapo.html" (dict
+    {{ partial "posts/summary.html" (dict
         "with_container" true
         "context" .
       ) }}

layouts/posts/single.html

@@ -5,12 +5,12 @@
     <meta itemprop="headline" content="{{ partial "PrepareHTML" .Title }}">
     <meta itemprop="url" content="{{ .Permalink }}">
     {{ if .Date }}<meta itemprop="datePublished" content="{{ .Date.Format "2006-01-02T15:04" }}">{{ end }}
-    {{ if .Params.description_short }}<meta itemprop="abstract" content="{{ partial "PrepareHTML" .Params.description_short }}">{{ end }}
+    {{ if .Params.summary }}<meta itemprop="abstract" content="{{ partial "PrepareHTML" .Params.summary }}">{{ end }}
     {{ if .Summary }}<meta itemprop="description" content="{{ partial "PrepareHTML" .Summary }}">{{ end }}
 
     {{ partial "posts/sidebar.html" . }}
 
-    {{ partial "posts/chapo.html" (dict
+    {{ partial "posts/summary.html" (dict
         "context" .
         "block_wrapped" true
       ) }}

layouts/researchers/list.html

@@ -4,7 +4,7 @@
 
   <div class="document-content">
 
-    {{ partial "persons/chapo.html" (dict
+    {{ partial "persons/summary.html" (dict
         "with_container" true
         "context" .
       ) }}

layouts/teachers/list.html

@@ -4,7 +4,7 @@
 
   <div class="document-content">
 
-    {{ partial "persons/chapo.html" (dict
+    {{ partial "persons/summary.html" (dict
         "with_container" true
         "context" .
       ) }}