Merge pull request #43 from uit-no/jorn/header

Restructure page header

config.toml

@@ -25,12 +25,10 @@ highlight_theme = "cheerfully-light"
 
 navigation = [
   { name = "Home", target = "/" },
-  { name = "Team", target = "/team/" },
   { name = "About us", target = "/about/" },
   { name = "Projects", target = "/projects/" },
   { name = "Training and events", target = "/training/" },
-  { name = "Accounts", target = "/accounts/" },
-  { name = "NRIS", target = "https://documentation.sigma2.no/" },
+  { name = "Getting started", target = "/accounts/" },
   { name = "Newsletter/blog", target = "/blog/" },
   { name = "Contact", target = "/contact/" },
 ]

content/about.md → content/about/_index.md

@@ -7,6 +7,10 @@
 On this page we summarize what we do more long-term. We also have a page about
 our [projects](@/projects.md).
 
+## Team
+
+[See the people working for the HPC group.](/about/team/)
+
 
 ## Hardware
 

content/projects.md

@@ -6,7 +6,7 @@
 On this page we summarize what projects we currently work on. Not everything
 here is finished but we think it is useful if we communicate with the research
 community about what is brewing in the HPC group. For the more long-term work,
-please check the ["about us" page](@/about.md).
+please check the ["about us" page](/about/).
 
 
 ## Newsletter and easier contact point
@@ -18,7 +18,7 @@ We have also established a new HPC newsletter you can subscribe to receive news
 about training, events, support sessions, and hardware updates. [See here for an
 explanation on how to subscribe (and unsubscribe).](/contact/)
 
- 
+
 ## Sonar/jobgraph
 
 [Sonar](https://github.com/NordicHPC/sonar) and
@@ -54,7 +54,7 @@ Management framework in the [NRIS](https://documentation.sigma2.no)
 collaboration. This organisational model is developed for federated
 organisations like ours to clearly define roles, introduce workflows and
 processes like Service portfolio management, Incident management or Continual
-service improvement management (14 processes in total). 
+service improvement management (14 processes in total).
 
 Some of our goals with introducing the FitSM are: to clearly define
 responsibilities and make them process-bound and well-documented, to keep track

templates/team.html

@@ -3,11 +3,11 @@
 {% block content %}
   {{ section.content | safe }}
 
-  {% set data = load_data(path="content/team/team.yaml") %}
+  {% set data = load_data(path="content/about/team/team.yaml") %}
   <div class="uk-child-width-expand@s uk-text-center uk-margin-xlarge-top" uk-grid>
     {% for person in data.team %}
       <div class="uk-width-1-5@m">
-        {% set image = resize_image(path="team/" ~ person.picture, width=140, height=140, op="fill") %}
+        {% set image = resize_image(path="about/team/" ~ person.picture, width=140, height=140, op="fill") %}
         <img src="{{ image.url }}">
         <p>
           <b>{{ person.name }}</b>
@@ -21,7 +21,7 @@ <h2>Former team members</h2>
   <div class="uk-child-width-expand@s uk-text-center uk-margin-xlarge-top" uk-grid>
     {% for person in data.past %}
       <div class="uk-width-1-5@m">
-        {% set image = resize_image(path="team/" ~ person.picture, width=140, height=140, op="fill") %}
+        {% set image = resize_image(path="about/team/" ~ person.picture, width=140, height=140, op="fill") %}
         <img src="{{ image.url }}">
         <p>
           <b>{{ person.name }}</b>