From 47c949aa3c0a687a3c7a70f0d697d147c6196654 Mon Sep 17 00:00:00 2001 From: George Cushen Date: Thu, 16 Apr 2020 23:48:38 +0100 Subject: [PATCH] theme: upgrade to latest v4.9-dev - get singular taxonomy URLs --- config/_default/config.toml | 7 +++++++ content/authors/admin/_index.md | 2 +- scripts/init_kickstart.sh | 3 +++ static/admin/config.yml | 2 +- static/admin/index.html | 3 ++- themes/academic | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/config/_default/config.toml b/config/_default/config.toml index 0162a0d..ba89b49 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -37,6 +37,13 @@ enableEmoji = true footnotereturnlinkcontents = "^" ignoreFiles = ["\\.ipynb$", ".ipynb_checkpoints$", "\\.Rmd$", "\\.Rmarkdown$", "_files$", "_cache$"] +# Workaround Hugo publishing taxonomy URLs as plurals - consistently use singular across Academic. +[permalinks] + authors = "/author/:slug/" + tags = "/tag/:slug/" + categories = "/category/:slug/" + publication_types = "/publication-type/:slug/" + [outputs] home = [ "HTML", "RSS", "JSON", "WebAppManifest" ] section = [ "HTML", "RSS" ] diff --git a/content/authors/admin/_index.md b/content/authors/admin/_index.md index 23eff30..9b754e0 100644 --- a/content/authors/admin/_index.md +++ b/content/authors/admin/_index.md @@ -1,6 +1,6 @@ --- # Display name -name: Nelson Bighetti +title: Nelson Bighetti # Username (this should match the folder name) authors: diff --git a/scripts/init_kickstart.sh b/scripts/init_kickstart.sh index 7101e4d..0b4a879 100755 --- a/scripts/init_kickstart.sh +++ b/scripts/init_kickstart.sh @@ -12,6 +12,9 @@ cd scripts/ # Install demo config rsync -av ../themes/academic/exampleSite/config/ ../config/ +# Install Netlify CMS +rsync -av ../themes/academic/exampleSite/static/admin/ ../static/admin/ + # Install demo user rsync -av ../themes/academic/exampleSite/content/authors/ ../content/authors/ diff --git a/static/admin/config.yml b/static/admin/config.yml index 773fc20..fa94180 100644 --- a/static/admin/config.yml +++ b/static/admin/config.yml @@ -60,7 +60,7 @@ collections: label: Talks label_singular: Talk folder: 'content/talk' - path: '{{year}}/{{slug}}/index' # Store talks in year-based subfolders, e.g. `talk/2020/my-talk`. + path: '{{slug}}/index' create: true # Allow users to create new documents in this collection fields: # The fields each document in this collection have - {label: "Title", name: "title", widget: "string"} diff --git a/static/admin/index.html b/static/admin/index.html index d6a98e2..f0934d7 100644 --- a/static/admin/index.html +++ b/static/admin/index.html @@ -4,10 +4,11 @@ Content Manager | Academic + - + diff --git a/themes/academic b/themes/academic index 42d0e5f..dc0d310 160000 --- a/themes/academic +++ b/themes/academic @@ -1 +1 @@ -Subproject commit 42d0e5f8cd130e52e2dfa496c199229a9f12d8cb +Subproject commit dc0d310af1fadcc021c7c825f9ed7cd6288e3730