From 018be3bb4030ac9262521398714c379476007f75 Mon Sep 17 00:00:00 2001 From: George Cushen Date: Fri, 15 May 2020 00:04:13 +0100 Subject: [PATCH] theme: upgrade to latest v4.9-dev --- assets/images/icon-pack/.gitkeep | 0 config/_default/params.toml | 4 ++ content/home/skills.md | 17 +++++++- netlify.toml | 2 +- static/admin/config.yml | 71 +++++++++++++++++++++++++++++++- themes/academic | 2 +- 6 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 assets/images/icon-pack/.gitkeep diff --git a/assets/images/icon-pack/.gitkeep b/assets/images/icon-pack/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/config/_default/params.toml b/config/_default/params.toml index aed7ab5..1dae6cb 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -152,6 +152,10 @@ docs_section_pager = true # Display pager in Docs layout (e.g. tutorials)? # Enable in-built social sharing buttons? (true/false) sharing = true +# Show a copyright license from creativecommons.org in the site footer? +# Page specific copyright licenses are also possible by adding this option to a page's front matter. +copyright_license = {enable = false, allow_derivatives = false, share_alike = true, allow_commercial = false, notice = "This work is licensed under {license}"} + # Link authors to their profile page? (true/false) link_authors = true diff --git a/content/home/skills.md b/content/home/skills.md index 9f9f18e..e7d9ca7 100644 --- a/content/home/skills.md +++ b/content/home/skills.md @@ -12,7 +12,7 @@ subtitle = "" # # Add/remove as many `[[feature]]` blocks below as you like. # -# For available icons, see: https://sourcethemes.com/academic/docs/widgets/#icons +# For available icons, see: https://sourcethemes.com/academic/docs/page-builder/#icons [[feature]] icon = "r-project" @@ -32,4 +32,19 @@ subtitle = "" name = "Photography" description = "10%" +# Uncomment to use emoji icons. +# [[feature]] +# icon = ":smile:" +# icon_pack = "emoji" +# name = "Emojiness" +# description = "100%" + +# Uncomment to use custom SVG icons. +# Place custom SVG icon in `assets/images/icon-pack/`, creating folders if necessary. +# [[feature]] +# icon = "beach-sunset" +# icon_pack = "custom" +# name = "Surfing" +# description = "90%" + +++ diff --git a/netlify.toml b/netlify.toml index ff0cb39..3ef8b3b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ publish = "public" [build.environment] - HUGO_VERSION = "0.68.3" + HUGO_VERSION = "0.70.0" HUGO_ENABLEGITINFO = "true" [context.production.environment] diff --git a/static/admin/config.yml b/static/admin/config.yml index fa94180..c47bc2a 100644 --- a/static/admin/config.yml +++ b/static/admin/config.yml @@ -4,6 +4,75 @@ backend: media_folder: 'static/img/' public_folder: 'img' collections: + - name: authors + label: Authors + label_singular: Author + folder: 'content/authors' + path: '{{slug}}/_index' + create: true # Allow users to create new documents in this collection + fields: # The fields each document in this collection have + - {label: "Display name (such as your full name)", name: "title", widget: "string"} + - {label: "Position or tagline (such as Professor of AI)", name: "role", widget: "string", required: false} + - label: "Avatar (upload an image named `avatar.jpg/png`)" + name: "avatar_filename" + widget: "image" + default: "avatar" + required: false + media_library: + config: + multiple: false + - {label: "Short biography (shown in author boxes)", name: "bio", widget: "string", required: false} + - {label: "Full biography (shown in About widget)", name: "body", widget: "markdown", required: false} + - label: "Interests (shown in About widget)" + name: "interests" + required: false + widget: "list" + - label: Social links + name: social + required: false + widget: list + fields: + - {label: Link, name: link, widget: string} + - label: Icon pack + name: icon_pack + widget: select + multiple: false + options: + - {label: "None", value: ""} + - {label: "Solid", value: "fas"} + - {label: "Regular", value: "far"} + - {label: "Brand", value: "fab"} + - {label: "Academic", value: "ai"} + - {label: Icon (see https://sourcethemes.com/academic/docs/page-builder/#icons), name: icon, widget: string} + - label: "Organizations you belong to or are affiliated with (shown in About widget)" + name: "organizations" + required: false + widget: list + fields: + - {label: Organization, name: name, widget: string, required: true} + - {label: Link, name: url, widget: string, required: false} + - label: "Education" + name: "education" + required: false + widget: object + fields: + - label: "Courses" + name: "courses" + required: false + widget: list + fields: + - {label: Course, name: course, widget: string, required: true} + - {label: Institution, name: institution, widget: string, required: true} + - {label: Year, name: year, widget: number, valueType: int, required: false} + - {label: "Email (to use a Gravatar.com avatar)", name: "email", widget: "string", required: false} + - label: "Super user (is this the primary site user?)" + name: "superuser" + widget: "boolean" + default: false + - label: "User groups (only for organization websites)" + name: "user_groups" + required: false + widget: "list" - name: posts label: Posts label_singular: Post @@ -87,7 +156,7 @@ collections: - {label: "Regular", value: "far"} - {label: "Brand", value: "fab"} - {label: "Academic", value: "ai"} - - {label: Icon, name: icon, widget: string, required: false} + - {label: "Icon (see https://sourcethemes.com/academic/docs/page-builder/#icons)", name: icon, widget: string, required: false} - {label: "Event", name: "event", widget: "string"} - {label: "Event link", name: "event_url", widget: "string"} - {label: "Publish this page on", name: "publishDate", widget: "datetime"} diff --git a/themes/academic b/themes/academic index 48b39f8..3cb96be 160000 --- a/themes/academic +++ b/themes/academic @@ -1 +1 @@ -Subproject commit 48b39f8550bb72fd0c234e873c00f4f868eb1de2 +Subproject commit 3cb96be5c628d7548c4e18c57ac755d50f5c9de2