Improve template readability

heinrichreimer · Mar 4, 2024 · a5b6827 · a5b6827
1 parent 6e00a55
commit a5b6827
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 43 deletions.
diff --git a/layouts/404.html b/layouts/404.html
@@ -8,9 +8,9 @@ <h1>{{- i18n "pageNotFound" -}}</h1>
             {{- i18n "pageNotFoundAction" . -}}
         </p>
         <p>
-            <a href="{{ $.Site.Home.RelPermalink }}" title='{{ i18n "homepage" }}'>{{ i18n "homepage" }}</a>
+            <a href='{{ relref page "/" }}' title='{{ i18n "homepage" }}'>{{ i18n "homepage" }}</a>
             •
-            <a href='{{ relref . "/imprint" }}' title='{{ i18n "contact" }}'>{{ i18n "contact" }}</a>
+            <a href='{{ relref page "/imprint" }}' title='{{ i18n "contact" }}'>{{ i18n "contact" }}</a>
         </p>
     </article>
 {{ end }}
diff --git a/layouts/robots.txt b/layouts/robots.txt
@@ -1,6 +1,6 @@
 User-agent: *
 {{/* If ENV production variable is false robots will be disallowed. */}}
-{{ if eq $.Site.Params.env "production" }}
+{{ if eq site.Params.env "production" }}
   Disallow:
 {{ else }}
   Disallow: /

diff --git a/layouts/shortcodes/cv/awards.gohtml b/layouts/shortcodes/cv/awards.gohtml
@@ -1,4 +1,4 @@
-{{- $awards := $.Site.Data.awards -}}
+{{- $awards := site.Data.awards -}}
 {{- $awards = sort $awards "month" "desc" -}}
 {{- $awards = sort $awards "year" "desc" -}}
 <figure>
@@ -26,7 +26,7 @@
                     {{-  end -}}
                     {{- with .value -}}
                         &nbsp;
-                        <small>{{- lang.NumFmt 0 .sum "- , ." -}} {{- .unit -}}</small>
+                        <small>{{- lang.FormatNumberCustom 0 .sum "- , ." -}} {{- .unit -}}</small>
                     {{- end -}}
                     {{- with .description -}}
                         <br>

diff --git a/layouts/shortcodes/cv/education.gohtml b/layouts/shortcodes/cv/education.gohtml
@@ -1,4 +1,4 @@
-{{- $education := $.Site.Data.education -}}
+{{- $education := site.Data.education -}}
 {{- $education = sort $education "from.month" "desc" -}}
 {{- $education = sort $education "from.year" "desc" -}}
 <figure>

diff --git a/layouts/shortcodes/cv/experience.gohtml b/layouts/shortcodes/cv/experience.gohtml
@@ -1,4 +1,4 @@
-{{- $experience := $.Site.Data.experience -}}
+{{- $experience := site.Data.experience -}}
 <figure>
     <table>
         <tbody>

diff --git a/layouts/shortcodes/cv/facts.gohtml b/layouts/shortcodes/cv/facts.gohtml
@@ -1,4 +1,4 @@
-{{- with $.Site.Data.facts -}}
+{{- with site.Data.facts -}}
     <figure>
         <table>
             <tbody>
@@ -17,7 +17,7 @@
             </tr>
             <tr>
                 <th>{{- i18n "birthday" -}}</th>
-                <td>{{- time.Format ":date_long" .birthday -}}</td>
+                <td>{{- dateFormat ":date_long" .birthday -}}</td>
             </tr>
             <tr>
                 <th>{{- i18n "email" -}}</th>

diff --git a/layouts/shortcodes/cv/highest-degree.gohtml b/layouts/shortcodes/cv/highest-degree.gohtml
@@ -1,4 +1,4 @@
-{{- with $.Site.Data.education -}}
+{{- with site.Data.education -}}
     {{- $education := . -}}
     {{- $education = where $education "to.year" ">" 0 -}}
     {{- $education = sort $education "to.month" "desc" -}}

diff --git a/layouts/shortcodes/cv/open-source.gohtml b/layouts/shortcodes/cv/open-source.gohtml
@@ -1,5 +1,5 @@
-{{- $username := $.Site.Data.social.github -}}
-{{- with $.Site.Params.gitHubToken -}}
+{{- $username := site.Data.social.github -}}
+{{- with site.Params.gitHubToken -}}
     {{- $username = print $username ":" . -}}
 {{- end -}}
 
@@ -43,14 +43,14 @@ query {
 
 {{- with resources.GetRemote "https://api.github.com/graphql" $pinnedReposOpts -}}
     {{- with .Err -}}{{- errorf "%s" . -}}{{- end -}}
-    {{- with .Content | transform.Unmarshal -}}
+    {{- with .Content | unmarshal -}}
         <figure>
             <table>
                 <tbody>
                 {{- range .data.user.pinnedItems.nodes -}}
                     <tr>
                         <th>
-                            {{- time.Format "01/2006" .createdAt -}}
+                            {{- dateFormat "01/2006" .createdAt -}}
                         </th>
                         <td>
                             <a href="{{- .url -}}" rel="noreferrer" target="_blank" title="{{- .nameWithOwner -}}">

diff --git a/layouts/shortcodes/cv/publications.gohtml b/layouts/shortcodes/cv/publications.gohtml
@@ -1,4 +1,4 @@
-{{- $author := $.Site.Data.facts.name -}}
+{{- $author := site.Data.facts.name -}}
 
 {{- $webisPublicationsUrl := "https://webis.de/publications.html" -}}
 
@@ -20,7 +20,7 @@
     {{- $xmlText = replace $xmlText "&nbsp;" " " -}}
     {{- $xmlText = replace $xmlText "&" "&#38;" -}}
     {{- $xmlText = replace $xmlText "&amp;" "&#38;" -}}
-    {{- $htmlEntities := resources.Get "csv/html-entities.csv" | transform.Unmarshal (dict "delimiter" ",") -}}
+    {{- $htmlEntities := resources.Get "csv/html-entities.csv" | unmarshal (dict "delimiter" ",") -}}
     {{- range $htmlEntities -}}
         {{- $htmlEntityGlyph := index . 0 -}}
         {{- $htmlEntityName := index . 1 -}}
@@ -40,7 +40,7 @@
     {{- $xmlResource := $xmlText | resources.FromString $xmlTargetPath -}}
 
     {{/* Parse XML as map. */}}
-    {{- with $xmlResource | transform.Unmarshal -}}
+    {{- with $xmlResource | unmarshal -}}
         {{/* Navigate to publication list year entries. */}}
         {{- $element := . -}}
         {{- $element = index $element "body" -}}

diff --git a/layouts/shortcodes/cv/skills.gohtml b/layouts/shortcodes/cv/skills.gohtml
@@ -1,4 +1,4 @@
-{{- with $.Site.Data.skills -}}
+{{- with site.Data.skills -}}
     <figure>
         <table>
             <tbody>

diff --git a/layouts/shortcodes/github/repos.gohtml b/layouts/shortcodes/github/repos.gohtml
@@ -1,5 +1,5 @@
-{{- $username := $.Site.Data.social.github -}}
-{{- with $.Site.Params.gitHubToken -}}
+{{- $username := site.Data.social.github -}}
+{{- with site.Params.gitHubToken -}}
     {{- $username = print $username ":" . -}}
 {{- end -}}
 {{- if not $username -}}
@@ -43,7 +43,7 @@ query {
 {{- $userUrl := "" -}}
 {{- with resources.GetRemote "https://api.github.com/graphql" $userOpts -}}
     {{- with .Err -}}{{- errorf "%s" . -}}{{- end -}}
-    {{- with .Content | transform.Unmarshal -}}
+    {{- with .Content | unmarshal -}}
         {{- $repositoriesCount = .data.user.repositories.totalCount -}}
         {{- $userUrl = .data.user.url -}}
     {{- else -}}
@@ -112,7 +112,7 @@ query {
     {{- $reposCount := 0 -}}
     {{- with resources.GetRemote "https://api.github.com/graphql" $reposOpts -}}
         {{- with .Err -}}{{- errorf "%s" . -}}{{- end -}}
-        {{- with .Content | transform.Unmarshal -}}
+        {{- with .Content | unmarshal -}}
             {{- with .data.user.repositories.nodes -}}
                 {{- $repositories = append $repositories . -}}
             {{- end -}}
@@ -216,8 +216,8 @@ query {
                         {{- $kilobytes := div $bytes 1000 -}}
                         {{- $megabytes := div $kilobytes 1000 -}}
                         <small>
-                            📚 {{ .reposCount }}<br>
-                            💾&nbsp;{{- $megabytes | lang.FormatNumber 2 -}}&thinsp;MB
+                            📚 {{ .reposCount }}&emsp;
+                            💾&nbsp;{{- $megabytes | lang.FormatNumber 2 -}} MB
                         </small>
                     </td>
 
@@ -241,7 +241,7 @@ query {
                                 {{- $description -}}
                             </small><br>
                             <small>
-                                📅 {{ time.Format ":date_short" .pushedAt }}&emsp;
+                                📅 {{ dateFormat ":date_short" .pushedAt }}&emsp;
                                 ⭐ {{ .stargazerCount }}
                             </small>
                         {{- end -}}
@@ -268,9 +268,9 @@ query {
                     {{- $moreRepos = sort $moreRepos "stargazers_count" "desc" -}}
                     {{/* Cut-off after top-3. */}}
                     {{- $moreRepos = first 3 $moreRepos -}}
-                    <td>
+                    <td style="max-width:15em;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;">
                         {{- range $moreRepos -}}
-                            <a href="{{ .html_url }}" rel="noreferrer" target="_blank">{{ .name }}</a><br>
+                            <small><a href="{{ .html_url }}" rel="noreferrer" target="_blank">{{ .name }}</a></small><br>
                         {{- end -}}
                     </td>
                 </tr>

diff --git a/layouts/shortcodes/github/stats.gohtml b/layouts/shortcodes/github/stats.gohtml
@@ -1,5 +1,5 @@
-{{- $username := $.Site.Data.social.github -}}
-{{- with $.Site.Params.gitHubToken -}}
+{{- $username := site.Data.social.github -}}
+{{- with site.Params.gitHubToken -}}
     {{- $username = print $username ":" . -}}
 {{- end -}}
 {{- if not $username -}}
@@ -10,7 +10,7 @@
 {{- $osiApprovedLicenses := slice -}}
 {{- with resources.GetRemote "https://github.com/spdx/license-list-data/raw/main/json/licenses.json" -}}
     {{- with .Err -}}{{- errorf "%s" . -}}{{- end -}}
-    {{- with .Content | transform.Unmarshal -}}
+    {{- with .Content | unmarshal -}}
         {{- range (where .licenses "isOsiApproved" true) -}}
             {{- $osiApprovedLicenses = append .licenseId $osiApprovedLicenses -}}
         {{- end -}}
@@ -66,7 +66,7 @@ query {
 {{- $organizationsCount := 0 -}}
 {{- with resources.GetRemote "https://api.github.com/graphql" $userOpts -}}
     {{- with .Err -}}{{- errorf "%s" . -}}{{- end -}}
-    {{- with .Content | transform.Unmarshal -}}
+    {{- with .Content | unmarshal -}}
         {{/* Count repos. */}}
         {{- $repositoriesCount = .data.user.repositories.totalCount -}}
         {{/* Count followers. */}}
@@ -124,7 +124,7 @@ query {
     {{- $reposCount := 0 -}}
     {{- with resources.GetRemote "https://api.github.com/graphql" $reposOpts -}}
         {{- with .Err -}}{{- errorf "%s" . -}}{{- end -}}
-        {{- with .Content | transform.Unmarshal -}}
+        {{- with .Content | unmarshal -}}
             {{- with .data.user.repositories.nodes -}}
                 {{- $repositories = append $repositories . -}}
             {{- end -}}
@@ -163,7 +163,7 @@ query {
     {{- $contributionsOpts := dict "method" "post" "body" $contributionsBody "headers" $githubHeaders -}}
     {{- with resources.GetRemote "https://api.github.com/graphql" $contributionsOpts -}}
         {{- with .Err -}}{{- errorf "%s" . -}}{{- end -}}
-        {{- with .Content | transform.Unmarshal -}}
+        {{- with .Content | unmarshal -}}
             {{- with .data.user.contributionsCollection -}}
                 {{- $totalCommitContributions = add $totalCommitContributions .totalCommitContributions -}}
                 {{- $totalIssueContributions = add $totalIssueContributions .totalIssueContributions -}}

diff --git a/layouts/shortcodes/github/tag.gohtml b/layouts/shortcodes/github/tag.gohtml
@@ -1,5 +1,5 @@
-{{- $username := $.Site.Data.social.github -}}
-{{- with $.Site.Params.gitHubToken -}}
+{{- $username := site.Data.social.github -}}
+{{- with site.Params.gitHubToken -}}
     {{- $username = print $username ":" . -}}
 {{- end -}}
 {{- if not $username -}}
@@ -26,7 +26,7 @@ query {
 {{- $userOpts := dict "method" "post" "body" $userBody "headers" $githubHeaders -}}
 {{- with resources.GetRemote "https://api.github.com/graphql" $userOpts -}}
     {{- with .Err -}}{{- errorf "%s" . -}}{{- end -}}
-    {{- with .Content | transform.Unmarshal -}}
+    {{- with .Content | unmarshal -}}
         <a href="{{ .data.user.url }}" rel="noreferrer" target="_blank">@{{ .data.user.login }}</a>
     {{- else -}}
         {{- errorf "Unable to parse GitHub GraphQL API response." -}}

diff --git a/layouts/shortcodes/profile-image.gohtml b/layouts/shortcodes/profile-image.gohtml
@@ -1,11 +1,8 @@
-{{- $resource := resources.Get "profile.jpg" -}}
-{{- $title := i18n "profile" -}}
-{{- with $resource -}}
-    {{- $link := $resource.RelPermalink -}}
+{{- with resources.Get "profile.jpg" -}}
     <figure class="profile">
-        <a href="{{ $link }}"{{ with $title }} title="{{ . }}"{{ end }}>
+        <a href="{{ .RelPermalink }}" title="{{ i18n "profile" }}" download="profile.jpg">
             {{- with .Fit "400x400" -}}
-                <img src="{{ .RelPermalink }}"{{ with $title }} alt="{{ . }}"{{ end }}>
+                <img src="{{ .RelPermalink }}" alt="{{ i18n "profile" }}">
             {{- end -}}
         </a>
     </figure>

diff --git a/layouts/shortcodes/sponsors.gohtml b/layouts/shortcodes/sponsors.gohtml
@@ -1,4 +1,4 @@
-{{ with $.Site.Data.sponsors }}
+{{ with site.Data.sponsors }}
     <ul>
         {{ range .sponsors }}
             <li>