From bca970d324fd24d3f323b2c9065d04a51b29068e Mon Sep 17 00:00:00 2001 From: Joern Dietze Date: Thu, 18 Apr 2024 12:52:53 +0200 Subject: [PATCH] Restructure page header Fixes #42 --- config.toml | 4 +--- content/{about.md => about/_index.md} | 4 ++++ content/{ => about}/team/_index.md | 0 content/{ => about}/team/bsb.jpg | Bin content/{ => about}/team/dj.jpg | Bin content/{ => about}/team/gd.jpg | Bin content/{ => about}/team/iz.jpg | Bin content/{ => about}/team/jd.png | Bin content/{ => about}/team/mb.jpeg | Bin content/{ => about}/team/ot.jpg | Bin content/{ => about}/team/placeholder.png | Bin content/{ => about}/team/rb.jpg | Bin content/{ => about}/team/sth.png | Bin content/{ => about}/team/team.yaml | 0 content/projects.md | 6 +++--- templates/team.html | 6 +++--- 16 files changed, 11 insertions(+), 9 deletions(-) rename content/{about.md => about/_index.md} (98%) rename content/{ => about}/team/_index.md (100%) rename content/{ => about}/team/bsb.jpg (100%) rename content/{ => about}/team/dj.jpg (100%) rename content/{ => about}/team/gd.jpg (100%) rename content/{ => about}/team/iz.jpg (100%) rename content/{ => about}/team/jd.png (100%) rename content/{ => about}/team/mb.jpeg (100%) rename content/{ => about}/team/ot.jpg (100%) rename content/{ => about}/team/placeholder.png (100%) rename content/{ => about}/team/rb.jpg (100%) rename content/{ => about}/team/sth.png (100%) rename content/{ => about}/team/team.yaml (100%) diff --git a/config.toml b/config.toml index da70549..a986b4d 100644 --- a/config.toml +++ b/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/" }, ] diff --git a/content/about.md b/content/about/_index.md similarity index 98% rename from content/about.md rename to content/about/_index.md index 0d26296..b8b2d7e 100644 --- a/content/about.md +++ b/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 diff --git a/content/team/_index.md b/content/about/team/_index.md similarity index 100% rename from content/team/_index.md rename to content/about/team/_index.md diff --git a/content/team/bsb.jpg b/content/about/team/bsb.jpg similarity index 100% rename from content/team/bsb.jpg rename to content/about/team/bsb.jpg diff --git a/content/team/dj.jpg b/content/about/team/dj.jpg similarity index 100% rename from content/team/dj.jpg rename to content/about/team/dj.jpg diff --git a/content/team/gd.jpg b/content/about/team/gd.jpg similarity index 100% rename from content/team/gd.jpg rename to content/about/team/gd.jpg diff --git a/content/team/iz.jpg b/content/about/team/iz.jpg similarity index 100% rename from content/team/iz.jpg rename to content/about/team/iz.jpg diff --git a/content/team/jd.png b/content/about/team/jd.png similarity index 100% rename from content/team/jd.png rename to content/about/team/jd.png diff --git a/content/team/mb.jpeg b/content/about/team/mb.jpeg similarity index 100% rename from content/team/mb.jpeg rename to content/about/team/mb.jpeg diff --git a/content/team/ot.jpg b/content/about/team/ot.jpg similarity index 100% rename from content/team/ot.jpg rename to content/about/team/ot.jpg diff --git a/content/team/placeholder.png b/content/about/team/placeholder.png similarity index 100% rename from content/team/placeholder.png rename to content/about/team/placeholder.png diff --git a/content/team/rb.jpg b/content/about/team/rb.jpg similarity index 100% rename from content/team/rb.jpg rename to content/about/team/rb.jpg diff --git a/content/team/sth.png b/content/about/team/sth.png similarity index 100% rename from content/team/sth.png rename to content/about/team/sth.png diff --git a/content/team/team.yaml b/content/about/team/team.yaml similarity index 100% rename from content/team/team.yaml rename to content/about/team/team.yaml diff --git a/content/projects.md b/content/projects.md index cd59619..29678bc 100644 --- a/content/projects.md +++ b/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 diff --git a/templates/team.html b/templates/team.html index 2fee6e0..5a86771 100644 --- a/templates/team.html +++ b/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") %}
{% for person in data.team %}
- {% 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") %}

{{ person.name }} @@ -21,7 +21,7 @@

Former team members

{% for person in data.past %}
- {% 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") %}

{{ person.name }}