j1-template 2021.1.11 → 2021.1.16

data/lib/starter_web/_data/modules/defaults/cookieconsent.yml

@@ -27,7 +27,6 @@ defaults:
   enabled:                              false
 
   autoShowDialog:                       true                                    # show consent dialog if NO consent cookie found
-  language:                             en                                      # language of the modal is shown. Default: navigator.language
   languages:                            [en, de]                                # supported languages, defaults to FIRST language defined by languages
   contentURL:                           /assets/data/cookieconsent              # dialogs content for all languages
   cookieName:                           j1.user.consent                         # name of the consent cookie
@@ -35,6 +34,7 @@ defaults:
   postSelectionCallback:                j1.adapter.cookieConsent.cbCookie       # currently hardcoded
 
   reloadPageOnChange:                   false                                   # reload current page if user settings has been changed
+  sameSite:                             Strict                                  # restrict consent cookie to first-party, do NOT send cookie to other domains
   xhr_data_element:                     consent-data                            # container for the language-specific consent modal (taken from /assets/data/cookieconsent.html)
   whitelisted:                          [ /pages/public/legal/en/privacy ]      # pages NO consent issued, currently NOT supported
 
@@ -101,10 +101,11 @@ defaults:
                                         This website does <b>not</b> transfer any personal data to GA. Implicit
                                         personal information, like IP addresses, is anonymized to protect your privacy.
                                         <br><br>
-                                        <code>Personalization</code> is used e.g. to collect user feedback or running
-                                        advertising campaigns to provide you a website free of charge. Partners like
-                                        Disqus or Google enables us to provide you excellent personalized services and
-                                        enables us to finance the costs for running this site.
+                                        <code>Personalization</code> is used e.g. to provide personal themes, collect
+                                        visitors feedback or running advertising campaigns to provide you a website
+                                        free of charge. Partners like Bootswatch, Disqus or Google enables us to provide
+                                        you excellent personalized services and enables us to finance the costs for
+                                        running this site.
     de: >
                                         Die Betreiber dieser Website nehmen den Schutz Ihrer persönlichen Daten ernst.
                                         Wir behandeln Ihre Daten vertraulich und halten uns zum Schutz Ihrer Privatsphäre
@@ -126,11 +127,11 @@ defaults:
                                         übermittelt keine personenbezogenen Daten an GA. Implizite personenbezogene Daten wie
                                         IP-Adressen werden zum Schutz Ihrer Privatsphäre anonymisiert.
                                         <br><br>
-                                        <code>Personalisierung</code> wird z.B. um Benutzerfeedback zu sammeln oder
-                                        Werbekampagnen durchzuführen, um Ihnen eine Website kostenlos zur Verfügung zu
-                                        stellen. Partner wie Disqus oder Google ermöglichen es uns, Ihnen exzellente
-                                        personalisierte Dienste anzubieten und die Kosten für den Betrieb dieser Website
-                                        zu finanzieren.
+                                        <code>Personalisierung</code> wird eingesetzt um Ihnen z.B. personalierte Ansichten der
+                                        Webseite (Themen) anzubieten, Benutzerfeedback zu sammeln oder Werbekampagnen durchzuführen,
+                                        um Ihnen diese Website kostenlos zur Verfügung zu stellen. Partner wie Bootswatch, Disqus
+                                        oder Google ermöglichen es uns, Ihnen exzellente personalisierte Dienste anzubieten sowie
+                                        die Kosten für den Betrieb dieser Website zu finanzieren.
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/modules/defaults/themer.yml

@@ -144,6 +144,7 @@ defaults:
 
   enabled:                              false
 
+  reloadPageOnChange:                   false                                   # reload current page, if theme has been changed
   retries:                              30                                      # retry to load theme list from API
   saveToCookie:                         true
   debug:                                false

data/lib/starter_web/_data/modules/themer.yml

@@ -27,6 +27,7 @@ about_config:
 settings:
 
   enabled:                              true
+
   saveToCookie:                         true
   debug:                                false
 

data/lib/starter_web/_data/plugins/defaults/paginator.yml

@@ -35,7 +35,7 @@ about_config:
 # ------------------------------------------------------------------------------
 # User configuration settings
 #
-settings:
+defaults:
 
   # ----------------------------------------------------------------------------
   # GENERAL paginator settings
@@ -58,17 +58,18 @@ settings:
   pagination:
     enabled:                            false
 
-    title:                              :title
+    debug:                              false
+    title:                              :title - page :num
     rebuild:                            true                                    # currently NOT used
 
     permalink:                          /page:num/
-    per_page:                           4
+    per_page:                           10
     limit:                              0
     sort_field:                         date
-    sort_reverse:                       true
+    sort_reverse:                       false
     trail:
-      before:                           2
-      after:                            2
+      before:                           0
+      after:                            0
 
   # AUTOPAGE settings
   #

data/lib/starter_web/_data/plugins/paginator.yml

@@ -43,6 +43,9 @@ settings:
   pagination:
     enabled:                            true
     rebuild:                            false                                   # currently NOT used
+    per_page:                           4
+    sort_reverse:                       true
+    title:                              :title
 
   # AUTOPAGE settings
   #

data/lib/starter_web/_includes/attributes.asciidoc

@@ -412,7 +412,7 @@ end::tables[]
 // -----------------------------------------------------------------------------
 tag::products[]
 :j1--license:                                     MIT License
-:j1--version:                                     2021.1.11
+:j1--version:                                     2021.1.16
 :j1--site-name:                                   Jekyll One
 end::products[]
 

data/lib/starter_web/_plugins/date-i18n.rb

@@ -0,0 +1,67 @@
+# Taken from https://github.com/uwolf/jekyll-i18n-date
+
+# ------------------------------------------------------------------------------
+# ~/_plugins/date-i18n.rb
+# Plugin for DateTime Localization in Jekyll
+#
+# Product/Info:
+# http://jekyll.one
+#
+# Copyright (C) 2021 Juergen Adams
+# Copyright (c) 2018 Ulrich Wolf
+#
+# J1 Template is licensed under the MIT License.
+# See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+# jekyll-i18n-date is licensed under the MIT License.
+# See: https://github.com/uwolf/jekyll-i18n-date/blob/master/LICENSE
+# ------------------------------------------------------------------------------
+# Example|s:
+#  {{ page.date | localize: "%d.%m.%Y" }}
+#  {{ post.date | localize: "%d.%m.%Y", "de" }}
+# ------------------------------------------------------------------------------
+require 'i18n'
+
+module Jekyll
+  # i18n filter for jekyll
+  module I18nFilter
+    # Example:
+    #   {{ post.date | localize: "%d.%m.%Y" }}
+    #   {{ post.date | localize: ":short" }}
+    def localize(input, format = nil, locale = nil)
+
+			# Side effects: changes I18n.config, must run before current_locale is set
+      load_translations
+
+			input = Time.at(input) if input.class == Integer
+
+      format = format =~ /^:(\w+)/ ? Regexp.last_match(1).to_sym : format
+
+			if input && locale = current_locale(locale)
+
+				I18n.locale = locale
+				I18n.l(input, format: format)
+			else
+				input
+			end
+		end
+
+    def load_translations
+      return false unless I18n.backend.send(:translations).empty?
+      filename = File.join(File.dirname(__FILE__), '../_data/locales/*.yml')
+			I18n.backend.load_translations Dir[filename]
+    end
+
+		def current_locale(locale)
+			l = locale || @context.registers[:page]['language'] || @context.registers[:site].config['language']
+
+			if l && I18n.config.available_locales.include?(l.to_sym)
+				l
+			else
+				false
+			end
+		end
+
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::I18nFilter)

data/lib/starter_web/_plugins/lunr_index.rb

@@ -360,6 +360,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2021.1.11'
+    VERSION = '2021.1.16'
   end
 end

data/lib/starter_web/collections/posts/public/featured/_posts/2020-01-01-about-cookies.adoc

@@ -2,7 +2,7 @@
 title:                                  Cookies
 tagline:                                good to know
 
-categories:                             [ Featured, Post ]
+categories:                             [ Knowledge ]
 tags:                                   [ Cookies ]
 
 image:                                  /assets/images/modules/attics/cookies-1920x1200.jpg

data/lib/starter_web/collections/posts/public/featured/_posts/2021-03-01-site-generators.adoc

@@ -2,7 +2,7 @@
 title:                                  Site Generators
 tagline:                                top open source tools
 
-categories:                             [ Featured, Post ]
+categories:                             [ Knowledge ]
 tags:                                   [ Jekyll, Generators ]
 
 image:                                  /assets/images/modules/attics/machine-generator-1920x1280.jpg

data/lib/starter_web/collections/posts/public/featured/_posts/2021-03-03-about-j1.adoc

@@ -2,7 +2,7 @@
 title:                                  J1 Template
 tagline:                                first version is out
 
-categories:                             [ Featured, Post ]
+categories:                             [ Knowledge ]
 tags:                                   [ J1, Template ]
 
 image:                                  /assets/images/modules/attics/runner-1920x1200.jpg

data/lib/starter_web/collections/posts/public/series/_posts/2020-01-01-post-test-series.adoc

@@ -2,8 +2,8 @@
 title:                                  Test Post 1
 tagline:                                testing series elements
 
-categories:                             [ Series ]
-tags:                                   [ Post, Test ]
+categories:                             [ Examples ]
+tags:                                   [ Series, Test ]
 
 series:                                 test-series
 

data/lib/starter_web/collections/posts/public/series/_posts/2020-01-02-post-test-series.adoc

@@ -2,8 +2,8 @@
 title:                                  Test Post 2
 tagline:                                testing series elements
 
-categories:                             [ Series ]
-tags:                                   [ Post, Test ]
+categories:                             [ Examples ]
+tags:                                   [ Series, Test ]
 
 series:                                 test-series
 

data/lib/starter_web/collections/posts/public/series/_posts/2020-01-03-post-test-series.adoc

@@ -2,8 +2,8 @@
 title:                                  Test Post 3
 tagline:                                testing series elements
 
-categories:                             [ Series ]
-tags:                                   [ Post, Test ]
+categories:                             [ Examples ]
+tags:                                   [ Series, Test ]
 
 series:                                 test-series
 

data/lib/starter_web/collections/posts/public/series/_posts/2020-01-04-post-test-series.adoc

@@ -2,8 +2,8 @@
 title:                                  Test Post 4
 tagline:                                testing series elements
 
-categories:                             [ Series ]
-tags:                                   [ Post, Test ]
+categories:                             [ Examples ]
+tags:                                   [ Series, Test ]
 
 series:                                 test-series
 

data/lib/starter_web/collections/posts/public/wikipedia/_posts/2016-11-20-minneapolis.adoc

@@ -3,7 +3,7 @@ title:                                  Minneapolis
 tagline:                                largest city in the state of minnesota
 
 categories:                             [ Wikipedia ]
-tags:                                   [ USA, Minnesota, City, Minneapolis ]
+tags:                                   [ USA, Minnesota, Cities, Minneapolis ]
 
 image:                                  /assets/images/collections/blog/wikipedia/minneapolis.1200x400.jpg
 

data/lib/starter_web/collections/posts/public/wikipedia/_posts/2016-11-24-narcisse-snake-dens.adoc

@@ -3,7 +3,7 @@ title:                                  Narcisse Snake Dens
 tagline:                                largest snake population
 
 categories:                             [ Wikipedia ]
-tags:                                   [ Canada, Cities ]
+tags:                                   [ Canada, Cities, Narcisse ]
 
 image:                                  /assets/images/collections/blog/wikipedia/narcise-snake-pits.1200x400.jpg
 

data/lib/starter_web/index.html

@@ -18,9 +18,9 @@ robots:
   index:                                true
   follow:                               true
 
-# analytics:                            false
-# advertising:                          false
-# comments:                             false
+analytics:                              true
+advertising:                            false
+comments:                               false
 
 fam_menu_id:                            default
 scrollbar:                              false

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2021.1.11",
+  "version": "2021.1.16",
   "description": "J1 Template Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/pages/public/asciidoc_skeletons/book/book.adoc

@@ -14,6 +14,9 @@ categories:                             [ Asciidoc, Skeleton ]
 tags:                                   [ Knowledge, Skeleton, Book ]
 
 sitemap:                                false
+advertising:                            false
+comments:                               false
+
 robots:
   index:                                false
   follow:                               false

data/lib/starter_web/pages/public/asciidoc_skeletons/multi-document/multi.adoc

@@ -13,6 +13,9 @@ categories:                             [ Asciidoc, Skeleton ]
 tags:                                   [ Knowledge, Skeleton, Document ]
 
 sitemap:                                false
+advertising:                            false
+comments:                               false
+
 robots:
   index:                                false
   follow:                               false

data/lib/starter_web/pages/public/asciidoc_skeletons/simple-document/simple.adoc

@@ -12,6 +12,9 @@ categories:                             [ Asciidoc, Skeleton ]
 tags:                                   [ Knowledge, Skeleton, Document ]
 
 sitemap:                                false
+advertising:                            false
+comments:                               false
+
 robots:
   index:                                false
   follow:                               false

data/lib/starter_web/pages/public/blog/navigator/archive.html

@@ -15,6 +15,10 @@ pagination:
   enabled:                              false
   permalink:                            /page:num/
 
+analytics:                              true
+advertising:                            false
+comments:                               false
+
 regenerate:                             true
 
 resources:                              []
@@ -39,12 +43,26 @@ resource_options:
 {% capture select_icon_size %}themes/{{site.template.name}}/procedures/global/select_icon_size.proc{% endcapture %}
 {% capture get_category_item %}themes/{{site.template.name}}/procedures/global/get_category_item.proc{% endcapture %}
 
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config               = site.data.j1_config %}
+{% assign blocks                        = site.data.blocks %}
+{% assign modules                       = site.data.modules %}
+{% assign builder                       = site.data.builder %}
+{% assign plugins                       = site.data.plugins %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign blog_navigator_defaults       = builder.defaults.blog_navigator.defaults %}
+{% assign blog_navigator_settings       = builder.blog_navigator.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign blog_navigator_options        = blog_navigator_defaults | merge: blog_navigator_settings %}
+
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign view_config         = site.data.builder.blog_navigator.archive_view %}
-{% assign truncate_words      = site.excerpt_truncate_words %}
-{% assign view_description    = view_config.description %}
-{% assign defaults            = site.data.builder.blog_navigator.defaults %}
+{% assign truncate_words                = site.excerpt_truncate_words %}
 
 {% if site.permalink == 'none' %}
   {% capture browser_page_url %}{{page.url}}.html{% endcapture %}
@@ -61,22 +79,67 @@ resource_options:
 {% capture tag_view %}{{page_path}}/archive/tagview/{% endcapture %}
 {% capture all_view %}{{page_path}}/{% endcapture %}
 
+{% comment %} language detection
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if site.language == "en" %}
+  {% assign language = "en" %}
+{% elsif site.language == "de"%}
+  {% assign language = "de" %}
+{% else %}
+  {% assign language = "en" %}
+{% endif %}
+
+{% if language == "en" %}
+  {% assign readmore_text               = "read" %}
+
+  {% assign category_view_button_text   = blog_navigator_options.button_text.view_selector.category_view.en %}
+  {% assign date_view_button_text       = blog_navigator_options.button_text.view_selector.date_view.en %}
+  {% assign archive_view_button_text    = blog_navigator_options.button_text.view_selector.archive_view.en %}
+  {% assign tag_view_button_text        = blog_navigator_options.button_text.view_selector.tag_view.en %}
+
+  {% assign view_headline               = blog_navigator_options.archive_view.page_text.en.headline %}
+  {% assign view_description_text       = blog_navigator_options.archive_view.page_text.en.description %}
+{% endif %}
+
+{% if language == "de" %}
+  {% assign readmore_text               = "lesen" %}
+
+  {% assign category_view_button_text   = blog_navigator_options.button_text.view_selector.category_view.de %}
+  {% assign date_view_button_text       = blog_navigator_options.button_text.view_selector.date_view.de %}
+  {% assign archive_view_button_text    = blog_navigator_options.button_text.view_selector.archive_view.de %}
+  {% assign tag_view_button_text        = blog_navigator_options.button_text.view_selector.tag_view.de %}
+
+  {% assign view_headline               = blog_navigator_options.archive_view.page_text.de.headline %}
+  {% assign view_description_text       = blog_navigator_options.archive_view.page_text.de.description %}
+{% endif %}
+
+{% comment %} Debugging
+--------------------------------------------------------------------------------
+skip_categories:            {{skip_categories | debug}}
+site_category_word_list:    {{site_category_word_list | debug}}
+--------------------------------------------------------------------------------
+{% endcomment %}
+
+
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [ {{page.url}} ] [Generate HTML}] -->
 <div class="paginator ml-3">
   <ul class="pagination raised-z0">
-    <li class="page-item"><a class="page-link" href="{{navigator     | prepend: site.baseurl}}" title="Blog View">Navigator</a></li>
-    <li class="page-item"><a class="page-link" href="{{category_view | prepend: site.baseurl}}" title="View by Category">By Category</a></li>
-    <!-- li class="page-item"><a class="page-link" href="{{tag_view      | prepend: site.baseurl}}" title="View by Tag">By Tag</a></li -->
-    <li class="page-item"><a class="page-link" href="{{date_view     | prepend: site.baseurl}}" title="View All">By Date</a></li>
+    <li class="page-item"><a class="page-link" href="{{navigator | prepend: site.baseurl}}" alt="Blog View">Navigator</a></li>
+    <li class="page-item"><a class="page-link" href="{{category_view|prepend: site.baseurl}}" alt="View by Category">{{category_view_button_text}}</a></li>
+    <li class="page-item"><a class="page-link" href="{{date_view}}" alt="View by Date">{{date_view_button_text}}</a></li>
+    <!-- li class="page-item"><a class="page-link" href="{{tag_view}}" alt="{{tag_view_button_text}}">By Tag</a></li -->
   </ul>
 </div>
 
 <div id="index" class="post-search-results ml-3">
-  <div class="view-description">{{view_description}}</div>
+  {% if blog_navigator_options.archive_view.page_text.enabled %}
+  <div class="view-description">{{view_description_text}}</div>
+  {% endif %}
+
   <div class="post-headline">
-    <h2 id="post-headline" class="mt-5">All Posts</h2>
+    <h2 id="post-headline" class="mt-5">{{view_headline}}</h2>
   </div>
 
   <!-- ul class="list-unstyled link-news" -->
@@ -113,7 +176,12 @@ resource_options:
             <div class="card-footer-text">
               <hr class="my-3">
               {% if post.date %}
-              <i class="mdi mdi-calendar-blank mr-1"></i> {{post.date | date: "%Y %B, %e"}}
+                {% if language == "en" %}
+                  <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%Y %B, %e"}}
+                {% endif %}
+                {% if language == "de" %}
+                  <i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i>{{post.date | localize: "%-d. %B %Y"}}
+                {% endif %}
               {% endif %}
               {% if likes_count %}
               <span class="font-weight-bold"> · </span>
@@ -126,7 +194,7 @@ resource_options:
             </div>
             <a class="card-link text-muted text-lowercase"
                href="{{post.url}}#readmore">
-               Read · {{post.tagline}}
+               {{readmore_text}} · {{post.tagline}}
             </a>
           </div>
         </div>