Merge branch 'submission' into 'master'

Some improvements

See merge request toryanderson/hugo-icarus!1

5 files changed, 20 insertions, 102 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 0b64b96..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Changelog
-
-
-## Release v1.1 - 20th May 2017
-
-*In the future new additions and changes will be assigned to version numbers rather than dates.* This allows you to track changes in a better fashion. The state of this theme before this release has been assigned to v1.0.
-
-**This change requires Hugo v0.20 or greater** due to the usage of new Hugo features.
-
-### General information
-
-The `exampleSite` folder has become a standalone demo by modified the `themesDir` property in the `config.toml`. Make sure to comment out `themesDir` in the config file if you use the theme in production. [Read more](/README.md#setup)
-
-### Fixes
-
-- Switch CDN for Mathjax due to retirement. See [#86](https://github.com/digitalcraftsman/hugo-icarus-theme/pull/86) (thanks @Heliosmaster)
-- Prevent appearance of link for /posts on homepage. See [dc62f88](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/dc62f88037645c57bc45b340d51725541e140528) (thanks @igor-sokolov)
-
-### Improvements
-
-- [Block templates](https://gohugo.io/templates/blocks/) are now used to reduce redundancy. See [62d00ff](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/62d00ff27ab2e4b363cd1a3aecd8da2fa0ef9bd74)
-- Cache partials where possible. See [d38e4be](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/d38e4be45711c49174079fe57c2af959891e2cde)
-- Add example for about page. See [183f569](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/183f569749f8051e609c36a57f417124f02a21f7)
-- The `.Site.Params.mainSections` options allows you to specify which types of pages should be shown on the homepage. See [0928ac7](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/0928ac7868816f52541d07a2a66a4038c54de344)
-- Add `.Site.Params.gravatar` as a way use Gravatar for the profile picure. See [b6b79b7](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/b6b79b766386db444df1703dd295a87acd5f6157)
-
-### Deprecations
-
-- The JSFiddle shortcode has been removed. See [5203108](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/52031082ef5cf8da6132d79bf6bfca2eb7a583e7)
-
-
----
-
-
-### 1st April 2017
-
-With Hugo v0.20 the `.Now` is deprecated and will be replaced by the `now` template function. v0.19 does support both and as part of the transition phase. Hence the least required version of Hugo is v0.19.
-
-### 28th October 2016 - Option to link custom assets
-
-You're now able to link local or external assets by adding their url to
-the `custom_js` and `custom_css` variables in the config file.
-
-[Show me the diff](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/cd1a8c02e0cf97c443cfdbf44091e66863305eba)
-
-### 8th March 2016 - Options to disable features for single pages
-
-#### Comments
-
-The comment section can be disabled for single pages in the frontmatter.
-
-[Show me the diff](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/c7dcfa6548cc71c48d39bba6367aea7d15203b37)
-
-#### Profile and widgets
-
-The profile and the widgets can be disabled for single pages in the frontmatter. Are both disabled the content will use the full width of the page
-
-[Show me the diff](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/d0fcabe2fbd5e0d5d6f29b6c8d19699e5b11fdde)
-
-
-### 3rd January 2016 - Allow specifying an avatar
-
-This change adds the new variable `avatar` under `[params]` in the configuration. You need to set this path in order to show an avatar image. The default one can still be found under `css/images/avatar.png`.
-
-[Show me the diff](https://github.com/larrywright/hugo-icarus-theme/commit/0850eabae7e7f79151bfcb462d4ad6795d7caeea)
-
-
-### 27th November 2015 - Upgrade to Hugo v0.15
-
-Hugo v0.15 is required in order to run the theme with the changes listed below:
-
-#### Google Analytics template
-
-The setup of Google Analytics changed slighty due to the switch to Hugo's built-in template. In order to update the theme you need to relocate thr `google_analytics` variable in the configs and rename it to `googleAnalytics`. Take a look in the example [`config.toml`](https://github.com/digitalcraftsman/hugo-icarus-theme/blob/dev/exampleSite/config.toml).
-
-[Show me the diff](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/fa50238040577c80b5871772cf944681ccfc075f)
-
-
-### 18th October 2015 - Rename i10n to l10n
-
-Since the right shortcut of localization is "l10n" and not "i10n" (from internationalization) I renamed the shortcut in all places of the theme. The most significant change is the renaming of the `i10n.toml` file inside the `data` folder to `l10n.toml`. This has the side effect that all key paths used for l10n changed within the templates too.
-
-[Show me the diff](https://github.com/digitalcraftsman/hugo-icarus-theme/commit/f52c1da20d8daed67bc2d51627bfe00c7a7b158e)
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 8c9f2bc..b1c64a3 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -2,13 +2,13 @@ baseurl = "https://example.org/"
 languageCode = "en-us"
 title = "Icarus"
 # Enable comments by entering your Disqus shortname
-disqusShortname = "spf13"
+disqusShortname = ""
 # Enable Google Analytics by entering your tracking code
 googleAnalytics = ""
 # Define the number of posts per page
 paginate = 10
 footnotereturnlinkcontents = "↩"
-theme = "hugo-icarus-theme"
+theme = "hugo-icarus"
 # Comment the themesDir option if you use this theme in production
 themesDir = "../.."
 
@@ -23,7 +23,7 @@ themesDir = "../.."
     bio = "Blogger - Programmer - Gopher"
     location = "Earth"
     site_description = ""
-    copyright  = "Powered by [Hugo](//gohugo.io). Theme by [PPOffice](http://github.com/ppoffice)."
+    copyright  = "Powered by [Hugo](//gohugo.io). Theme by [PPOffice](https://github.com/ppoffice)."
     avatar = "css/images/avatar.png"
     # Enter your email address to display your Gravatar icon in the profile. If not set the theme
     # will fallback to the avatar.
@@ -64,14 +64,14 @@ themesDir = "../.."
 
 # Enter a link for the follow button on the left
 [params.profile]
-    follow_button = "https://github.com/digitalcraftsman"
+    follow_button = "https://github.com/gohugoio"
 
 
 [social]
 # Add your social network accounts to the profile section on the left
 # by entering your username. The links to your account will be
 # created automatically.
-    github          = "digitalcraftsman"
+    github          = "gohugoio"
     gitlab          = ""
     bitbucket       = ""
     jsfiddle        = ""
@@ -98,7 +98,7 @@ themesDir = "../.."
     facebook        = ""
     facebook_admin  = ""
     twitter_domain  = ""
-    twitter         = "spf13"
+    twitter         = "gohugoio"
 
 # Enable and disable widgets for the right sidebar
 [params.widgets]
diff --git a/layouts/partials/article_footer.html b/layouts/partials/article_footer.html
index 739af86..6967d92 100644
--- a/layouts/partials/article_footer.html
+++ b/layouts/partials/article_footer.html
@@ -1,5 +1,5 @@
 <footer class="article-footer">
-    <a data-url="{{ .Permalink }}" data-id="{{ .UniqueID }}" class="article-share-link">
+    <a data-url="{{ .Permalink }}" data-id="{{ .File.UniqueID }}" class="article-share-link">
         <i class="fa fa-share"></i>
         {{with .Site.Data.l10n.articles.share}}{{.}}{{end}}
     </a>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2348be8..33d7f40 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -2,7 +2,7 @@
 <html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
 <head>
     <title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ .Title }} &middot; {{ .Site.Title }}{{ end }}</title>
-    {{ .Hugo.Generator }}
+    {{ hugo.Generator }}
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     {{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
@@ -11,9 +11,9 @@
     {{ else }}
       <meta name="description" content="{{ .Site.Params.site_description }}">
     {{ end }}
-    {{ with .RSSLink }}
-      <link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
-      <link href="{{ . }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
+    {{ with .OutputFormats.Get "RSS" }}
+      <link href="{{ .RelPermalink }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
+      <link href="{{ .RelPermalink }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
     {{ end }}
     <link rel="canonical" href="{{ .Permalink }}"/>
     <link rel="icon" href="{{ "favicon.ico" | absURL }}">
diff --git a/theme.toml b/theme.toml
index c749c24..ee896ef 100644
--- a/theme.toml
+++ b/theme.toml
@@ -1,18 +1,19 @@
 name = "Icarus"
 license = "MIT"
-licenselink = "//github.com/digitalcraftsman/hugo-icarus-theme/blob/master/LICENSE.md"
-description = "The blog theme you may fall in love with, coming to Hugo. "
-homepage = "//github.com/digitalcraftsman/hugo-icarus-theme"
+licenselink = "https://gitlab.com/toryanderson/hugo-icarus/-/blob/master/LICENSE.md"
+description = "A responsive and customizable theme for bloggers. "
+homepage = "https://gitlab.com/toryanderson/hugo-icarus/-/tree/master"
 tags = ["syntax highlighting", "maxthjax", "rss", "gallery", "widgets", "google analytics"]
 features = ["syntax highlighting", "maxthjax", "rss", "gallery", "widgets", "google analytics"]
-min_version = 0.20
+min_version = "0.72.0"
 
-[author]
-  name = "Digitalcraftsman"
-  homepage = "//github.com/digitalcraftsman"
+authors = [
+  {name = "Tory Anderson", homepage = "https://gitlab.com/toryanderson"},
+  {name = "Digitalcraftsman", homepage = "https://github.com/digitalcraftsman"}
+]
 
 # If porting an existing theme
 [original]
   name = "Ruipeng Zhang"
   homepage = "http://blog.zhangruipeng.me"
-  repo = "//github.com/ppoffice/hexo-theme-icarus"
+  repo = "https://github.com/ppoffice/hexo-theme-icarus"