j1-template 2023.4.5 → 2023.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b7a1b1a38a80275f8977792d77417f381f862349c9f5dd26b8d0ee73d30ef60
-  data.tar.gz: 2076111b4cd1b1b36736f91d12a7714c3ff74944c54952632d32fa745b0e8d27
+  metadata.gz: 3357c9d7d9711c56af69d9c6ee3cc05048714bed168b9454ff5451d97c754df2
+  data.tar.gz: 8fc09dac530f04af886ca684467a4f05041945bb57e0f5fd3db8a49b242ff45a
 SHA512:
-  metadata.gz: f430484895748ccb6f6a5395cefb35df1b584bc1a0d548a574bf4b83e3e99ed821c9c62fc891efb87554c50b3a62b1f610e04c8af77696c9567284409622e14b
-  data.tar.gz: bf534ebd7baeeaa2a524b1e3bb36911a3cdbc8e4cd1e3248f286175c4c211ec91aece410bdf4e36d6b62e6c38dfa1af4af1e8b492d106342ab3d2cb2b0951bd2
+  metadata.gz: 18752113f0ee6d0eb35b5b3e907b4ca941926a06d908f9db77cbc3fb5038eee917e9c0b182fecafe1a271a99f61a3f948f7fa6edc6d34fc929f13eb63a48c7ec
+  data.tar.gz: 61b9f4c6bbfb21759f6ba504bbc166433c67c8c186781105a862dc3badbf549f817c804811770677050b327333d9e77a8faf19e4d1f856e59e305c870105a7c7

data/_includes/themes/j1/layouts/layout_metadata_generator.html

@@ -55,6 +55,13 @@
     {% assign ext_js  = 'js' %}
 {% endcase %}
 
+{% if site.keywords %}
+  {% assign keywords = site.keywords  %}
+{% elsif page.keywords %}
+  {% assign keywords = page.keywords %}
+{% endif %}
+
+
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ start meta-data processing: place meta tags (taken from site config|page frontmatter) ] -->
@@ -69,7 +76,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ added keyords for backwards compatability ] -->
-<meta name="keywords" content="{{site.keywords}}">
+<meta name="keywords" content="{{keywords}}">
 
 {% if template_config.translation.enabled %}
 <!-- [INFO   ] [j1.layout.meta_data_generator.html    ] [ add google translator meta tag to enable customized translations ] -->

data/assets/themes/j1/adapter/js/analytics.js

@@ -165,7 +165,7 @@ var logText;
             // initialize state flag
             _this.setState('started');
             logger.debug('\n' + 'state: ' + _this.getState());
-            logger.info('\n' + 'module is being initialized');
+            logger.info('\n' + 'module initializing: started');
 
             // remove cookies on invalid GA config or left from a previous
             // session/page view if they exists
@@ -216,7 +216,10 @@ var logText;
               GTagOptIn.register(providerID);
               GTagOptIn.optOut();
             }
-
+            _this.setState('finished');
+            logger.debug('\n' + 'state: ' + _this.getState());
+            logger.info('\n' + 'module initializing: finished');
+            clearInterval(dependencies_met_page_ready);
             {% when "custom" %}
             // [INFO   ] [j1.adapter.analytics                    ] [ place provider: Custom Provider ]
             {% endcase %}
@@ -224,9 +227,9 @@ var logText;
           {% else %}
             logger = log4javascript.getLogger('j1.adapter.analytics');
             logger.info('\n' + 'Google Analytics: disabled');
+            clearInterval(dependencies_met_page_ready);
           {% endif %}
         }
-        clearInterval(dependencies_met_page_ready);
       }, 10);
 
       return;

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2023.4.5'
+  VERSION = '2023.5.2'
 end

data/lib/starter_web/Gemfile

@@ -75,11 +75,11 @@ end
 # Specify the THEME GEM used for the project
 
 # Loaded from RubyGems
-gem 'j1-template', '~> 2023.4.0'
+gem 'j1-template', '~> 2023.5.2'
 
 # Loaded from gem.fury.io
 #source 'https://gem.fury.io/jekyll-one-org/' do
-#  gem 'j1-template', '~> 2023.4.0'
+#  gem 'j1-template', '~> 2023.5.2'
 #end
 
 # ------------------------------------------------------------------------------

data/lib/starter_web/README.md

@@ -379,7 +379,7 @@ This command creates a **initial** project in folder **my-starter**.
   2023-02-28 18:12:12 - GENERATE: Resolving dependencies...
   2023-02-28 18:12:12 - GENERATE: Using bundler 2.3.7
   ...
-  2023-02-28 18:12:12 - GENERATE: Using j1-template 2023.4.5
+  2023-02-28 18:12:12 - GENERATE: Using j1-template 2023.5.2
   2023-02-28 18:12:12 - GENERATE: Bundle complete! 31 Gemfile dependencies, 78 gems now installed.
   2023-02-28 18:12:12 - GENERATE: Bundled gems are installed into `../../.gem`
   2023-02-28 18:12:12 - GENERATE:  C:/Users/xxx/.gem/ruby/3.1.0;C:/DevTools/Ruby31-x64/lib/ruby/gems/3.1.0;
@@ -415,7 +415,7 @@ commands are available as well.
   2023-02-28 18:17:48 - SETUP: Initialize the project ...
   2023-02-28 18:17:48 - SETUP: Be patient, this will take a while ...
   2023-02-28 18:17:49 - SETUP:
-  2023-02-28 18:17:49 - SETUP: > j1@2023.4.5 setup C:\Users\xxx\j1-projects\my-starter
+  2023-02-28 18:17:49 - SETUP: > j1@2023.5.2 setup C:\Users\xxx\j1-projects\my-starter
   2023-02-28 18:17:49 - SETUP: > npm --silent run setup-start && npm --silent run setup-base && run-s -s setup:*
   2023-02-28 18:17:49 - SETUP:
   2023-02-28 18:17:50 - SETUP: Setup project for first use ..
@@ -460,7 +460,7 @@ browser. Let's start the journey ...
   Check setup state of the J1 project ...
   2023-02-28 18:26:18 - SITE: Starting up your site ...
   2023-02-28 18:26:18 - SITE:
-  2023-02-28 18:26:18 - SITE: > j1@2023.4.5 j1-site C:\Users\jadams\j1-projects\my-starter
+  2023-02-28 18:26:18 - SITE: > j1@2023.5.2 j1-site C:\Users\jadams\j1-projects\my-starter
   2023-02-28 18:26:18 - SITE: > run-p -s j1-site:*
   2023-02-28 18:26:18 - SITE:
   2023-02-28 18:26:20 - SITE: Startup UTILSRV ..
@@ -499,7 +499,7 @@ Check setup state of the J1 project ...
 REBUILD: Rebuild the projects website ...
 REBUILD: Be patient, this will take a while ...
 2023-02-28 18:45:09 - REBUILD:
-2023-02-28 18:45:09 - REBUILD: > j1@2023.4.5 rebuild C:\Users\xxx\j1-projects\my-starter
+2023-02-28 18:45:09 - REBUILD: > j1@2023.5.2 rebuild C:\Users\xxx\j1-projects\my-starter
 2023-02-28 18:45:09 - REBUILD: > run-s -s rebuild:* && run-s -s post-rebuild:*
 2023-02-28 18:45:09 - REBUILD:
 2023-02-28 18:45:10 - REBUILD: Rebuild site incremental ..
@@ -547,7 +547,7 @@ using Lerna for all packages:
   2023-02-28 18:29:07 - RESET: Reset the project to factory state ...
   2023-02-28 18:29:07 - RESET: Be patient, this will take a while ...
   2023-02-28 18:29:08 - RESET:
-  2023-02-28 18:29:08 - RESET: > j1@2023.4.5 reset C:\Users\xxx\j1-projects\my-starter
+  2023-02-28 18:29:08 - RESET: > j1@2023.5.2 reset C:\Users\xxx\j1-projects\my-starter
   2023-02-28 18:29:08 - RESET: > run-s -s reset:*
   2023-02-28 18:29:08 - RESET:
   2023-02-28 18:29:08 - RESET: Reset project to factory state ..

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 # Sets the build version of the site
 #
-version:                                2023.4.5
+version:                                2023.5.2
 
 # copyright
 # ------------------------------------------------------------------------------
@@ -216,17 +216,18 @@ doctype:                                html
 #   default:                            false
 # ------------------------------------------------------------------------------
 #
-title:                                  Starter
-tagline:                                The Build-In Theme
+title:                                  J1 Starter
+title_extention:                        Free Template for Jekyll and Bootstrap
+
 description: >
-                                        Jekyll One Starter Theme. This template gives web developers
-                                        and hobbyists a clean implementation in Jekyll for starting
-                                        new projects and combines the best of open source software
-                                        for the Web. Jekyll One is open source and the modules packed
-                                        as well. No pain for private or professional purposes.
+                                        J1 Template gives web developers and hobbyists a clean
+                                        implementation in Jekyll for starting new projects
+                                        based on Bootstap V5. The template combines the best
+                                        software for the Web. Jekyll One is open source,
+                                        free to use, and the modules packed as well.
 keywords: >
-                                        opensource, free, j1, template, jekyll, jekyllone, web, sites,
-                                        static, jamstack
+                                        open source, free, template, jekyll, jekyllone, web,
+                                        sites, static, jamstack, bootstap
 
 # Crawling/Indexing ENABLED for default. Settings managed page-wise using
 # frontmatter defaults or by page default settings to make sure that only

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

@@ -23,14 +23,15 @@ description:
 # User configuration settings
 #
 settings:
-  enabled:                              false
-  trackingID:                           '<your-tracking-id>'
+  enabled:                              true
+  skipAllHosts:                         localhost, 127.0.0.1
+  trackingID:                           <your-tracking-id>
 
   # ----------------------------------------------------------------------------
   # Provider settings
   # ----------------------------------------------------------------------------
   google:
-    anonymizeIP:                        true
+    anonymizeIP:                        false
 
 # ------------------------------------------------------------------------------
 # END config

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

@@ -98,7 +98,7 @@ defaults:
     # --------------------------------------------------------------------------
     #
     optInOut:                           true
-    anonymizeIP:                        false
+    anonymizeIP:                        true
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/templates/feed.xml

@@ -57,7 +57,7 @@
   <id>{{ page.url | absolute_url | xml_escape }}</id>
   <post_limited>{{ limit_posts }}</post_limited>
   <template_name>J1 Theme</template_name>
-  <template_version>2023.4.5</template_version>
+  <template_version>2023.5.2</template_version>
 
   {% assign title = site.title | default: site.name %}
   {% if page.collection != "posts" %}

data/lib/starter_web/_data/templates/seo-tags.html

@@ -18,15 +18,12 @@
 
 <!-- Begin J1 SEO tags -->
 
-{% if seo_tag.title? %}
-  <title>{{ seo_tag.title }}</title>
-{% endif %}
-
 <meta name="generator" content="Jekyll v{{ jekyll.version }}">
 <meta name="builder" content="J1 Template v{{ site.version }}">
 
-{% if seo_tag.page_title %}
-  <meta property="og:title" content="{{ seo_tag.page_title }}">
+{% if seo_tag.title? %}
+  <title>{{ seo_tag.title }}</title>
+  <meta property="og:title" content="{{ seo_tag.title }}">
 {% endif %}
 
 {% if seo_tag.author.name %}

data/lib/starter_web/_data/templates/sitemap.xml

@@ -18,6 +18,8 @@
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
+{% assign time_now = site.time | date_to_xmlschema %}
+
 {% comment %} main
 -------------------------------------------------------------------------------- {% endcomment %}
 <?xml version="1.0" encoding="UTF-8"?>
@@ -31,8 +33,8 @@
     {% for doc in docs %}
       <url>
         <loc>{{ doc.url | replace:'/index.html','/' | absolute_url | xml_escape }}</loc>
-        {% if doc.last_modified_at or doc.date %}
-          <lastmod>{{ doc.last_modified_at | default: doc.date | date_to_xmlschema }}</lastmod>
+        {% if time_now or doc.last_modified %}
+          <lastmod>{{ doc.last_modified | default: time_now | date_to_xmlschema }}</lastmod>
         {% endif %}
       </url>
     {% endfor %}
@@ -42,8 +44,8 @@
   {% for page in pages %}
     <url>
       <loc>{{ page.url | replace:'/index.html','/' | absolute_url | xml_escape }}</loc>
-      {% if page.last_modified_at %}
-        <lastmod>{{ page.last_modified_at | date_to_xmlschema }}</lastmod>
+      {% if time_now or page.last_modified %}
+        <lastmod>{{ doc.last_modified | default: time_now | date_to_xmlschema }}</lastmod>
       {% endif %}
     </url>
   {% endfor %}
@@ -52,7 +54,7 @@
   {% for file in static_files %}
     <url>
       <loc>{{ file.path | replace:'/index.html','/' | absolute_url | xml_escape }}</loc>
-      <lastmod>{{ file.modified_time | date_to_xmlschema }}</lastmod>
+      <lastmod>{{ doc.last_modified | default: time_now | date_to_xmlschema }}</lastmod>
     </url>
   {% endfor %}
 </urlset>

data/lib/starter_web/_plugins/index/lunr.rb

@@ -391,6 +391,6 @@ end
 
 module Jekyll
   module J1LunrSearch
-    VERSION = '2023.4.5'
+    VERSION = '2023.5.2'
   end
 end

data/lib/starter_web/_plugins/seo/j1-seo-tags.rb

@@ -275,7 +275,7 @@ module Jekyll
     class Drop < Jekyll::Drops::Drop
       include Jekyll::SeoTag::UrlHelper
 
-      TITLE_SEPARATOR = " | "
+      TITLE_SEPARATOR = " - "
       FORMAT_STRING_METHODS = [
         :markdownify, :strip_html, :normalize_whitespace, :escape_once,
       ].freeze
@@ -304,41 +304,41 @@ module Jekyll
       end
 
       def site_title
-        @site_title ||= format_string(site["title"] || site["name"])
+        @site_title ||= format_string site["title"]
       end
 
-      def site_tagline
-        @site_tagline ||= format_string site["tagline"]
+      # Page title without site title or description appended
+      def page_title
+        @page_title ||= format_string page["title"]                            # || site_title
       end
 
-      def site_description
-        @site_description ||= format_string site["description"]
+      def site_title_extention
+        @site_title_extention ||= format_string site["title_extention"]
       end
 
-      # Page title without site title or description appended
-      def page_title
-        @page_title ||= format_string(page["title"]) || site_title
+      def page_title_extention
+        @site_title_extention ||= format_string page["title_extention"]
       end
 
-      def site_tagline_or_description
-        site_tagline || site_description
+      def site_description
+        @site_description ||= format_string site["description"]
+      end
+
+      def title_extention_or_description
+        page_title_extention || site_title_extention || site_description
       end
 
       # Page title with site title or description appended
       # rubocop:disable Metrics/CyclomaticComplexity
       def title
         @title ||= begin
-          if site_title && page_title != site_title
-            page_title + TITLE_SEPARATOR + site_title
-          elsif site_description && site_title
-            site_title + TITLE_SEPARATOR + site_tagline_or_description
+          if page_title != site_title
+            page_title + TITLE_SEPARATOR + title_extention_or_description
           else
-            page_title || site_title
+            site_title + TITLE_SEPARATOR + title_extention_or_description
           end
         end
 
-        return page_number + @title if page_number
-
         @title
       end
       # rubocop:enable Metrics/CyclomaticComplexity

data/lib/starter_web/index.html

@@ -2,18 +2,21 @@
 layout:                                 home
 compress:                               true
 
-title:                                  Starter
+title:                                  J1 Starter
 tagline:                                The Build-In Theme
+
 date:                                   2023-01-01 00:00:00
-last_modified:                          2023-07-18 00:00:00
+#last_modified:                         2023-07-18 00:00:00
+
 description: >
-                                        The Jekyll One Starter theme gives web developers and
-                                        hobbyists a clean implementation in Jekyll for starting
-                                        new projects and combines the best of open source software
-                                        for the Web. Jekyll One is open source and the modules packed
-                                        as well. No pain for private or professional purposes.
+                                        J1 Template gives web developers and hobbyists a clean
+                                        implementation in Jekyll for starting new projects
+                                        based on Bootstap V5. The template combines the best
+                                        software for the Web. Jekyll One is open source,
+                                        free to use, and the modules packed as well.
 keywords: >
-                                        Jekyll, Jekyll, JekyllOne, Theme, Template, Ruby, Gem
+                                        open source, free, template, jekyll, jekyllone, web,
+                                        sites, static, jamstack
 
 categories:                             [ Site ]
 tags:                                   [ Home ]

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1",
-  "version": "2023.4.5",
+  "version": "2023.5.2",
   "description": "J1 Theme Starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/pages/public/learn/where_to_go.adoc

@@ -1,12 +1,11 @@
 ---
 title:                                  Where to go
 tagline:                                Fasten Your Way
+
 date:                                   2023-01-01
 #last_modified:                         2023-01-01
 
 description: >
-                                        J1 Template is a Bootstrap V5 website template for the static
-                                        site generator Jekyll.
                                         Welcome to the info pages of J1 Template. A good decision
                                         to get on that page first. Certainly, there is no better
                                         place to learn what J1 Template can do and what pages are

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2023.4.5",
+  "version": "2023.5.2",
   "description": "J1 Theme Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2023.4.5",
+  "version": "2023.5.2",
   "description": "J1 Theme Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2023.4.5
+  version: 2023.5.2
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-16 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll