From 9cbc8154bbbae02ee01a0fdc532c59efd3fdd740 Mon Sep 17 00:00:00 2001
From: BernatBC <bernat.borrasc@gmail.com>
Date: Fri, 9 Feb 2024 11:28:16 +0100
Subject: [PATCH] Make single and multiple experiences more consistent

---
 .../experiences/multiple-positions.html       | 53 ++++++++++---------
 .../sections/experiences/single-position.html | 30 ++++++-----
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/layouts/partials/sections/experiences/multiple-positions.html b/layouts/partials/sections/experiences/multiple-positions.html
index cd3d905..9516d38 100644
--- a/layouts/partials/sections/experiences/multiple-positions.html
+++ b/layouts/partials/sections/experiences/multiple-positions.html
@@ -1,26 +1,27 @@
 <div class="col-10 col-lg-8">
     <div class="experience-entry-heading">
         {{ $logoImage:= resources.Get .company.logo}}
-        {{ if $logoImage }}
-        {{/*  svg don't support "Fit" operation   */}}
-        {{ if ne $logoImage.MediaType.SubType "svg" }}
-            {{ $logoImage = $logoImage.Fit "300x300" }}
-        {{ end }}
-        <div class="logo-holder">
-            <img class="company-logo" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />
+            {{ if $logoImage }}
+            {{/*  svg don't support "Fit" operation   */}}
+            {{ if ne $logoImage.MediaType.SubType "svg" }}
+              {{ $logoImage = $logoImage.Fit "300x300" }}
+            {{ end }}
+            <div class="logo-holder">
+                <img class="company-logo" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />
+            </div>
+            {{ end }}
+        <!-- Total experience duration on a company is time between the starting date of the oldest position and ending date of most recent position -->
+        {{ $oldestPosition := index (last 1 .positions) 0}}
+        {{ $mostRecentPosition := index (first 1 .positions) 0}}
+        <div class="company-heading">
+            <h5>{{ if .company.url }}<a href={{.company.url}} title="{{ .company.name }}" target="_blank" rel="noopener">{{ .company.name }}</a>{{ else }}{{ .company.name }}{{ end }}</h5>
+            <p class="text-muted">
+                {{ $oldestPosition.start }} - {{ if $mostRecentPosition.end }}{{ $mostRecentPosition.end }}{{ else }}{{ i18n "present" }}{{ end }}
+            </p>
         </div>
-        {{ end }}
-       <!-- Total experience duration on a company is time between the starting date of the oldest position and ending date of most recent position -->
-       {{ $oldestPosition := index (last 1 .positions) 0}}
-       {{ $mostRecentPosition := index (first 1 .positions) 0}}
-       <div class="company-heading">
-           <h5>{{ if .company.url }}<a href={{.company.url}} title="{{ .company.name }}" target="_blank" rel="noopener">{{ .company.name }}</a>{{ else }}{{ .company.name }}{{ end }}</h5>
-           <p class="text-muted"> {{ $oldestPosition.start }} - {{ if $mostRecentPosition.end }}{{ $mostRecentPosition.end }}{{ else }}{{ i18n "present" }}{{ end }}
-           </p>
-       </div>
-       <p class="text-muted">
-           <i class="fa-solid fa-location-dot"></i> {{ .company.location }}
-       </p>
+        <p class="text-muted">
+            <i class="fa-solid fa-location-dot"></i> {{ .company.location }}
+        </p>
         <!-- Add company overview -->
         <p>{{ .company.overview | markdownify }}</p>
     </div>
@@ -29,14 +30,18 @@
     {{ range $index,$position:= .positions }}
         <div class="company-heading">
             <h5 class="designation">{{ $position.designation }}</h5>
-            <p class="text-muted"> {{ $position.start }} - {{if $position.end }} {{ $position.end }} {{else}} {{ i18n "present" }} {{end}}</p>
+            <p class="text-muted">{{ $position.start }} - {{if $position.end }} {{ $position.end }} {{else}} {{ i18n "present" }} {{end}}</p>
         </div>
         <!-- Add the responsibilities handled at this position -->
-        <ul class="justify-content-around">
-        {{ range $position.responsibilities }}
-            <li>{{ . | markdownify }}</li>
+        <!-- Add the responsibilities handled at this position -->
+        {{ if $position.responsibilities }}
+            <h6 class="text-heading">{{ i18n "responsibilities" }}</h6>
+            <ul class="justify-content-around">
+                {{ range $position.responsibilities }}
+                    <li>{{ . | markdownify }}</li>
+                {{ end }}
+            </ul>
         {{ end }}
-        </ul>
     {{ end }}
     </div>
 </div>
diff --git a/layouts/partials/sections/experiences/single-position.html b/layouts/partials/sections/experiences/single-position.html
index 4a47b69..25ac983 100644
--- a/layouts/partials/sections/experiences/single-position.html
+++ b/layouts/partials/sections/experiences/single-position.html
@@ -1,30 +1,32 @@
 <div class="col-10 col-lg-8">
     <div class="experience-entry-heading">
-        {{ $position:= index .positions 0 }}
         {{ $logoImage:= resources.Get .company.logo}}
-        {{ if $logoImage }}
-        {{/*  svg don't support "Fit" operation   */}}
-        {{ if ne $logoImage.MediaType.SubType "svg" }}
-            {{ $logoImage = $logoImage.Fit "300x300" }}
-        {{ end }}
-        <div class="logo-holder">
-            <img class="company-logo" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />
-        </div>
-        {{ end }}
+            {{ if $logoImage }}
+            {{/*  svg don't support "Fit" operation   */}}
+            {{ if ne $logoImage.MediaType.SubType "svg" }}
+              {{ $logoImage = $logoImage.Fit "300x300" }}
+            {{ end }}
+            <div class="logo-holder">
+                <img class="company-logo" src="{{ $logoImage.RelPermalink }}" alt="{{ .name }}" />
+            </div>
+            {{ end }}
         {{ $position:= index .positions 0 }}
         <div class="company-heading">
             <h5>{{ if .company.url }}<a href={{.company.url}} title="{{ .company.name }}" target="_blank" rel="noopener">{{ .company.name }}</a>{{ else }}{{ .company.name }}{{ end }}</h5>
-            <p class="text-muted"> {{ $position.start }} - {{ if $position.end }}{{ $position.end }}{{ else }}{{ i18n "present" }}{{ end }}
+            <p class="text-muted">{{ $position.start }} - {{ if $position.end }}{{ $position.end }}{{ else }}{{ i18n "present" }}{{ end }}
             </p>
         </div>
         <p class="text-muted">
             <i class="fa-solid fa-location-dot"></i> {{ .company.location }}
         </p>
+        <!-- Add company overview -->
+        <p>{{ .company.overview | markdownify }}</p>
         <!-- For single position, give emphasis on the designation-->
-        <h5>{{ $position.designation }}</h5>
+        <div class="company-heading">
+            <h5 class="designation">{{ $position.designation }}</h5>
+            <p class="text-muted">{{ $position.start }} - {{if $position.end }} {{ $position.end }} {{else}} {{ i18n "present" }} {{end}}</p>
+        </div>
     </div>
-    <!-- Add company overview -->
-    <p>{{ .company.overview | markdownify }}</p>
     <!-- Add the responsibilities handled at this position -->
     {{ if $position.responsibilities }}
     <h6 class="text-heading">{{ i18n "responsibilities" }}</h6>