diff --git a/.gitignore b/.gitignore index 677d514f..810aef14 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,6 @@ .idea/ .vscode/ -# Hugo -exampleSite/public/ - # Jupyter .ipynb_checkpoints/ diff --git a/scripts/gen_demo_resources.sh b/scripts/gen_demo_resources.sh index c689e0e8..4dc42b12 100755 --- a/scripts/gen_demo_resources.sh +++ b/scripts/gen_demo_resources.sh @@ -1,5 +1,5 @@ #!/usr/bin/env zsh # Generate preprocessed resources for demo site whilst also removing disused resources. -# Run this script from the root Academic dir. -HUGO_THEME=academic hugo --source exampleSite --themesDir ../../ --gc +# Run this script from the root Wowchemy dir. +HUGO_THEME=wowchemy-hugo-modules hugo --source exampleSite --themesDir ../../ --gc diff --git a/scripts/list_language_packs.py b/scripts/list_language_packs.py index 043aef7e..114314fd 100644 --- a/scripts/list_language_packs.py +++ b/scripts/list_language_packs.py @@ -2,7 +2,7 @@ # List Available Language Packs # Used for updating the Languages page of the documentation. -# https://sourcethemes.com/academic/ +# https://wowchemy.com # # Prerequisites: pip3 install PyYAML diff --git a/scripts/sync_i18n.py b/scripts/sync_i18n.py index cd1661a3..d4bd3fd9 100644 --- a/scripts/sync_i18n.py +++ b/scripts/sync_i18n.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # Sync Language Packs -# Script to synchronize each language pack's items against Academic's master pack (English). -# https://sourcethemes.com/academic/ +# Script to synchronize each language pack's items against Wowchemy's master pack (English). +# https://wowchemy.com # # Prerequisites: pip3 install PyYAML # diff --git a/scripts/view_demo.sh b/scripts/view_demo.sh index 55c2443a..9427fe12 100755 --- a/scripts/view_demo.sh +++ b/scripts/view_demo.sh @@ -1,9 +1,11 @@ #!/usr/bin/env zsh # View the demo site on any local devices by binding the local IP on port 1315. -# Run this script from the root Academic dir. -HUGO_THEME=academic hugo \ +# Run this script from the root Wowchemy dir. +HUGO_THEME=wowchemy-hugo-modules hugo \ --source exampleSite --themesDir ../../ \ --bind=0.0.0.0 -p 1315 --baseURL=http://0.0.0.0:1315 \ --i18n-warnings --minify -e "development" \ server + +#HUGO_THEME=wowchemy-hugo hugo convert toYAML --unsafe --themesDir ../../ diff --git a/wowchemy/archetypes/authors/_index.md b/wowchemy/archetypes/authors/_index.md index 39c9eeb8..97c200c6 100644 --- a/wowchemy/archetypes/authors/_index.md +++ b/wowchemy/archetypes/authors/_index.md @@ -35,7 +35,7 @@ education: year: 2012 # Social/Academic Networking -# For available icons, see: https://sourcethemes.com/academic/docs/page-builder/#icons +# For available icons, see: https://wowchemy.com/docs/page-builder/#icons # For an email link, use "fas" icon pack, "envelope" icon, and a link in the # form "mailto:your-email@example.com" or "#contact" for contact widget. social: diff --git a/wowchemy/archetypes/default.md b/wowchemy/archetypes/default.md index bf4527fe..4adf22e7 100644 --- a/wowchemy/archetypes/default.md +++ b/wowchemy/archetypes/default.md @@ -1,5 +1,5 @@ --- -# Documentation: https://sourcethemes.com/academic/docs/managing-content/ +# Documentation: https://wowchemy.com/docs/managing-content/ title: "{{ replace .Name "-" " " | title }}" subtitle: "" diff --git a/wowchemy/archetypes/docs.md b/wowchemy/archetypes/docs.md index fce204c3..ae742a2d 100644 --- a/wowchemy/archetypes/docs.md +++ b/wowchemy/archetypes/docs.md @@ -1,5 +1,5 @@ --- -# Documentation: https://sourcethemes.com/academic/docs/managing-content/ +# Documentation: https://wowchemy.com/docs/managing-content/ title: "{{ replace .Name "-" " " | title }}" linktitle: "{{ replace .Name "-" " " | title }}" diff --git a/wowchemy/archetypes/home.md b/wowchemy/archetypes/home.md index e979e51c..a2963f07 100644 --- a/wowchemy/archetypes/home.md +++ b/wowchemy/archetypes/home.md @@ -1,6 +1,6 @@ +++ # A section created with the Blank widget. -widget = "blank" # See https://sourcethemes.com/academic/docs/page-builder/ +widget = "blank" # See https://wowchemy.com/docs/page-builder/ headless = true # This file represents a page section. active = true # Activate this widget? true/false weight = 1 # Order that this section will appear. @@ -45,4 +45,4 @@ subtitle = "" css_class = "" +++ -[**Add some elements here**](https://sourcethemes.com/academic/docs/writing-markdown-latex/) +[**Add some elements here**](https://wowchemy.com/docs/writing-markdown-latex/) diff --git a/wowchemy/archetypes/post/index.md b/wowchemy/archetypes/post/index.md index bf4527fe..4adf22e7 100644 --- a/wowchemy/archetypes/post/index.md +++ b/wowchemy/archetypes/post/index.md @@ -1,5 +1,5 @@ --- -# Documentation: https://sourcethemes.com/academic/docs/managing-content/ +# Documentation: https://wowchemy.com/docs/managing-content/ title: "{{ replace .Name "-" " " | title }}" subtitle: "" diff --git a/wowchemy/archetypes/project/index.md b/wowchemy/archetypes/project/index.md index 1630f5a0..22079c54 100644 --- a/wowchemy/archetypes/project/index.md +++ b/wowchemy/archetypes/project/index.md @@ -1,5 +1,5 @@ --- -# Documentation: https://sourcethemes.com/academic/docs/managing-content/ +# Documentation: https://wowchemy.com/docs/managing-content/ title: "{{ replace .Name "-" " " | title }}" summary: "" diff --git a/wowchemy/archetypes/publication/index.md b/wowchemy/archetypes/publication/index.md index a37bbf82..f49efe32 100644 --- a/wowchemy/archetypes/publication/index.md +++ b/wowchemy/archetypes/publication/index.md @@ -1,5 +1,5 @@ --- -# Documentation: https://sourcethemes.com/academic/docs/managing-content/ +# Documentation: https://wowchemy.com/docs/managing-content/ title: "{{ replace .Name "-" " " | title }}" authors: [] diff --git a/wowchemy/archetypes/slides/index.md b/wowchemy/archetypes/slides/index.md index 6870017e..d93004e8 100644 --- a/wowchemy/archetypes/slides/index.md +++ b/wowchemy/archetypes/slides/index.md @@ -1,5 +1,5 @@ --- -# Documentation: https://sourcethemes.com/academic/docs/managing-content/ +# Documentation: https://wowchemy.com/docs/managing-content/ title: "{{ replace .Name "-" " " | title }}" summary: "" diff --git a/wowchemy/archetypes/talk/index.md b/wowchemy/archetypes/talk/index.md index f7e8f4e5..0e33781c 100644 --- a/wowchemy/archetypes/talk/index.md +++ b/wowchemy/archetypes/talk/index.md @@ -1,5 +1,5 @@ --- -# Documentation: https://sourcethemes.com/academic/docs/managing-content/ +# Documentation: https://wowchemy.com/docs/managing-content/ title: "{{ replace .Name "-" " " | title }}" event: diff --git a/wowchemy/assets/js/algolia-search.js b/wowchemy/assets/js/algolia-search.js index aa1750ee..d38b328d 100644 --- a/wowchemy/assets/js/algolia-search.js +++ b/wowchemy/assets/js/algolia-search.js @@ -1,6 +1,6 @@ /************************************************* - * Academic - * https://github.com/gcushen/hugo-academic + * Wowchemy + * https://github.com/wowchemy/wowchemy-hugo-modules * * Algolia based search algorithm. **************************************************/ diff --git a/wowchemy/assets/js/academic-search.js b/wowchemy/assets/js/wowchemy-search.js similarity index 98% rename from wowchemy/assets/js/academic-search.js rename to wowchemy/assets/js/wowchemy-search.js index 1a22753c..fe583d62 100644 --- a/wowchemy/assets/js/academic-search.js +++ b/wowchemy/assets/js/wowchemy-search.js @@ -1,6 +1,6 @@ /************************************************* - * Academic - * https://github.com/gcushen/hugo-academic + * Wowchemy + * https://github.com/wowchemy/wowchemy-hugo-modules * * In-built Fuse based search algorithm. **************************************************/ diff --git a/wowchemy/assets/js/academic.js b/wowchemy/assets/js/wowchemy.js similarity index 99% rename from wowchemy/assets/js/academic.js rename to wowchemy/assets/js/wowchemy.js index c6741f79..66d41bb9 100644 --- a/wowchemy/assets/js/academic.js +++ b/wowchemy/assets/js/wowchemy.js @@ -1,6 +1,6 @@ /************************************************* - * Academic - * https://github.com/gcushen/hugo-academic + * Wowchemy + * https://github.com/wowchemy/wowchemy-hugo-modules * * Core JS functions and initialization. **************************************************/ diff --git a/wowchemy/assets/scss/main.scss b/wowchemy/assets/scss/main.scss index d82bf920..ac356359 100644 --- a/wowchemy/assets/scss/main.scss +++ b/wowchemy/assets/scss/main.scss @@ -45,6 +45,6 @@ $sta-dark-home-section-even: {{ $scr.Get "dark_home_section_even" }}; @import "bootstrap_variables"; @import "_vendor/bootstrap/bootstrap"; -@import "academic/academic"; +@import "wowchemy/wowchemy"; @import "template"; @import "custom"; diff --git a/wowchemy/assets/scss/academic/_card.scss b/wowchemy/assets/scss/wowchemy/_card.scss similarity index 100% rename from wowchemy/assets/scss/academic/_card.scss rename to wowchemy/assets/scss/wowchemy/_card.scss diff --git a/wowchemy/assets/scss/academic/_content.scss b/wowchemy/assets/scss/wowchemy/_content.scss similarity index 100% rename from wowchemy/assets/scss/academic/_content.scss rename to wowchemy/assets/scss/wowchemy/_content.scss diff --git a/wowchemy/assets/scss/academic/_dark.scss b/wowchemy/assets/scss/wowchemy/_dark.scss similarity index 100% rename from wowchemy/assets/scss/academic/_dark.scss rename to wowchemy/assets/scss/wowchemy/_dark.scss diff --git a/wowchemy/assets/scss/academic/_docs.scss b/wowchemy/assets/scss/wowchemy/_docs.scss similarity index 100% rename from wowchemy/assets/scss/academic/_docs.scss rename to wowchemy/assets/scss/wowchemy/_docs.scss diff --git a/wowchemy/assets/scss/academic/_footer.scss b/wowchemy/assets/scss/wowchemy/_footer.scss similarity index 100% rename from wowchemy/assets/scss/academic/_footer.scss rename to wowchemy/assets/scss/wowchemy/_footer.scss diff --git a/wowchemy/assets/scss/academic/_icons.scss b/wowchemy/assets/scss/wowchemy/_icons.scss similarity index 100% rename from wowchemy/assets/scss/academic/_icons.scss rename to wowchemy/assets/scss/wowchemy/_icons.scss diff --git a/wowchemy/assets/scss/academic/_integrations.scss b/wowchemy/assets/scss/wowchemy/_integrations.scss similarity index 100% rename from wowchemy/assets/scss/academic/_integrations.scss rename to wowchemy/assets/scss/wowchemy/_integrations.scss diff --git a/wowchemy/assets/scss/academic/_listings.scss b/wowchemy/assets/scss/wowchemy/_listings.scss similarity index 100% rename from wowchemy/assets/scss/academic/_listings.scss rename to wowchemy/assets/scss/wowchemy/_listings.scss diff --git a/wowchemy/assets/scss/academic/_nav.scss b/wowchemy/assets/scss/wowchemy/_nav.scss similarity index 100% rename from wowchemy/assets/scss/academic/_nav.scss rename to wowchemy/assets/scss/wowchemy/_nav.scss diff --git a/wowchemy/assets/scss/academic/_root.scss b/wowchemy/assets/scss/wowchemy/_root.scss similarity index 100% rename from wowchemy/assets/scss/academic/_root.scss rename to wowchemy/assets/scss/wowchemy/_root.scss diff --git a/wowchemy/assets/scss/academic/_rtl.scss b/wowchemy/assets/scss/wowchemy/_rtl.scss similarity index 100% rename from wowchemy/assets/scss/academic/_rtl.scss rename to wowchemy/assets/scss/wowchemy/_rtl.scss diff --git a/wowchemy/assets/scss/academic/_search.scss b/wowchemy/assets/scss/wowchemy/_search.scss similarity index 100% rename from wowchemy/assets/scss/academic/_search.scss rename to wowchemy/assets/scss/wowchemy/_search.scss diff --git a/wowchemy/assets/scss/academic/_widgets.scss b/wowchemy/assets/scss/wowchemy/_widgets.scss similarity index 100% rename from wowchemy/assets/scss/academic/_widgets.scss rename to wowchemy/assets/scss/wowchemy/_widgets.scss diff --git a/wowchemy/assets/scss/academic/academic.scss b/wowchemy/assets/scss/wowchemy/wowchemy.scss similarity index 69% rename from wowchemy/assets/scss/academic/academic.scss rename to wowchemy/assets/scss/wowchemy/wowchemy.scss index 17b5d93e..2b3e8bfa 100644 --- a/wowchemy/assets/scss/academic/academic.scss +++ b/wowchemy/assets/scss/wowchemy/wowchemy.scss @@ -1,8 +1,8 @@ /************************************************* - * Academic: The Website Builder for Hugo + * Wowchemy: The Website Builder for Hugo * Designed by @GeorgeCushen - * https://sourcethemes.com/academic/ - * License: https://github.com/gcushen/hugo-academic/blob/master/LICENSE.md + * https://wowchemy.com/ + * License: https://github.com/wowchemy/wowchemy-hugo-modules/blob/master/LICENSE.md **************************************************/ @import "root"; diff --git a/wowchemy/data/page_sharer.toml b/wowchemy/data/page_sharer.toml index e795df45..c890a604 100644 --- a/wowchemy/data/page_sharer.toml +++ b/wowchemy/data/page_sharer.toml @@ -1,5 +1,5 @@ # Page Sharer -# Documentation: https://sourcethemes.com/academic/docs/customization/#page-sharer +# Documentation: https://wowchemy.com/docs/customization/#page-sharer [[buttons]] id = "twitter" diff --git a/wowchemy/layouts/_default/rss.xml b/wowchemy/layouts/_default/rss.xml index 38086bca..3ac74e1b 100644 --- a/wowchemy/layouts/_default/rss.xml +++ b/wowchemy/layouts/_default/rss.xml @@ -15,7 +15,7 @@ {{ printf "" .Permalink .MediaType | safeHTML }} {{ end -}} {{ .Title | default site.Title }} - Source Themes Academic (https://sourcethemes.com/academic/) + Wowchemy (https://wowchemy.com) {{- with site.LanguageCode }}{{.}}{{end -}} {{- with site.Copyright }}{{ replace (replace . "{year}" now.Year) "©" "©" | plainify }}{{end -}} {{- if not .Date.IsZero }}{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end -}} diff --git a/wowchemy/layouts/index.html b/wowchemy/layouts/index.html index ad964adf..ce924e00 100644 --- a/wowchemy/layouts/index.html +++ b/wowchemy/layouts/index.html @@ -1,8 +1,8 @@ {{- define "main" -}} -{{/* Check that user fully installed Academic. */}} +{{/* Check that user fully installed Wowchemy. */}} {{ if not (isset site.Params "theme") }} - {{ errorf "Please complete the installation of Academic by following the steps at https://sourcethemes.com/academic/docs/install/" }} + {{ errorf "Please complete the installation of Wowchemy by following the steps at https://wowchemy.com/docs/install/" }} {{ end }} {{/* Deprecation warnings */}} @@ -10,7 +10,7 @@ {{/* v4.5: Address changed from string to map. */}} {{ if isset site.Params "address" }} {{ if eq (reflect.IsMap site.Params.address) false }} - {{ errorf "Please upgrade the `address` field in `config/_default/params.toml`. Refer to all of the Breaking Changes in v4.5 at https://sourcethemes.com/academic/updates/v4.5.0/" }} + {{ errorf "Please upgrade the `address` field in `config/_default/params.toml`. Refer to all of the Breaking Changes in v4.5 at https://wowchemy.com/updates/v4.5.0/" }} {{ end }} {{ end }} diff --git a/wowchemy/layouts/partials/docs_sidebar.html b/wowchemy/layouts/partials/docs_sidebar.html index 023f46d0..95b6d26e 100644 --- a/wowchemy/layouts/partials/docs_sidebar.html +++ b/wowchemy/layouts/partials/docs_sidebar.html @@ -12,7 +12,7 @@ {{ end }} {{ $menu_name = .Params.menu_name | default $menu_name | default (path.Base (path.Split .File).Dir) }} {{ if not (index site.Menus $menu_name) }} - {{ errorf "Please define menu items named `menu: %s:` in your %s front matter or define `[[menu.%s]]` in `config/default/menus.toml`. See https://sourcethemes.com/academic/docs/managing-content/#menus" $menu_name .Path $menu_name }} + {{ errorf "Please define menu items named `menu: %s:` in your %s front matter or define `[[menu.%s]]` in `config/default/menus.toml`. See https://wowchemy.com/docs/managing-content/#menus" $menu_name .Path $menu_name }} {{ end }}
diff --git a/wowchemy/layouts/partials/site_js.html b/wowchemy/layouts/partials/site_js.html index 51e7ce75..a0fa87a1 100644 --- a/wowchemy/layouts/partials/site_js.html +++ b/wowchemy/layouts/partials/site_js.html @@ -146,11 +146,11 @@ {{ end }} - {{ $js_comment := printf "/* Source Themes Academic v%s | https://sourcethemes.com/academic/ */\n" site.Data.academic.version }} + {{ $js_comment := printf "/* Wowchemy v%s | https://wowchemy.com/ */\n" site.Data.wowchemy.version }} {{ $js_bundle_head := $js_comment | resources.FromString "js/bundle-head.js" }} {{ $js_linebreak := "\n" | resources.FromString "js/linebreak.js" }}{{/* Fix no line break after Bootstrap JS causing error. */}} - {{ $js_academic := resources.Get "js/academic.js" }} - {{ $js_academic_search := resources.Get "js/academic-search.js" }} + {{ $js_academic := resources.Get "js/wowchemy.js" }} + {{ $js_academic_search := resources.Get "js/wowchemy-search.js" }} {{ $js_algolia_search := resources.Get "js/algolia-search.js" }} {{ $js_bootstrap := resources.Get "js/_vendor/bootstrap.min.js" }} {{ $js_bundle := slice $js_bootstrap $js_linebreak $js_academic }} @@ -162,8 +162,8 @@ {{ range site.Params.plugins_js }} {{ $js_bundle = $js_bundle | append (resources.Get (printf "js/%s.js" .)) }} {{ end }} - {{ $js_bundle := $js_bundle | resources.Concat "js/academic-bundle-pre.js" | minify }} - {{ $js_bundle := slice $js_bundle_head $js_bundle | resources.Concat "js/academic.min.js" | fingerprint "md5" }} + {{ $js_bundle := $js_bundle | resources.Concat "js/wowchemy-bundle-pre.js" | minify }} + {{ $js_bundle := slice $js_bundle_head $js_bundle | resources.Concat "js/wowchemy.min.js" | fingerprint "md5" }} {{ partial "custom_js" . }} diff --git a/wowchemy/layouts/partials/widget_page.html b/wowchemy/layouts/partials/widget_page.html index ffb0dd69..c4b2c647 100644 --- a/wowchemy/layouts/partials/widget_page.html +++ b/wowchemy/layouts/partials/widget_page.html @@ -10,7 +10,7 @@ {{/* Check homepage exists */}} {{ if not $headless_bundle }} {{ errorf "Homepage not found at %s!" $page }} - {{ errorf "Add the `/home/index.md` homepage file to each language's content folder. For example, your site should have a `content/home/` folder containing `index.md` and your homepage sections, or for multi-language sites, `content/en/home/` and `content/zh/home/` etc. Refer to the 'Build Your Homepage' and 'Language' documentation at https://sourcethemes.com/academic/docs/ and the example homepage at https://github.com/gcushen/hugo-academic/tree/master/exampleSite/content/home/index.md ." }} + {{ errorf "Add the `/home/index.md` homepage file to each language's content folder. For example, your site should have a `content/home/` folder containing `index.md` and your homepage sections, or for multi-language sites, `content/en/home/` and `content/zh/home/` etc. Refer to the 'Build Your Homepage' and 'Language' documentation at https://wowchemy.com/docs/ and the example homepage at https://github.com/wowchemy/starter-academic/tree/master/exampleSite/content/home/index.md ." }} {{ end }} {{ else }} {{ $page = .File.Path }} @@ -18,8 +18,8 @@ {{/* Check widget page exists. */}} {{ if not $headless_bundle }} {{ errorf "Widget Page not found at %s!" $page }} - {{ errorf "View the Widget Page documentation at https://sourcethemes.com/academic/docs/managing-content/#create-a-widget-page ." }} - {{ errorf "If the Hugo version is between 0.65 and 0.68, it may be a confirmed Hugo bug that is expected to be fixed in Hugo v0.69: https://github.com/gcushen/hugo-academic/issues/1595#issuecomment-605514973 ." }} + {{ errorf "View the Widget Page documentation at https://wowchemy.com/docs/managing-content/#create-a-widget-page ." }} + {{ errorf "If the Hugo version is between 0.65 and 0.68, it may be a confirmed Hugo bug that is expected to be fixed in Hugo v0.69: https://github.com/wowchemy/wowchemy-hugo-modules/issues/1595#issuecomment-605514973 ." }} {{ end }} {{ end }} diff --git a/wowchemy/layouts/partials/widgets/about.html b/wowchemy/layouts/partials/widgets/about.html index 94d9943e..ccc549b8 100644 --- a/wowchemy/layouts/partials/widgets/about.html +++ b/wowchemy/layouts/partials/widgets/about.html @@ -11,7 +11,7 @@ {{ $person_page_path := (printf "/authors/%s" $author) }} {{ $person_page := site.GetPage $person_page_path }} {{ if not $person_page }} - {{ errorf "Could not find an author page at `%s`. Please check the value of `author` in your About widget and create an associated author page if one does not already exist. See https://sourcethemes.com/academic/docs/page-builder/#about " $person_page_path }} + {{ errorf "Could not find an author page at `%s`. Please check the value of `author` in your About widget and create an associated author page if one does not already exist. See https://wowchemy.com/docs/page-builder/#about " $person_page_path }} {{end}} {{ $person := $person_page.Params }} {{ $avatar := ($person_page.Resources.ByType "image").GetMatch "*avatar*" }}