theme: upgrade to latest v4.9-dev - get singular taxonomy URLs

gcushen · gcushen · commit 47c949aa3c0a · 2020-04-16T23:48:38.000+01:00
diff --git a/config/_default/config.toml b/config/_default/config.toml
@@ -37,6 +37,13 @@ enableEmoji = true
 footnotereturnlinkcontents = "<sup>^</sup>"
 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
@@ -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
@@ -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
@@ -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
@@ -4,10 +4,11 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Content Manager | Academic</title>
+  <!-- Include Netlify Identity for authentication. -->
   <script src="https://identity.netlify.com/v1/netlify-identity-widget.js"></script>
 </head>
 <body>
-<!-- Include the script that builds the page and powers Netlify CMS -->
+<!-- Include the latest Netlify CMS v2.x.x script that builds the admin panel. -->
 <script src="https://cdn.jsdelivr.net/npm/netlify-cms@2/dist/netlify-cms.min.js"></script>
 </body>
 </html>
diff --git a/themes/academic b/themes/academic
@@ -1 +1 @@
-Subproject commit 42d0e5f8cd130e52e2dfa496c199229a9f12d8cb
+Subproject commit dc0d310af1fadcc021c7c825f9ed7cd6288e3730
