From 0e547a28539db88da1adfd0bd39c695521485169 Mon Sep 17 00:00:00 2001 From: Mitchell Olsthoorn Date: Sat, 27 Nov 2021 23:14:42 +0100 Subject: [PATCH 1/2] Rename certain content types to be more consistent --- config/_default/config.yaml | 7 ++++--- config/_default/menus.yaml | 2 +- content/{thesis-projects => thesis_project}/_index.md | 3 ++- content/{tools => tool}/_index.md | 1 + content/{tools => tool}/example-tool/_index.md | 0 content/{vacancies => vacancy}/_index.md | 1 + content/{vacancies => vacancy}/testds/_index.md | 0 content/{vacancies => vacancy}/testing4ai/_index.md | 0 content/{vacancies => vacancy}/testshift/_index.md | 0 layouts/partials/rl_events_tab.html | 2 +- layouts/partials/rl_publications_tab.html | 2 +- layouts/partials/rl_thesis_projects_tab.html | 2 +- layouts/partials/rl_tools_tab.html | 2 +- layouts/partials/rl_vacancies_tab.html | 2 +- 14 files changed, 14 insertions(+), 10 deletions(-) rename content/{thesis-projects => thesis_project}/_index.md (98%) rename content/{tools => tool}/_index.md (94%) rename content/{tools => tool}/example-tool/_index.md (100%) rename content/{vacancies => vacancy}/_index.md (99%) rename content/{vacancies => vacancy}/testds/_index.md (100%) rename content/{vacancies => vacancy}/testing4ai/_index.md (100%) rename content/{vacancies => vacancy}/testshift/_index.md (100%) diff --git a/config/_default/config.yaml b/config/_default/config.yaml index 86847a1..cd61754 100644 --- a/config/_default/config.yaml +++ b/config/_default/config.yaml @@ -55,9 +55,7 @@ enableRobotsTXT: true #mediatypes: # Output formats -outputformats: - Calendar: - protocol: "https://" +#outputformats: # Outputs per content type outputs: @@ -74,6 +72,9 @@ permalinks: publication: "/publications/:slug/" publication_types: "/publication-types/:slug/" research_lines: "/research-lines/:slug/" + thesis-project: "/thesis-projects/:slug/" + tool: "/tools/:slug/" + vacancy: "/vacancies/:slug/" # Taxonomy definitions taxonomies: diff --git a/config/_default/menus.yaml b/config/_default/menus.yaml index 37ef0e8..f8f4fff 100644 --- a/config/_default/menus.yaml +++ b/config/_default/menus.yaml @@ -10,7 +10,7 @@ main: hasChildren: true - parent: SERG name: About SERG - url: "/about" + url: "/about#about-serg" weight: 11 - parent: SERG name: Organization diff --git a/content/thesis-projects/_index.md b/content/thesis_project/_index.md similarity index 98% rename from content/thesis-projects/_index.md rename to content/thesis_project/_index.md index d0016c9..632d0fc 100644 --- a/content/thesis-projects/_index.md +++ b/content/thesis_project/_index.md @@ -1,5 +1,6 @@ --- title: Thesis projects +url: thesis-projects # View. # 1 = List @@ -62,4 +63,4 @@ In particular you need to carefully think about the research component of your p Once you’ve found your project and your supervisor, we recommend that you start writing as soon as possible: Devise a table of content, and fill in details as you go. -To write your thesis you need to make use of our [MSc Thesis Template](https://github.com/SERG-Delft/thesis-template). \ No newline at end of file +To write your thesis you need to make use of our [MSc Thesis Template](https://github.com/SERG-Delft/thesis-template). diff --git a/content/tools/_index.md b/content/tool/_index.md similarity index 94% rename from content/tools/_index.md rename to content/tool/_index.md index 080da56..6f43d3e 100644 --- a/content/tools/_index.md +++ b/content/tool/_index.md @@ -1,5 +1,6 @@ --- title: Software & Tools +url: tools # View. # 1 = List diff --git a/content/tools/example-tool/_index.md b/content/tool/example-tool/_index.md similarity index 100% rename from content/tools/example-tool/_index.md rename to content/tool/example-tool/_index.md diff --git a/content/vacancies/_index.md b/content/vacancy/_index.md similarity index 99% rename from content/vacancies/_index.md rename to content/vacancy/_index.md index 315f317..8f66939 100644 --- a/content/vacancies/_index.md +++ b/content/vacancy/_index.md @@ -1,5 +1,6 @@ --- title: Vacancies +url: vacancies # View. # 1 = List diff --git a/content/vacancies/testds/_index.md b/content/vacancy/testds/_index.md similarity index 100% rename from content/vacancies/testds/_index.md rename to content/vacancy/testds/_index.md diff --git a/content/vacancies/testing4ai/_index.md b/content/vacancy/testing4ai/_index.md similarity index 100% rename from content/vacancies/testing4ai/_index.md rename to content/vacancy/testing4ai/_index.md diff --git a/content/vacancies/testshift/_index.md b/content/vacancy/testshift/_index.md similarity index 100% rename from content/vacancies/testshift/_index.md rename to content/vacancy/testshift/_index.md diff --git a/layouts/partials/rl_events_tab.html b/layouts/partials/rl_events_tab.html index 1448c03..3996c44 100644 --- a/layouts/partials/rl_events_tab.html +++ b/layouts/partials/rl_events_tab.html @@ -4,6 +4,6 @@

Events

-{{ $pages := (where .Pages "Section" "events")}} +{{ $pages := (where .Pages "Section" "event")}} {{ partial "li_pages.html" $pages }} diff --git a/layouts/partials/rl_publications_tab.html b/layouts/partials/rl_publications_tab.html index b2fc6cb..3d04dcc 100644 --- a/layouts/partials/rl_publications_tab.html +++ b/layouts/partials/rl_publications_tab.html @@ -4,6 +4,6 @@

Publications

-{{ $pages := (where .Pages "Section" "publications")}} +{{ $pages := (where .Pages "Section" "publication")}} {{ partial "li_pages.html" $pages }} diff --git a/layouts/partials/rl_thesis_projects_tab.html b/layouts/partials/rl_thesis_projects_tab.html index 67f5bd8..6333c0f 100644 --- a/layouts/partials/rl_thesis_projects_tab.html +++ b/layouts/partials/rl_thesis_projects_tab.html @@ -4,6 +4,6 @@

Thesis Projects

-{{ $pages := (where .Pages "Section" "thesis-projects")}} +{{ $pages := (where .Pages "Section" "thesis-project")}} {{ partial "li_pages.html" $pages }} diff --git a/layouts/partials/rl_tools_tab.html b/layouts/partials/rl_tools_tab.html index 2fb383f..b3886c8 100644 --- a/layouts/partials/rl_tools_tab.html +++ b/layouts/partials/rl_tools_tab.html @@ -4,6 +4,6 @@

Tools

-{{ $pages := (where .Pages "Section" "tools")}} +{{ $pages := (where .Pages "Section" "tool")}} {{ partial "li_pages.html" $pages }} diff --git a/layouts/partials/rl_vacancies_tab.html b/layouts/partials/rl_vacancies_tab.html index bf46d80..6e95668 100644 --- a/layouts/partials/rl_vacancies_tab.html +++ b/layouts/partials/rl_vacancies_tab.html @@ -4,6 +4,6 @@

Vacancies

-{{ $pages := (where .Pages "Section" "vacancies")}} +{{ $pages := (where .Pages "Section" "vacancy")}} {{ partial "li_pages.html" $pages }} From 24cea7f6220614b8385333f4aa9bbe497d83c653 Mon Sep 17 00:00:00 2001 From: Mitchell Olsthoorn Date: Sun, 28 Nov 2021 00:00:58 +0100 Subject: [PATCH 2/2] Update permalinks --- config/_default/config.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/_default/config.yaml b/config/_default/config.yaml index cd61754..791f064 100644 --- a/config/_default/config.yaml +++ b/config/_default/config.yaml @@ -66,15 +66,15 @@ outputs: # Permalinks permalinks: authors: "/members/:slug/" - event: "/events/:slug/" - post: "/posts/:slug/" - project: "/projects/:slug/" - publication: "/publications/:slug/" + event: "/events/:filename/" + post: "/posts/:filename/" + project: "/projects/:filename/" + publication: "/publications/:filename/" publication_types: "/publication-types/:slug/" research_lines: "/research-lines/:slug/" - thesis-project: "/thesis-projects/:slug/" - tool: "/tools/:slug/" - vacancy: "/vacancies/:slug/" + thesis_project: "/thesis-projects/:filename/" + tool: "/tools/:filename/" + vacancy: "/vacancies/:filename/" # Taxonomy definitions taxonomies: