Merge pull request #953 from ScilifelabDataCentre/develop

Updates W8

Dockerfiles/Dockerfile

@@ -2,6 +2,7 @@ FROM klakegg/hugo:0.104.3-ubuntu-onbuild AS build
 
 FROM nginxinc/nginx-unprivileged:alpine
 RUN sed -i '3 a\    absolute_redirect off;' /etc/nginx/conf.d/default.conf
+RUN sed -i 's/#error_page  404/error_page  404/' /etc/nginx/conf.d/default.conf
 COPY --from=build /target /usr/share/nginx/html
 
 EXPOSE 8080

data/funding.json

@@ -1,6 +1,22 @@
 {
   "last_updated": "2023-01-16",
   "calls": [
+    {
+      "topic": [
+        "Infectious diseases",
+        "General"
+      ],
+      "funder": "Swedish Research Council",
+      "call_title": "Project grant for research into viruses and pandemics – from fundamental mechanisms to medical interventions",
+      "submission_deadline": "2023-03-28",
+      "submission_opendate": "2023-02-22",
+      "call_url": "https://www.vr.se/english/applying-for-funding/calls/2022-11-10-project-grant-for-research-into-viruses-and-pandemics---from-fundamental-mechanisms-to-medical-interventions.html",
+      "call_description": "The purpose of the project grant is to give researchers the freedom to formulate their own research idea, method and implementation, and to solve a specific research task within a limited period. The focus of this call is on research into basic virology and fundamental disease mechanisms caused by viruses. It also covers research into areas such as zoonoses, the development of medicines, vaccines, diagnostics and treatments. The initiative is part of the national research programme in viruses and pandemics.",
+      "applicant": "Individual researcher and up to 6 other researchers may be invited to join the application",
+      "funding_period": "1-3 years starting Jan 2024.",
+      "decision_date": "No later than the beginning of November 2023.",
+      "funding_amount": "Minimum 400 000 SEK per year, maximum 2 500 000 SEK per year."
+    },
     {
       "topic": [
         "Infectious diseases",
@@ -12,7 +28,7 @@
       "submission_opendate": "2023-01-16",
       "call_url": "https://www.vr.se/english/applying-for-funding/calls/2023-01-16-project-grant-for-international-research-collaboration-within-antimicrobial-resistance-jpiamr.html",
       "call_description": "The purpose of the grant is to support international collaboration in the Joint Programming Initiative on Antimicrobial Resistance (JPIAMR). This is the 16th call within JPIAMR and has the title “Development of innovative strategies, tools, technologies, and methods for diagnostics and surveillance of antimicrobial resistance”. Sweden, via the Swedish Research Council, the Swedish International Development Cooperation Agency, is one of the 19 countries taking part in the JPIAMR call.",
-      "applicant": "ndividual researcher who participates as 1 of maximum 2 Swedish project leaders in a consortium with partners from at least 3 participating countries. Only researchers at an administrating organisation approved by the Swedish Research Council may apply.",
+      "applicant": "Individual researcher who participates as 1 of maximum 2 Swedish project leaders in a consortium with partners from at least 3 participating countries. Only researchers at an administrating organisation approved by the Swedish Research Council may apply.",
       "funding_period": "3 years starting Jan 2024.",
       "decision_date": "No later than the end of November 2023.",
       "funding_amount": "Minimum 1 200 000 SEK (approximately 110 000 EUR) in total per Swedish partner in a project. Maximum 3 500 000 SEK in total (approximately 320 000 EUR) per project for Swedish participation with maximum 2 Swedish partners. Maximum 5 000 000 SEK in total (approximately 457 000 EUR) for Swedish participation in a consortium with a Swedish coordinator."
@@ -28,7 +44,7 @@
       "submission_opendate": "2023-01-16",
       "call_url": "https://www.vr.se/english/applying-for-funding/calls/2023-01-16-project-grant-for-international-research-collaboration-within-antimicrobial-resistance-jpiamr.html",
       "call_description": "The purpose of the grant is to support international collaboration in the Joint Programming Initiative on Antimicrobial Resistance (JPIAMR). This is the 16th call within JPIAMR and has the title “Development of innovative strategies, tools, technologies, and methods for diagnostics and surveillance of antimicrobial resistance”. Sweden, via the Swedish Research Council, the Swedish International Development Cooperation Agency, is one of the 19 countries taking part in the JPIAMR call.",
-      "applicant": "ndividual researcher who participates as 1 of maximum 2 Swedish project leaders in a consortium with partners from at least 3 participating countries. Only researchers at an administrating organisation approved by the Swedish Research Council may apply.",
+      "applicant": "Individual researcher who participates as 1 of maximum 2 Swedish project leaders in a consortium with partners from at least 3 participating countries. Only researchers at an administrating organisation approved by the Swedish Research Council may apply.",
       "funding_period": "3 years starting Jan 2024.",
       "decision_date": "No later than the end of November 2023.",
       "funding_amount": "Minimum 1 200 000 SEK (approximately 110 000 EUR) in total per Swedish partner in a project. Maximum 3 500 000 SEK in total (approximately 320 000 EUR) per project for Swedish participation with maximum 2 Swedish partners. Maximum 5 000 000 SEK in total (approximately 457 000 EUR) for Swedish participation in a consortium with a Swedish coordinator."

layouts/datasets/single.html

@@ -47,9 +47,7 @@ <h4>Data available from research groups in Sweden</h4>
       <div class="px-3 pt-1 pb-2 bg-light">
         <h5>Data types</h5>
         {{ $current_url := .Page.RelPermalink }}
-        {{ range .Site.Menus.data_menu }}
-        {{ if eq .Name "Available datasets" }}
-        {{ range .Children }}
+        {{ range .Site.Menus.datasets_menu }}
 
         {{/*
           Count how many datasets in current data type
@@ -64,8 +62,6 @@ <h5>Data types</h5>
             href="{{ .Page.RelPermalink }}">{{ else }}<b>{{ end }}{{ .Name }}
               ({{ $num_entries }}){{ if ne .Page.RelPermalink $current_url }}</a>{{ else }}</b>{{ end }}</div>
         {{ end }}
-        {{ end }}
-        {{ end }}
       </div>
     </div>
     <div class="col-lg px-0 ms-3">

layouts/index.html

@@ -62,8 +62,8 @@ <h6><a href="{{ .RelPermalink }}">{{ .Title }}</a></h6>
     {{ end }}
 
     {{/*
-          The following bit ensures that it is not necessary to copy the datatypes_to_display list in the Swedish version of the page
-          */}}
+      The following bit ensures that it is not necessary to copy the datatypes_to_display list in the Swedish version of the page
+    */}}
 
     {{ $datatypes_to_display := slice }}
     {{ $path := strings.TrimPrefix "/sv" (strings.TrimRight "/" (string .Page.RelPermalink)) }}
@@ -78,37 +78,31 @@ <h2>{{ .Name }}</h2>
       </div>
     {{ end }}
     <div class="row">
-
-          {{/* This used to be range over all available data pages, need to bring back */}}
-
-          {{ range .Site.Menus.data_menu }}
-            {{ if eq .Title "Available datasets" }}
-              {{ range .Children }}
-                {{ if ne .Title "All data types" }}
-                  <div class="col-md-4">
-                    <h5><a href="{{ .Page.RelPermalink }}">
-                    {{ $section_title := string "" }}
-                    {{ $section_title = .Title}}
-                    {{ $this_type := strings.TrimRight " data" (lower $section_title) }}
-                    {{ range $type, $num := $num_entries_per_data_type }}
-                      {{ $type_in_dict := strings.TrimRight " data" (lower $type) }}
-                      {{ if eq $this_type $type_in_dict }}
-                        {{ if eq $section_title "Genomics & transcriptomics data"}}
-                          {{ $this_type = "genomics"}}
-                        {{ end }}
-                        {{ if eq $section_title "Social science and humanities data"}}
-                          {{ $this_type = "social science"}}
-                        {{ end }}
-                      {{ $this_type | title }} ({{ $num }})
-                      {{ end }}
-                    {{ end }}
-                    <i class="bi bi-arrow-right-circle-fill"></i></a></h5>
-                  </div>
+      {{ range .Site.Menus.datasets_menu }}
+        {{ if ne .Title "All data types" }}
+          <div class="col-md-4">
+            <h5><a href="{{ .Page.RelPermalink }}">
+              {{ $section_title := string "" }}
+              {{ $section_title = .Title}}
+              {{ $this_type := strings.TrimRight " data" (lower $section_title) }}
+              {{ range $type, $num := $num_entries_per_data_type }}
+                {{ $type_in_dict := strings.TrimRight " data" (lower $type) }}
+                {{ if eq $this_type $type_in_dict }}
+                  {{ if eq $section_title "Genomics & transcriptomics data"}}
+                    {{ $this_type = "genomics"}}
+                  {{ end }}
+                  {{ if eq $section_title "Social science and humanities data"}}
+                    {{ $this_type = "social science"}}
+                  {{ end }}
+                {{ $this_type | title }} ({{ $num }})
                 {{ end }}
               {{ end }}
-            {{ end }}
-          {{ end }}
-      </div>
+              <i class="bi bi-arrow-right-circle-fill"></i>
+            </a></h5>
+          </div>
+        {{ end }}
+      {{ end }}
+    </div>
     {{ end }}
 
     <!-- Sample Collection Database -->

layouts/shortcodes/funding_table.html

@@ -78,7 +78,7 @@ <h6><a href="{{ .call_url }}">{{ .call_title }}</a></h6>
                       </button>
                       <div class="modal fade" id="call_details{{ $ind }}" tabindex="-1" role="dialog"
                         aria-labelledby="call_details{{ $ind }}Label" aria-hidden="true">
-                        <div class="modal-dialog" role="document">
+                        <div class="modal-dialog modal-lg" role="document">
                           <div class="modal-content">
                             <div class="modal-header">
                               <h5 class="modal-title" id="call_details{{ $ind }}Label">{{ .call_title }}</h5>
@@ -95,7 +95,7 @@ <h5 class="modal-title" id="call_details{{ $ind }}Label">{{ .call_title }}</h5>
                                 {{ if .applicant }}<b>Eligible applicant:</b>
                                 {{ .applicant | markdownify }}<br>{{ end }}
                                 {{ if .decision_date }}<b>Decision date:</b> {{ .decision_date }}<br>{{ end }}</p>
-                              <p><b>Call description:</b><br><small>{{ .call_description | markdownify }}</small></p>
+                              <p><b>Call description:</b><br>{{ .call_description | markdownify }}</p>
                               <p><a href="{{ .call_url }}">See call website for more information <i
                                     class="bi bi-arrow-right-circle-fill" aria-hidden="true"></i></a></p>
                             </div>