Merge branch 'develop' into contact-and-national-portal-updates-

ScilifelabDataCentre · Nov 23, 2023 · 4900713 · 4900713
2 parents 7b86152 + d62c9e2
commit 4900713
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -65,4 +65,6 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: HUGO_ENV_ARG=${{ github.ref_name == 'main' && 'production' || github.event_name == 'release' && 'production' || 'development' }}
+          build-args: HUGO_ENV_ARG=${{ github.event_name == 'release' && format('{0}-{1}', 'production', github.ref_name)
+                  || github.ref_name == 'main' && format('{0}-{1}', 'production', github.sha)
+                  || format('{0}-{1}', 'development', github.sha) }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -1,4 +1,4 @@
-<footer class="container border-top mt-5 mb-5">
+<footer class="container border-top mt-5 mb-2">
   <div class="row border-bottom">
 
     <!-- About section -->
@@ -9,7 +9,6 @@ <h2 class="small text-uppercase text-black-50">{{ if eq $.Site.Language.Language
         {{ range .Site.Menus.footer_about }}
         <li><a href="{{ .Page.RelPermalink }}">{{ .Name }}</a></li>
         {{ end }}
-        <li><a href="https://github.com/ScilifelabDataCentre/covid-portal/tree/develop">{{ if eq $.Site.Language.LanguageName "Svenska" }}Webbplatskod{{ else }}Website code{{ end }} (Github)</a></li>
       </ul>
     </div>
 
@@ -18,7 +17,7 @@ <h2 class="small text-uppercase text-black-50">{{ if eq $.Site.Language.Language
     <div class="col-md px-5 px-md-2">
       <h2 class="small text-uppercase text-black-50">Other sections</h2>
       <ul class="list-unstyled">
-        <li><a href="/resources/">Resources</a></li>
+        <li><a href="/resources/">Pandemic Preparedness</a></li>
         <li><a href="/pathogens/">Emerging Pathogens</a></li>
         {{ range .Site.Menus.research_menu }}
         <li><a href="{{ .Page.RelPermalink }}">{{ .Name }}</a></li>
@@ -44,6 +43,7 @@ <h2 class="small text-uppercase text-black-50">
         <li><a href="/sv/biobanks/">Provsamlingsregistret</a></li>
         {{ end }}
       </ul>
+      {{ if eq $.Site.Language.LanguageName "Svenska" }}</div><div class="col-md px-5 px-md-2">{{ end }}
       <h2 class="small text-uppercase text-black-50">{{ if eq $.Site.Language.LanguageName "Svenska" }}Följ
         oss{{ else }}Connect{{ end }}</h2>
       <div>
@@ -66,6 +66,18 @@ <h2 class="small text-uppercase text-black-50">{{ if eq $.Site.Language.Language
     </div>
 
   </div>
+
+  <!-- The hugo env value is passed via github action, during image building -->
+  {{ $env_info := split hugo.Environment "-" }}
+  {{ $git_sha := index $env_info 1 }}
+  {{ $code_version := cond (strings.HasPrefix $git_sha "v") $git_sha (substr $git_sha 0 7) }}
+  <div class="d-flex justify-content-center small mt-2">
+    <a target="_blank"
+       href="https://github.com/ScilifelabDataCentre/covid-portal{{ with $code_version }}/tree/{{ $code_version }}{{ end }}">
+      {{ if eq $.Site.Language.LanguageName "Svenska" }}Källkod finns tillgänglig på GitHub{{ else }}Website code is available on Github{{ end }} 
+    </a>
+      {{ with $code_version }}<span class="ps-1 text-black-50">({{ $code_version }})</span>{{ end }}
+  </div>
 </footer>
 
 <!-- Bootstrap Bundle with Popper -->

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -142,7 +142,7 @@
  </script>
   {{ end }}
 
-{{ if eq hugo.Environment "production" }}
+{{ if strings.HasPrefix hugo.Environment "production" }}
 <!-- Schema.org data -->
 {{ partial "schema.html" . }}
 {{ end }}

diff --git a/static/img/biobanks/homepage_shot.png b/static/img/biobanks/homepage_shot.png