j1-template 2021.1.18 → 2021.1.19
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 +3 -0
- data/_includes/themes/j1/procedures/posts/collate_timeline.proc +6 -4
- data/assets/themes/j1/adapter/js/cookieConsent.js +19 -2
- data/assets/themes/j1/adapter/js/j1.js +24 -0
- data/assets/themes/j1/adapter/js/themer.js +10 -6
- data/lib/j1/version.rb +1 -1
- data/lib/starter_web/Gemfile +1 -1
- data/lib/starter_web/_config.yml +1 -1
- data/lib/starter_web/_includes/attributes.asciidoc +1 -1
- data/lib/starter_web/_plugins/lunr_index.rb +1 -1
- data/lib/starter_web/package.json +1 -1
- 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: 1123ba1664201396a2a746e6a9ecc45fe624d06648cd2e55da400f2d996c738d
|
|
4
|
+
data.tar.gz: cc6ebb01e986b5e52cf87ba142161dd1542177331576b55ad9877199b64f54ed
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 74fc43c1b71a114844d7e384f9384ad6c5366a3b45aee4400e01afa7bfa0c0dc6cd86a4d5a4307fcf0d60170ff2886065faa7646e8f28863503a16002bd0be2b
|
|
7
|
+
data.tar.gz: 9f0372eb8e5fd1541b94616d8c121eaf0e80d61a6adeb190af9c8bc862244fe44b63d516adc73888ff6cdb17c30c219639ab1a8da2bcc86c27263169e4c9a39d
|
|
@@ -55,6 +55,9 @@
|
|
|
55
55
|
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [ initial zoom level when the page is first loaded by the browser ] -->
|
|
56
56
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
57
57
|
|
|
58
|
+
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [ added version info for the templte ] -->
|
|
59
|
+
<meta name="template version" content="{{site.version}}" />
|
|
60
|
+
|
|
58
61
|
{% if template_config.translation.enabled %}
|
|
59
62
|
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [ add google translator meta tag to enable customized translations ] -->
|
|
60
63
|
<meta name="google-translate-customization" />
|
|
@@ -77,6 +77,8 @@
|
|
|
77
77
|
<!-- Use custom collator -->
|
|
78
78
|
{% include themes/{{site.template.name}}/procedures/custom/posts_collate %}
|
|
79
79
|
{% else %}
|
|
80
|
+
{% comment %} NOTE: header_title NOT used
|
|
81
|
+
---------------------------------------------------------------------------- {% endcomment %}
|
|
80
82
|
<!-- Use j1 blog timeline collator -->
|
|
81
83
|
{% if header_title %}
|
|
82
84
|
<div class="row timeline-header-box">
|
|
@@ -107,14 +109,14 @@
|
|
|
107
109
|
|
|
108
110
|
<li class="{{blog_position}}">
|
|
109
111
|
<div class="timeline-badge"><i class="tmicon rounded-x hidden-xs"></i></div>
|
|
110
|
-
|
|
111
112
|
<div class="card raised-z5 timeline-panel">
|
|
112
113
|
|
|
114
|
+
{% comment %} jadams, 2021-08-05:
|
|
115
|
+
NOTE: Changed headerlevel form h3 -> h2
|
|
116
|
+
---------------------------------------------------------------------- {% endcomment %}
|
|
113
117
|
<!-- div class="timeline-title" -->
|
|
114
118
|
<div class="card-header bg-primary pt-4 pb-3">
|
|
115
|
-
|
|
116
|
-
<h3 id="{{1000000 | rand}}" class="md-white">{{post.title}}</h3>
|
|
117
|
-
<!-- /a -->
|
|
119
|
+
<h2 id="{{1000000 | rand}}" class="md-white">{{post.title}}</h2>
|
|
118
120
|
</div>
|
|
119
121
|
|
|
120
122
|
<!-- Collect icon data from frontmatter -->
|
|
@@ -295,8 +295,7 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
|
|
|
295
295
|
}
|
|
296
296
|
|
|
297
297
|
// Managing providers for personalization OptIn/Out (Comments|Ads)
|
|
298
|
-
//
|
|
299
|
-
|
|
298
|
+
//
|
|
300
299
|
if (!user_consent.analyses || !user_consent.personalization) {
|
|
301
300
|
// expire consent|state cookies to session
|
|
302
301
|
j1.expireCookie({ name: cookie_names.user_state });
|
|
@@ -306,7 +305,25 @@ j1.adapter['cookieConsent'] = (function (j1, window) {
|
|
|
306
305
|
// reload current page (skip cache)
|
|
307
306
|
location.reload(true);
|
|
308
307
|
}
|
|
308
|
+
} else {
|
|
309
|
+
// jadams, 2021-08-10: remove cookies on invalid GA config or left
|
|
310
|
+
// cookies from previous session if they exists
|
|
311
|
+
gaCookies.forEach(function (item) {
|
|
312
|
+
logger.warn('\n' + 'delete GA cookie: ' + item);
|
|
313
|
+
j1.removeCookie({ name: item, domain: cookie_domain });
|
|
314
|
+
});
|
|
309
315
|
|
|
316
|
+
// Managing providers for personalization OptIn/Out (Comments|Ads)
|
|
317
|
+
//
|
|
318
|
+
if (!user_consent.analyses || !user_consent.personalization) {
|
|
319
|
+
// expire consent|state cookies to session
|
|
320
|
+
j1.expireCookie({ name: cookie_names.user_state });
|
|
321
|
+
j1.expireCookie({ name: cookie_names.user_consent });
|
|
322
|
+
}
|
|
323
|
+
if (moduleOptions.reloadPageOnChange) {
|
|
324
|
+
// reload current page (skip cache)
|
|
325
|
+
location.reload(true);
|
|
326
|
+
}
|
|
310
327
|
} // END if tracking_enabled
|
|
311
328
|
} // END cbCookie
|
|
312
329
|
|
|
@@ -1086,6 +1086,18 @@ var j1 = (function () {
|
|
|
1086
1086
|
$('#quickLinksSignInOutButton').css('display', 'block');
|
|
1087
1087
|
}
|
|
1088
1088
|
|
|
1089
|
+
// jadams, 2021-07-25: hide|show themes menu on cookie consent
|
|
1090
|
+
// (analyses|personalization) settings. BootSwatch is a 3rd party
|
|
1091
|
+
// is using e.g GA. Because NO control is possible on 3rd parties,
|
|
1092
|
+
// for GDPR compliance, themes feature may disabled on
|
|
1093
|
+
// privacy settings
|
|
1094
|
+
if (!user_consent.analyses || !user_consent.personalization) {
|
|
1095
|
+
logger.warn('\n' + 'disable themes feature because of privacy settings');
|
|
1096
|
+
$("#themes_menu").hide();
|
|
1097
|
+
} else {
|
|
1098
|
+
$("#themes_menu").show();
|
|
1099
|
+
}
|
|
1100
|
+
|
|
1089
1101
|
// if the page requested contains an anchor element,
|
|
1090
1102
|
// do a smooth scroll to
|
|
1091
1103
|
j1.scrollTo();
|
|
@@ -1222,6 +1234,18 @@ var j1 = (function () {
|
|
|
1222
1234
|
$('#quickLinksCookieButton').css('display', 'none');
|
|
1223
1235
|
}
|
|
1224
1236
|
|
|
1237
|
+
// jadams, 2021-07-25: hide|show themes menu on cookie consent
|
|
1238
|
+
// (analyses|personalization) settings. BootSwatch is a 3rd party
|
|
1239
|
+
// is using e.g GA. Because NO control is possible on 3rd parties,
|
|
1240
|
+
// for GDPR compliance, themes feature may disabled on
|
|
1241
|
+
// privacy settings
|
|
1242
|
+
if (!user_consent.analyses || !user_consent.personalization) {
|
|
1243
|
+
logger.warn('\n' + 'disable themes feature because of privacy settings');
|
|
1244
|
+
$("#themes_menu").hide();
|
|
1245
|
+
} else {
|
|
1246
|
+
$("#themes_menu").show();
|
|
1247
|
+
}
|
|
1248
|
+
|
|
1225
1249
|
// If the page requested contains an anchor element,
|
|
1226
1250
|
// do a smooth scroll
|
|
1227
1251
|
j1.scrollTo();
|
|
@@ -219,17 +219,21 @@ j1.adapter['themer'] = (function (j1, window) {
|
|
|
219
219
|
// set the theme switcher state
|
|
220
220
|
user_state.theme_switcher = themerOptions.enabled;
|
|
221
221
|
|
|
222
|
+
// jadams, 2021-08-10: moved hide|show themes menu to
|
|
223
|
+
// j1 adapter (displayPage)
|
|
224
|
+
//
|
|
222
225
|
// jadams, 2021-07-25: hide|show themes menu on cookie consent
|
|
223
226
|
// (analyses|personalization) settings. BootSwatch is a 3rd party
|
|
224
227
|
// is using e.g GA. Because NO control is possible on 3rd parties,
|
|
225
228
|
// for GDPR compliance, themes feature may disabled on
|
|
226
229
|
// privacy settings
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
230
|
+
//
|
|
231
|
+
// if (!user_consent.analyses || !user_consent.personalization) {
|
|
232
|
+
// logger.warn('\n' + 'disable themes feature because of privacy settings');
|
|
233
|
+
// $("#themes_menu").hide();
|
|
234
|
+
// } else {
|
|
235
|
+
// $("#themes_menu").show();
|
|
236
|
+
// }
|
|
233
237
|
|
|
234
238
|
if (themerOptions.enabled) {
|
|
235
239
|
// enable BS ThemeSwitcher
|
data/lib/j1/version.rb
CHANGED
data/lib/starter_web/Gemfile
CHANGED
|
@@ -53,7 +53,7 @@ gem 'jekyll', '~> 4.2'
|
|
|
53
53
|
|
|
54
54
|
# Theme Rubies, default: J1 Template (NOT used for the development system)
|
|
55
55
|
#
|
|
56
|
-
gem 'j1-template', '~> 2021.1.
|
|
56
|
+
gem 'j1-template', '~> 2021.1.19'
|
|
57
57
|
|
|
58
58
|
# ------------------------------------------------------------------------------
|
|
59
59
|
# PRODUCTION: Gem needed for the Jekyll and J1 prod environment
|
data/lib/starter_web/_config.yml
CHANGED
|
@@ -53,7 +53,7 @@ environment: production
|
|
|
53
53
|
# ------------------------------------------------------------------------------
|
|
54
54
|
# Sets the build version of J1 Template Gem
|
|
55
55
|
#
|
|
56
|
-
version: 2021.1.
|
|
56
|
+
version: 2021.1.19
|
|
57
57
|
|
|
58
58
|
# version
|
|
59
59
|
# ------------------------------------------------------------------------------
|
|
@@ -412,7 +412,7 @@ end::tables[]
|
|
|
412
412
|
// -----------------------------------------------------------------------------
|
|
413
413
|
tag::products[]
|
|
414
414
|
:j1--license: MIT License
|
|
415
|
-
:j1--version: 2021.1.
|
|
415
|
+
:j1--version: 2021.1.19
|
|
416
416
|
:j1--site-name: Jekyll One
|
|
417
417
|
end::products[]
|
|
418
418
|
|
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: 2021.1.
|
|
4
|
+
version: 2021.1.19
|
|
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: 2021-08-
|
|
11
|
+
date: 2021-08-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: jekyll
|