j1-template 2023.4.5 → 2023.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/_includes/themes/j1/layouts/layout_metadata_generator.html +8 -1
- data/assets/themes/j1/adapter/js/analytics.js +6 -3
- data/lib/j1/version.rb +1 -1
- data/lib/starter_web/Gemfile +2 -2
- data/lib/starter_web/README.md +5 -5
- data/lib/starter_web/_config.yml +11 -10
- data/lib/starter_web/_data/modules/analytics.yml +4 -3
- data/lib/starter_web/_data/modules/defaults/analytics.yml +1 -1
- data/lib/starter_web/_data/templates/feed.xml +1 -1
- data/lib/starter_web/_data/templates/seo-tags.html +3 -6
- data/lib/starter_web/_data/templates/sitemap.xml +7 -5
- data/lib/starter_web/_plugins/index/lunr.rb +1 -1
- data/lib/starter_web/_plugins/seo/j1-seo-tags.rb +18 -18
- data/lib/starter_web/index.html +11 -8
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/pages/public/learn/where_to_go.adoc +1 -2
- data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
- data/lib/starter_web/utilsrv/package.json +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3357c9d7d9711c56af69d9c6ee3cc05048714bed168b9454ff5451d97c754df2
|
4
|
+
data.tar.gz: 8fc09dac530f04af886ca684467a4f05041945bb57e0f5fd3db8a49b242ff45a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 18752113f0ee6d0eb35b5b3e907b4ca941926a06d908f9db77cbc3fb5038eee917e9c0b182fecafe1a271a99f61a3f948f7fa6edc6d34fc929f13eb63a48c7ec
|
7
|
+
data.tar.gz: 61b9f4c6bbfb21759f6ba504bbc166433c67c8c186781105a862dc3badbf549f817c804811770677050b327333d9e77a8faf19e4d1f856e59e305c870105a7c7
|
@@ -55,6 +55,13 @@
|
|
55
55
|
{% assign ext_js = 'js' %}
|
56
56
|
{% endcase %}
|
57
57
|
|
58
|
+
{% if site.keywords %}
|
59
|
+
{% assign keywords = site.keywords %}
|
60
|
+
{% elsif page.keywords %}
|
61
|
+
{% assign keywords = page.keywords %}
|
62
|
+
{% endif %}
|
63
|
+
|
64
|
+
|
58
65
|
{% comment %} Main
|
59
66
|
-------------------------------------------------------------------------------- {% endcomment %}
|
60
67
|
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [ start meta-data processing: place meta tags (taken from site config|page frontmatter) ] -->
|
@@ -69,7 +76,7 @@
|
|
69
76
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
70
77
|
|
71
78
|
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [ added keyords for backwards compatability ] -->
|
72
|
-
<meta name="keywords" content="{{
|
79
|
+
<meta name="keywords" content="{{keywords}}">
|
73
80
|
|
74
81
|
{% if template_config.translation.enabled %}
|
75
82
|
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [ add google translator meta tag to enable customized translations ] -->
|
@@ -165,7 +165,7 @@ var logText;
|
|
165
165
|
// initialize state flag
|
166
166
|
_this.setState('started');
|
167
167
|
logger.debug('\n' + 'state: ' + _this.getState());
|
168
|
-
logger.info('\n' + 'module
|
168
|
+
logger.info('\n' + 'module initializing: started');
|
169
169
|
|
170
170
|
// remove cookies on invalid GA config or left from a previous
|
171
171
|
// session/page view if they exists
|
@@ -216,7 +216,10 @@ var logText;
|
|
216
216
|
GTagOptIn.register(providerID);
|
217
217
|
GTagOptIn.optOut();
|
218
218
|
}
|
219
|
-
|
219
|
+
_this.setState('finished');
|
220
|
+
logger.debug('\n' + 'state: ' + _this.getState());
|
221
|
+
logger.info('\n' + 'module initializing: finished');
|
222
|
+
clearInterval(dependencies_met_page_ready);
|
220
223
|
{% when "custom" %}
|
221
224
|
// [INFO ] [j1.adapter.analytics ] [ place provider: Custom Provider ]
|
222
225
|
{% endcase %}
|
@@ -224,9 +227,9 @@ var logText;
|
|
224
227
|
{% else %}
|
225
228
|
logger = log4javascript.getLogger('j1.adapter.analytics');
|
226
229
|
logger.info('\n' + 'Google Analytics: disabled');
|
230
|
+
clearInterval(dependencies_met_page_ready);
|
227
231
|
{% endif %}
|
228
232
|
}
|
229
|
-
clearInterval(dependencies_met_page_ready);
|
230
233
|
}, 10);
|
231
234
|
|
232
235
|
return;
|
data/lib/j1/version.rb
CHANGED
data/lib/starter_web/Gemfile
CHANGED
@@ -75,11 +75,11 @@ end
|
|
75
75
|
# Specify the THEME GEM used for the project
|
76
76
|
|
77
77
|
# Loaded from RubyGems
|
78
|
-
gem 'j1-template', '~> 2023.
|
78
|
+
gem 'j1-template', '~> 2023.5.2'
|
79
79
|
|
80
80
|
# Loaded from gem.fury.io
|
81
81
|
#source 'https://gem.fury.io/jekyll-one-org/' do
|
82
|
-
# gem 'j1-template', '~> 2023.
|
82
|
+
# gem 'j1-template', '~> 2023.5.2'
|
83
83
|
#end
|
84
84
|
|
85
85
|
# ------------------------------------------------------------------------------
|
data/lib/starter_web/README.md
CHANGED
@@ -379,7 +379,7 @@ This command creates a **initial** project in folder **my-starter**.
|
|
379
379
|
2023-02-28 18:12:12 - GENERATE: Resolving dependencies...
|
380
380
|
2023-02-28 18:12:12 - GENERATE: Using bundler 2.3.7
|
381
381
|
...
|
382
|
-
2023-02-28 18:12:12 - GENERATE: Using j1-template 2023.
|
382
|
+
2023-02-28 18:12:12 - GENERATE: Using j1-template 2023.5.2
|
383
383
|
2023-02-28 18:12:12 - GENERATE: Bundle complete! 31 Gemfile dependencies, 78 gems now installed.
|
384
384
|
2023-02-28 18:12:12 - GENERATE: Bundled gems are installed into `../../.gem`
|
385
385
|
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.
|
|
415
415
|
2023-02-28 18:17:48 - SETUP: Initialize the project ...
|
416
416
|
2023-02-28 18:17:48 - SETUP: Be patient, this will take a while ...
|
417
417
|
2023-02-28 18:17:49 - SETUP:
|
418
|
-
2023-02-28 18:17:49 - SETUP: > j1@2023.
|
418
|
+
2023-02-28 18:17:49 - SETUP: > j1@2023.5.2 setup C:\Users\xxx\j1-projects\my-starter
|
419
419
|
2023-02-28 18:17:49 - SETUP: > npm --silent run setup-start && npm --silent run setup-base && run-s -s setup:*
|
420
420
|
2023-02-28 18:17:49 - SETUP:
|
421
421
|
2023-02-28 18:17:50 - SETUP: Setup project for first use ..
|
@@ -460,7 +460,7 @@ browser. Let's start the journey ...
|
|
460
460
|
Check setup state of the J1 project ...
|
461
461
|
2023-02-28 18:26:18 - SITE: Starting up your site ...
|
462
462
|
2023-02-28 18:26:18 - SITE:
|
463
|
-
2023-02-28 18:26:18 - SITE: > j1@2023.
|
463
|
+
2023-02-28 18:26:18 - SITE: > j1@2023.5.2 j1-site C:\Users\jadams\j1-projects\my-starter
|
464
464
|
2023-02-28 18:26:18 - SITE: > run-p -s j1-site:*
|
465
465
|
2023-02-28 18:26:18 - SITE:
|
466
466
|
2023-02-28 18:26:20 - SITE: Startup UTILSRV ..
|
@@ -499,7 +499,7 @@ Check setup state of the J1 project ...
|
|
499
499
|
REBUILD: Rebuild the projects website ...
|
500
500
|
REBUILD: Be patient, this will take a while ...
|
501
501
|
2023-02-28 18:45:09 - REBUILD:
|
502
|
-
2023-02-28 18:45:09 - REBUILD: > j1@2023.
|
502
|
+
2023-02-28 18:45:09 - REBUILD: > j1@2023.5.2 rebuild C:\Users\xxx\j1-projects\my-starter
|
503
503
|
2023-02-28 18:45:09 - REBUILD: > run-s -s rebuild:* && run-s -s post-rebuild:*
|
504
504
|
2023-02-28 18:45:09 - REBUILD:
|
505
505
|
2023-02-28 18:45:10 - REBUILD: Rebuild site incremental ..
|
@@ -547,7 +547,7 @@ using Lerna for all packages:
|
|
547
547
|
2023-02-28 18:29:07 - RESET: Reset the project to factory state ...
|
548
548
|
2023-02-28 18:29:07 - RESET: Be patient, this will take a while ...
|
549
549
|
2023-02-28 18:29:08 - RESET:
|
550
|
-
2023-02-28 18:29:08 - RESET: > j1@2023.
|
550
|
+
2023-02-28 18:29:08 - RESET: > j1@2023.5.2 reset C:\Users\xxx\j1-projects\my-starter
|
551
551
|
2023-02-28 18:29:08 - RESET: > run-s -s reset:*
|
552
552
|
2023-02-28 18:29:08 - RESET:
|
553
553
|
2023-02-28 18:29:08 - RESET: Reset project to factory state ..
|
data/lib/starter_web/_config.yml
CHANGED
@@ -53,7 +53,7 @@ environment: development
|
|
53
53
|
# ------------------------------------------------------------------------------
|
54
54
|
# Sets the build version of the site
|
55
55
|
#
|
56
|
-
version: 2023.
|
56
|
+
version: 2023.5.2
|
57
57
|
|
58
58
|
# copyright
|
59
59
|
# ------------------------------------------------------------------------------
|
@@ -216,17 +216,18 @@ doctype: html
|
|
216
216
|
# default: false
|
217
217
|
# ------------------------------------------------------------------------------
|
218
218
|
#
|
219
|
-
title: Starter
|
220
|
-
|
219
|
+
title: J1 Starter
|
220
|
+
title_extention: Free Template for Jekyll and Bootstrap
|
221
|
+
|
221
222
|
description: >
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
for the Web. Jekyll One is open source
|
226
|
-
|
223
|
+
J1 Template gives web developers and hobbyists a clean
|
224
|
+
implementation in Jekyll for starting new projects
|
225
|
+
based on Bootstap V5. The template combines the best
|
226
|
+
software for the Web. Jekyll One is open source,
|
227
|
+
free to use, and the modules packed as well.
|
227
228
|
keywords: >
|
228
|
-
|
229
|
-
static, jamstack
|
229
|
+
open source, free, template, jekyll, jekyllone, web,
|
230
|
+
sites, static, jamstack, bootstap
|
230
231
|
|
231
232
|
# Crawling/Indexing ENABLED for default. Settings managed page-wise using
|
232
233
|
# frontmatter defaults or by page default settings to make sure that only
|
@@ -23,14 +23,15 @@ description:
|
|
23
23
|
# User configuration settings
|
24
24
|
#
|
25
25
|
settings:
|
26
|
-
enabled:
|
27
|
-
|
26
|
+
enabled: true
|
27
|
+
skipAllHosts: localhost, 127.0.0.1
|
28
|
+
trackingID: <your-tracking-id>
|
28
29
|
|
29
30
|
# ----------------------------------------------------------------------------
|
30
31
|
# Provider settings
|
31
32
|
# ----------------------------------------------------------------------------
|
32
33
|
google:
|
33
|
-
anonymizeIP:
|
34
|
+
anonymizeIP: false
|
34
35
|
|
35
36
|
# ------------------------------------------------------------------------------
|
36
37
|
# END config
|
@@ -98,7 +98,7 @@ defaults:
|
|
98
98
|
# --------------------------------------------------------------------------
|
99
99
|
#
|
100
100
|
optInOut: true
|
101
|
-
anonymizeIP:
|
101
|
+
anonymizeIP: true
|
102
102
|
|
103
103
|
# ------------------------------------------------------------------------------
|
104
104
|
# END config
|
@@ -57,7 +57,7 @@
|
|
57
57
|
<id>{{ page.url | absolute_url | xml_escape }}</id>
|
58
58
|
<post_limited>{{ limit_posts }}</post_limited>
|
59
59
|
<template_name>J1 Theme</template_name>
|
60
|
-
<template_version>2023.
|
60
|
+
<template_version>2023.5.2</template_version>
|
61
61
|
|
62
62
|
{% assign title = site.title | default: site.name %}
|
63
63
|
{% if page.collection != "posts" %}
|
@@ -18,15 +18,12 @@
|
|
18
18
|
|
19
19
|
<!-- Begin J1 SEO tags -->
|
20
20
|
|
21
|
-
{% if seo_tag.title? %}
|
22
|
-
<title>{{ seo_tag.title }}</title>
|
23
|
-
{% endif %}
|
24
|
-
|
25
21
|
<meta name="generator" content="Jekyll v{{ jekyll.version }}">
|
26
22
|
<meta name="builder" content="J1 Template v{{ site.version }}">
|
27
23
|
|
28
|
-
{% if seo_tag.
|
29
|
-
<
|
24
|
+
{% if seo_tag.title? %}
|
25
|
+
<title>{{ seo_tag.title }}</title>
|
26
|
+
<meta property="og:title" content="{{ seo_tag.title }}">
|
30
27
|
{% endif %}
|
31
28
|
|
32
29
|
{% if seo_tag.author.name %}
|
@@ -18,6 +18,8 @@
|
|
18
18
|
# -----------------------------------------------------------------------------
|
19
19
|
{% endcomment %}
|
20
20
|
|
21
|
+
{% assign time_now = site.time | date_to_xmlschema %}
|
22
|
+
|
21
23
|
{% comment %} main
|
22
24
|
-------------------------------------------------------------------------------- {% endcomment %}
|
23
25
|
<?xml version="1.0" encoding="UTF-8"?>
|
@@ -31,8 +33,8 @@
|
|
31
33
|
{% for doc in docs %}
|
32
34
|
<url>
|
33
35
|
<loc>{{ doc.url | replace:'/index.html','/' | absolute_url | xml_escape }}</loc>
|
34
|
-
{% if
|
35
|
-
<lastmod>{{ doc.
|
36
|
+
{% if time_now or doc.last_modified %}
|
37
|
+
<lastmod>{{ doc.last_modified | default: time_now | date_to_xmlschema }}</lastmod>
|
36
38
|
{% endif %}
|
37
39
|
</url>
|
38
40
|
{% endfor %}
|
@@ -42,8 +44,8 @@
|
|
42
44
|
{% for page in pages %}
|
43
45
|
<url>
|
44
46
|
<loc>{{ page.url | replace:'/index.html','/' | absolute_url | xml_escape }}</loc>
|
45
|
-
{% if page.
|
46
|
-
<lastmod>{{
|
47
|
+
{% if time_now or page.last_modified %}
|
48
|
+
<lastmod>{{ doc.last_modified | default: time_now | date_to_xmlschema }}</lastmod>
|
47
49
|
{% endif %}
|
48
50
|
</url>
|
49
51
|
{% endfor %}
|
@@ -52,7 +54,7 @@
|
|
52
54
|
{% for file in static_files %}
|
53
55
|
<url>
|
54
56
|
<loc>{{ file.path | replace:'/index.html','/' | absolute_url | xml_escape }}</loc>
|
55
|
-
<lastmod>{{
|
57
|
+
<lastmod>{{ doc.last_modified | default: time_now | date_to_xmlschema }}</lastmod>
|
56
58
|
</url>
|
57
59
|
{% endfor %}
|
58
60
|
</urlset>
|
@@ -275,7 +275,7 @@ module Jekyll
|
|
275
275
|
class Drop < Jekyll::Drops::Drop
|
276
276
|
include Jekyll::SeoTag::UrlHelper
|
277
277
|
|
278
|
-
TITLE_SEPARATOR = "
|
278
|
+
TITLE_SEPARATOR = " - "
|
279
279
|
FORMAT_STRING_METHODS = [
|
280
280
|
:markdownify, :strip_html, :normalize_whitespace, :escape_once,
|
281
281
|
].freeze
|
@@ -304,41 +304,41 @@ module Jekyll
|
|
304
304
|
end
|
305
305
|
|
306
306
|
def site_title
|
307
|
-
@site_title ||= format_string
|
307
|
+
@site_title ||= format_string site["title"]
|
308
308
|
end
|
309
309
|
|
310
|
-
|
311
|
-
|
310
|
+
# Page title without site title or description appended
|
311
|
+
def page_title
|
312
|
+
@page_title ||= format_string page["title"] # || site_title
|
312
313
|
end
|
313
314
|
|
314
|
-
def
|
315
|
-
@
|
315
|
+
def site_title_extention
|
316
|
+
@site_title_extention ||= format_string site["title_extention"]
|
316
317
|
end
|
317
318
|
|
318
|
-
|
319
|
-
|
320
|
-
@page_title ||= format_string(page["title"]) || site_title
|
319
|
+
def page_title_extention
|
320
|
+
@site_title_extention ||= format_string page["title_extention"]
|
321
321
|
end
|
322
322
|
|
323
|
-
def
|
324
|
-
|
323
|
+
def site_description
|
324
|
+
@site_description ||= format_string site["description"]
|
325
|
+
end
|
326
|
+
|
327
|
+
def title_extention_or_description
|
328
|
+
page_title_extention || site_title_extention || site_description
|
325
329
|
end
|
326
330
|
|
327
331
|
# Page title with site title or description appended
|
328
332
|
# rubocop:disable Metrics/CyclomaticComplexity
|
329
333
|
def title
|
330
334
|
@title ||= begin
|
331
|
-
if
|
332
|
-
page_title + TITLE_SEPARATOR +
|
333
|
-
elsif site_description && site_title
|
334
|
-
site_title + TITLE_SEPARATOR + site_tagline_or_description
|
335
|
+
if page_title != site_title
|
336
|
+
page_title + TITLE_SEPARATOR + title_extention_or_description
|
335
337
|
else
|
336
|
-
|
338
|
+
site_title + TITLE_SEPARATOR + title_extention_or_description
|
337
339
|
end
|
338
340
|
end
|
339
341
|
|
340
|
-
return page_number + @title if page_number
|
341
|
-
|
342
342
|
@title
|
343
343
|
end
|
344
344
|
# rubocop:enable Metrics/CyclomaticComplexity
|
data/lib/starter_web/index.html
CHANGED
@@ -2,18 +2,21 @@
|
|
2
2
|
layout: home
|
3
3
|
compress: true
|
4
4
|
|
5
|
-
title: Starter
|
5
|
+
title: J1 Starter
|
6
6
|
tagline: The Build-In Theme
|
7
|
+
|
7
8
|
date: 2023-01-01 00:00:00
|
8
|
-
last_modified:
|
9
|
+
#last_modified: 2023-07-18 00:00:00
|
10
|
+
|
9
11
|
description: >
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
for the Web. Jekyll One is open source
|
14
|
-
|
12
|
+
J1 Template gives web developers and hobbyists a clean
|
13
|
+
implementation in Jekyll for starting new projects
|
14
|
+
based on Bootstap V5. The template combines the best
|
15
|
+
software for the Web. Jekyll One is open source,
|
16
|
+
free to use, and the modules packed as well.
|
15
17
|
keywords: >
|
16
|
-
|
18
|
+
open source, free, template, jekyll, jekyllone, web,
|
19
|
+
sites, static, jamstack
|
17
20
|
|
18
21
|
categories: [ Site ]
|
19
22
|
tags: [ Home ]
|
@@ -1,12 +1,11 @@
|
|
1
1
|
---
|
2
2
|
title: Where to go
|
3
3
|
tagline: Fasten Your Way
|
4
|
+
|
4
5
|
date: 2023-01-01
|
5
6
|
#last_modified: 2023-01-01
|
6
7
|
|
7
8
|
description: >
|
8
|
-
J1 Template is a Bootstrap V5 website template for the static
|
9
|
-
site generator Jekyll.
|
10
9
|
Welcome to the info pages of J1 Template. A good decision
|
11
10
|
to get on that page first. Certainly, there is no better
|
12
11
|
place to learn what J1 Template can do and what pages are
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: j1-template
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2023.
|
4
|
+
version: 2023.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- juergen_jekyll_one
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-07-
|
11
|
+
date: 2023-07-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: jekyll
|