Merge pull request #89 from Lednerb/development

Releasing version 1.7.0

CHANGELOG.md

@@ -6,6 +6,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.7.0] - 2018-06-17 | :tada: Multi-Language Support :tada:
+### Added
+- __Multi-Language Support__ <br>
+  You can now have your blog and blog posts in many languages. <br>
+  The algolia search does also support a multi-language site.
+- Support for [Page Resources](http://gohugo.io/content-management/page-resources/)
+- Increased privacy by removing dependencies from CDNs and Google Fonts
+- Japanese language file, contributed by @chibikun
+- Easier `gallery` and `featuredImage` handling. See announcement in [1.6.0]
+- Instructions to customize `404.html` site (#46)
+- Default values to prevent rendering issues when `config.toml` variables are not set (#65)
+
+### Fixed
+- URLs for posts, categories, tags, and authors, thanks to @anhchungite
+- CSS import with different baseURL (#68)
+- Space for top-nav (#80)
+- Pages for the taxonomy overviews (categories, tags and authors) (#59)
+
+
 ## [1.6.0] - 2018-06-11
 ### Deprecated
 - `featuredImage: "/absolute/url/to/image"` parameter <br>
@@ -87,7 +106,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Some typos
 
 
-[Unreleased]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.6.0...master
+[Unreleased]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.7.0...master
+[1.7.0]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.6.0...1.7.0
 [1.6.0]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.5.0...1.6.0
 [1.5.0]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.4.0...1.5.0
 [1.4.0]: https://github.com/Lednerb/bilberry-hugo-theme/compare/1.3.0...1.4.0

README.md

@@ -28,6 +28,7 @@ If you like this theme and/or use it for commercial purposes, please support me!
     - [Responsive Design](#responsive-design)
     - [Permanent Top Navigation](#permanent-top-navigation)
     - [MathJAX Markup](#mathjax-markup)
+- [Custom 404 site](#custom-404-site)
 - [Custom Post Types](#custom-post-types)
 - [Custom colors and fonts](#custom-colors-and-fonts)
 - [CSS and JS modules](#css-and-js-modules)
@@ -85,7 +86,7 @@ You can test it on the demo site.
 Just click on the navigation bar at the top right of the header.
 
 
-### Setup
+#### Setup
 If you do not want to use the search functionality set `algolia_search = false` in your `config.toml` file.
 
 If you want to include the algolia search for your site, you have to follow these steps:
@@ -95,13 +96,16 @@ If you want to include the algolia search for your site, you have to follow thes
 3. Switch over to `Indices` and create a new one.
 4. Switch over to `API Keys` and copy your `Application ID`, `Search-Only API Key` and chosen `Index name` to your `config.toml` file.
 5. Ensure that `algolia_search = true` is set.
+6. Check the next section [Update the search index](#update-the-search-index), follow the steps and come back again
+7. Back in your algolia index, switch to `DISPLAY` and select `language` in the `Attributes for faceting` option.
+8. Done.
 
 
-### Update the search index
+#### Update the search index
 You have to repeat this step every time you change a post or publish a new one to update the search index.
 
 1. Publish your changes via the `hugo` command.
-2. Head over to `http://your-site.com/index.json` and copy everything in there
+2. Head over to the `public/index.json` file and copy everything in there
 3. Login to your algolia account, open your index and click at `Add records manually`
 4. Paste the copied text from the `index.json` file.
 5. Done.
@@ -168,6 +172,12 @@ Note that on mobile devices the navigation will still be collapsed because other
 
 If you want to add [MathJAX](https://www.mathjax.org) markup support, set parameter `enable_mathjax` option to `true` in your site's config file.
 
+## Custom 404 site
+If you want to customize your 404 site, copy the `themes/bilberry-hugo-theme/layouts/404.html` to your local `layouts/404.html` and edit the file.
+
+You can quickly change the message and / or the icon class for example.
+Otherwise, you can replace the whole content with your 404 site markup.
+
 ## Custom Post Types
 If you want to add a custom post type to change the icon in the bubble on the left column you can simply create those as you wish.
 
@@ -191,7 +201,7 @@ If you want to change the default post types (e.g., don't use the pencil icon on
 Otherwise, your changes would be overwritten when you update to the latest theme version.
 
 
-# Custom colors and fonts
+## Custom colors and fonts
 Bilberry uses SCSS for styling and a Webpack-based workflow to dynamically create the combined and compresses production-ready stylesheets.
 
 If you want to change any colors or fonts, you have follow these steps:
@@ -213,7 +223,7 @@ Follow the steps 1-7 to implement your custom font to your site.
 _Note:_ You don't have to upload the `node_modules` folder to your webspace, this is only created and needed to generate your customized stylesheets.
 
 
-# CSS and JS modules
+## CSS and JS modules
 This theme supports hot-swappable CSS and JavaScript extentions. Modules can be specified using the `(css|js)_modules` list parameter. Modules can be specified either relative to the `static` directory (e.g. `exampleSite/static/css/custom.css`) or as a URL.
 
 Modules are imported in the order they appear in the list, and immediately after the default Bilberry CSS and JS files are imported.

archetypes/audio.md

@@ -3,7 +3,6 @@ title: "{{ replace .Name "-" " " | title }}"
 date: {{ .Date }}
 draft: true
 
-featuredImage: ""
 categories: []
 tags: []
 author: ""

archetypes/default.md

@@ -3,7 +3,6 @@ title: "{{ replace .Name "-" " " | title }}"
 date: {{ .Date }}
 draft: true
 
-featuredImage: ""
 categories: []
 tags: []
 author: ""

archetypes/gallery.md

@@ -3,10 +3,8 @@ title: "{{ replace .Name "-" " " | title }}"
 date: {{ .Date }}
 draft: true
 
-gallery: [
-    '/images/picture1.jpg',
-    '/images/picture2.jpg',
-    ]
+imageSlider: true   #set to false if you don't want to use the imageSlider but a featuredImage
+
 categories: []
 tags: []
 author: ""

archetypes/link.md

@@ -3,7 +3,6 @@ title: "{{ replace .Name "-" " " | title }}"
 date: {{ .Date }}
 draft: true
 
-featuredImage: ""
 categories: []
 tags: []
 

archetypes/video.md

@@ -3,7 +3,6 @@ title: "{{ replace .Name "-" " " | title }}"
 date: {{ .Date }}
 draft: true
 
-featuredImage: ""
 categories: []
 author: ""
 

exampleSite/config.toml

@@ -4,7 +4,7 @@ theme = "bilberry-hugo-theme"
 
 enableRobotsTXT = true
 
-# Change to your content language. Supported values: en, de, es, fr, ru
+# Change to one of your content languages definded at the end.
 DefaultContentLanguage = "en"
 
 # Enable / Disable Google Analytics statistics for your site
@@ -40,6 +40,8 @@ disqusShortname = "bilberry-hugo-theme"
   algolia_appId     = "Y2C4RWMPXW"
   algolia_apiKey    = "50ea7f8c41c0ad233926e0be2b769ed1"
   algolia_indexName = "default-content"
+    # Set this option to false if you want to search within all articles in all languages at once
+    algolia_currentLanguageOnly = true
 
   # Header configuration
     # your subtitle if you want to use any
@@ -54,6 +56,9 @@ disqusShortname = "bilberry-hugo-theme"
     # always display the top navigation (with pages and search) on non-mobile screens
     permanentTopNav = false
 
+    # show a language chooser in the header
+    showHeaderLanguageChooser = true
+
     # credits line configuration
     copyrightBy = "by Lednerb"
     copyrightUseCurrentYear = false  # set to true to always display the current year in the copyright
@@ -63,6 +68,7 @@ disqusShortname = "bilberry-hugo-theme"
     creditsUrl = "https://github.com/Lednerb/bilberry-hugo-theme"
 
   # social media profile urls for the footer links
+  showSocialMedia = true
   facebook   = ""
   twitter    = "https://twitter.com/TheRealLednerb"
   googleplus = ""
@@ -75,7 +81,17 @@ disqusShortname = "bilberry-hugo-theme"
   xing       = ""
   linkedin   = ""
 
-# don't change anything here
+# customize your available languages for your multi-langual site
+# or delete the [Languages] blog to use the theme with only one supported language
+[Languages]
+  [Languages.en]
+    weight = 1
+  [Languages.de]
+    weight = 2
+    title = "Mein cooler neuer Blog"
+    subtitle = "Hallo Welt! Dies ist der epischste Untertitel aller Zeiten."
+
+# don't change anything below
 [taxonomies]
   author   = "author"
   tag      = "tags"
@@ -84,3 +100,4 @@ disqusShortname = "bilberry-hugo-theme"
 [outputs]
   home = [ "HTML", "JSON" ]
   page = [ "HTML" ]
+

exampleSite/content/article/support-me-and-this-theme/index.de.md

@@ -0,0 +1,46 @@
+---
+title: "Unterstütze mich und dieses Theme"
+date: 2017-11-01T18:10:14+01:00
+
+tags: ['Patreon', 'Überleben', 'Einkommen', 'Support', 'Sag Danke!']
+author: "Lednerb"
+noSummary: true
+---
+Hallo zusammen!
+
+Dieses Premium Theme ist unter einer Open Source Lizenz veröffentlicht worden, sodass du dieses für deinen Blog benutzen kannst.
+
+Bisher habe ich mehr als 50 Stunden Arbeitszeit investiert, um eins der besten Themes für Hugo zu erstellen, das es bisher für Hugo gibt.
+
+Wenn dir dieses Theme gefällt (und besonders, wenn du Geld mit deinem Blog verdienst) und du es für deine Seite verwenden möchtest, überlege, ob du einen kleineren oder größeren monatlichen Beitrag zur Unterstützung der Weiterentwicklung beitragen möchtest. Nur so werde ich das Theme in der Zukunft verbessern können.
+
+Du möchtest oder kannst Patreon nicht benutzen? <br>
+Schreib mir einfach eine kurze Mail und wir finden eine Lösung:
+**<script type="text/javascript" language="javascript">
+<!--
+// Email obfuscator script 2.1 by Tim Williams, University of Arizona
+// Random encryption key feature coded by Andrew Moulden
+// This code is freeware provided these four comment lines remain intact
+// A wizard to generate this code is at http://www.jottings.com/obfuscator/
+{ coded = "[email protected]"
+  key = "chwYVt96OnuyrHsqfdCXiEKQNJD72UmoevAFkRTx4zZP0L5paGMjWgBI8S1bl3"
+  shift=coded.length
+  link=""
+  for (i=0; i<coded.length; i++) {
+    if (key.indexOf(coded.charAt(i))==-1) {
+      ltr = coded.charAt(i)
+      link += (ltr)
+    }
+    else {
+      ltr = (key.indexOf(coded.charAt(i))-shift+key.length) % key.length
+      link += (key.charAt(ltr))
+    }
+  }
+document.write("<a href='mailto:"+link+"'>"+link+"</a>")
+}
+//-->
+</script><noscript>Sorry, du musst JavaScript aktivieren, um mir zu schreiben.</noscript>**
+
+
+
+<div style="position:relative; height: 36px; overflow:hidden"><a href="https://www.patreon.com/bePatron?u=8214142" data-patreon-widget-type="become-patron-button">Become a Patron!</a><script async src="https://c6.patreon.com/becomePatronButton.bundle.js"></script></div>

exampleSite/content/article/support-me-and-this-theme.md → exampleSite/content/article/support-me-and-this-theme/index.md

@@ -2,15 +2,13 @@
 title: "Support Me and This Theme"
 date: 2017-11-01T18:10:14+01:00
 
-featuredImage: "/images/patreon.png"
-categories: []
 tags: ['Patreon', 'Survival', 'Income', 'Support', 'Say Thanks!']
 author: "Lednerb"
 noSummary: true
 ---
 Hey there!
 
-This Premium Theme is published under an open source license so you can use it for your blog. It took me more than 40 hours of work to create one of the best Hugo themes out there.
+This Premium Theme is published under an open source license so you can use it for your blog. It took me more than 50 hours of work to create one of the best Hugo themes out there.
 
 If you enjoy this theme (and especially if you make money with your blog) and want to use it for your site, please consider a small or generous monthly support towards me so I can keep up supporting and maintaining this theme in the future.
 
@@ -30,7 +28,7 @@ You don't want to use Patreon? Just write me a short mail and we'll find a solut
       ltr = coded.charAt(i)
       link += (ltr)
     }
-    else {     
+    else {
       ltr = (key.indexOf(coded.charAt(i))-shift+key.length) % key.length
       link += (key.charAt(ltr))
     }

exampleSite/content/audio/kilez-more-new-world-order.de.md

@@ -0,0 +1,18 @@
+---
+title: "Kilez More - New World Order"
+date: 2017-11-01T16:12:47+01:00
+
+featuredImage: ""
+categories: ['Musik']
+tags: ['Kilez More', 'Truth Rap']
+
+# Set your audio url for
+spotify:    "spotify:track:0qDZPJGUALZC7vSahlekhu"
+soundcloud: ""     # https://soundcloud.com/lightbooks/alchemist-08-new-world-order-snip
+tunein:     ""     # t117894382
+mixcloud:   ""     # scienceforthepeople/445-ai-ant-intelligence
+---
+
+Mit dem `audio` Post Type kann sehr einfach ein Spotify, SoundCloud, TuneIn oder Mixcloud Player integriert werden.
+
+Falls kein Player integriert werden soll, kann optional ein Titelbild mit Hilfe der `featuredImage` Option in der Markdown Datei verwendet werden.

exampleSite/content/audio/kilez-more-new-wolrd-order.md → exampleSite/content/audio/kilez-more-new-world-order.md

@@ -12,6 +12,7 @@ soundcloud: ""     # https://soundcloud.com/lightbooks/alchemist-08-new-world-or
 tunein:     ""     # t117894382
 mixcloud:   ""     # scienceforthepeople/445-ai-ant-intelligence
 ---
+
 With the `audio` post type you can easily integrate a Spotify, SoundCloud, TuneIn or Mixcloud player to your post.
 
 If you don't want to embed sound but use a header image you can set it with the `featuredImage` option in your markdown file.

exampleSite/content/gallery/my-trip-to-scotland/index.de.md

@@ -0,0 +1,21 @@
+---
+title: "Meine Reise nach Schottland"
+date: 2017-11-01T18:01:26+01:00
+
+categories: ['Reise', 'Urlaub']
+tags: ['Schottland', 'Glennfinnan Viadukt', 'Eilean Donan Castle']
+author: "Lednerb"
+---
+Im Juni 2017 habe ich mit meinem besten Freund Schottland für 2 Wochen besucht und bereist.
+Wir fuhren viel durch das schöne Land und sahen eine Reihe verschiedener Tiere: Rinder, Hirsche, Vögel, Delfine und Schafe. Überall Schafe!
+
+Auf einem schönen, kleinen Campingplatz sahen wir am frühen Morgen Rinder im Nebel und machten ein Foto. Dieses Bild hat seither den Titel "Rindviehcher im Nebel".
+
+Wir fuhren mit dem Auto durch den Eurotunnel Calais-Folkstone nach Großbritannien und fuhren die Westküste nach Norden und besuchten die Isle of Skye - eine wunderschöne Insel, die man in seinem Leben auf jeden Fall gesehen haben sollte. Dann ging es weiter Richtung Norden nach Durness, wo wir den Straßen nach Osten folgten, entlang an den Küsten und via Single-Track-Roads nach Lindisfarne.
+
+An unserem letzten Tag besuchten wir Dover Castle - eine Antike Burganlage. Die Römer bauten vor über 2000 Jahren des ersten Leuchtturm, welcher heute noch besichtigt werden kann. Dover Castle wurde auch während beiden Weltkriegen genutzt.
+
+Bester Urlaub aller Zeiten!
+
+*Ja, ich könnte ein ganzes Buch über diese fantastische Reise schreiben... <br>
+Aber hier geht's um eine Demo für das coole [__Bilberry Theme__](https://github.com/Lednerb/bilberry-hugo-theme) ;-)*

exampleSite/content/gallery/my-trip-to-scotland.md → exampleSite/content/gallery/my-trip-to-scotland/index.md

@@ -2,13 +2,6 @@
 title: "My Trip to Scotland"
 date: 2017-11-01T18:01:26+01:00
 
-gallery: [
-    '/images/scotland5.jpg',
-    '/images/scotland1.jpg',
-    '/images/scotland2.jpg',
-    '/images/scotland3.jpg',
-    '/images/scotland4.jpg',
-    ]
 categories: ['Travelling', 'Holidays']
 tags: ['Scotland', 'Glennfinnan Viaduct', 'Eilean Donan Castle']
 author: "Lednerb"

exampleSite/content/page/about-bilberry.de.md

@@ -0,0 +1,23 @@
+---
+title: "Über Bilberry"
+date: 2017-11-01T13:18:45+01:00
+author: "Lednerb"
+---
+Bilberry ist ein Premium Theme für den [Hugo Static Website Builder](https://gohugo.io).
+
+Das Theme beinhaltet viele Features wie bspw.:
+
+- Integration für die [Algolia-Suche](https://algolia.com)
+- Integration für [Disqus Kommentare](https://disqus.com)
+- Gravatar-Integration oder eigenes Profilbild im Header
+- Tastaturunterstützung für die Suche (`s` Taste drücken, etwas Schreiben, per `enter` bestätigen oder mit `esc` abbrechen)
+- Responsive Design - optimiert für Desktop und mobile Geräte
+- Volle Unterstützung für Übersetzungen (en, de, fr, ru, es bereits integriert!)
+- Volle Unterstützung für mehrsprachige Seiten
+- Verschiedene Post-Types (`article`, `audio`, `code`, `gallery`, `link`, `page`, `picture`, `quote`, `video`)
+    - Einfache Konfiguration und Erweiterung um persönliche Typen
+
+
+*Dieses Theme ist eine Adaptopn des Lingonberry Themes von [Anders Norén](http://www.andersnoren.se/teman/lingonberry-wordpress-theme/)*
+
+**[Weitere Informationen auf GitHub](https://github.com/Lednerb/bilberry-hugo-theme)**

exampleSite/content/page/about-bilberry.md

@@ -5,15 +5,17 @@ author: "Lednerb"
 excludeFromTopNav: false
 ---
 Bilberry is a premium theme for the [Hugo Static Website Builder](https://gohugo.io).
+
 It is full of little nice features, such as:
 
-- built-in integration for the wounderful [algolia search](https://algolia.com)
+- built-in integration for the wonderful [algolia search](https://algolia.com)
 - built-in integration for the powerful [disqus comments](https://disqus.com)
 - gravatar and custom image integration for the header
-- keyboard shortcut for the search (press the `s` key, type something and hit `esc`)
-- responsive design - optimized for desctop and mobile devices
+- keyboard shortcut for the search (press the `s` key, type something and hit `enter` or `esc`)
+- responsive design - optimized for desktop and mobile devices
 - full internationalization (i18n) support (en, de, fr, ru, es out of the box!)
-- custom post types (article, audio, code, gallery, link, page, picture, quote, video)
+- full mutli-language support
+- custom post types (`article`, `audio`, `code`, `gallery`, `link`, `page`, `picture`, `quote`, `video`)
     - easy configuration to add more according to your needs
 
 

exampleSite/content/page/github.de.md

@@ -0,0 +1,9 @@
+---
+title: "Github"
+date: 2017-11-01T13:17:56+01:00
+
+# set the link if you want to redirect the user.
+link: "https://github.com/Lednerb/bilberry-hugo-theme"
+# set the html target parameter if you want to change default behavior
+target: "_blank"
+---