j1-template 2023.0.14 → 2023.0.16
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/procedures/global/create_word_cloud.proc +2 -2
- data/assets/data/banner.html +2 -2
- data/assets/data/cookieconsent.html +19 -19
- data/assets/data/translator.html +9 -10
- data/assets/themes/j1/adapter/js/analytics.js +91 -94
- data/assets/themes/j1/adapter/js/comments.js +5 -5
- data/assets/themes/j1/adapter/js/translator.js +3 -10
- data/assets/themes/j1/core/css/themes/unolight/bootstrap.css +0 -2
- data/assets/themes/j1/modules/translator/css/translator.css +14 -6
- data/assets/themes/j1/modules/translator/css/translator.min.css +1 -1
- data/lib/j1/version.rb +1 -1
- data/lib/starter_web/Gemfile +1 -1
- data/lib/starter_web/README.md +5 -5
- data/lib/starter_web/_config.yml +1 -2
- data/lib/starter_web/_data/blocks/defaults/panel.yml +0 -5
- data/lib/starter_web/_data/blocks/panel.yml +11 -8
- data/lib/starter_web/_data/modules/advertising.yml +3 -60
- data/lib/starter_web/_data/modules/analytics.yml +5 -1
- data/lib/starter_web/_data/modules/blog_navigator.yml +3 -7
- data/lib/starter_web/_data/modules/carousel.yml +1 -20
- data/lib/starter_web/_data/modules/comments.yml +1 -29
- data/lib/starter_web/_data/modules/cookieconsent.yml +3 -1
- data/lib/starter_web/_data/modules/cookies.yml +4 -3
- data/lib/starter_web/_data/modules/defaults/analytics.yml +4 -3
- data/lib/starter_web/_data/modules/defaults/blog_navigator.yml +25 -22
- data/lib/starter_web/_data/modules/defaults/comments.yml +6 -1
- data/lib/starter_web/_data/modules/defaults/cookieconsent.yml +77 -56
- data/lib/starter_web/_data/modules/defaults/cookies.yml +1 -1
- data/lib/starter_web/_data/modules/defaults/framer.yml +6 -3
- data/lib/starter_web/_data/modules/defaults/lightGallery.yml +52 -48
- data/lib/starter_web/_data/modules/defaults/lightbox.yml +1 -1
- data/lib/starter_web/_data/modules/defaults/log4javascript.yml +7 -3
- data/lib/starter_web/_data/modules/defaults/log4r.yml +7 -4
- data/lib/starter_web/_data/modules/defaults/masonry.yml +5 -2
- data/lib/starter_web/_data/modules/defaults/masterslider.yml +3 -5
- data/lib/starter_web/_data/modules/defaults/nbinteract.yml +17 -19
- data/lib/starter_web/_data/modules/defaults/particles.yml +5 -5
- data/lib/starter_web/_data/modules/defaults/rangeSlider.yml +1 -1
- data/lib/starter_web/_data/modules/defaults/themer.yml +14 -9
- data/lib/starter_web/_data/modules/defaults/toccer.yml +2 -2
- data/lib/starter_web/_data/modules/defaults/translator.yml +49 -37
- data/lib/starter_web/_data/modules/defaults/waves.yml +3 -0
- data/lib/starter_web/_data/modules/dropdowns.yml +3 -3
- data/lib/starter_web/_data/modules/fab.yml +5 -2
- data/lib/starter_web/_data/modules/framer.yml +4 -19
- data/lib/starter_web/_data/modules/lightGallery.yml +4 -78
- data/lib/starter_web/_data/modules/lightbox.yml +4 -151
- data/lib/starter_web/_data/modules/log4r.yml +5 -137
- data/lib/starter_web/_data/modules/lunr.yml +2 -11
- data/lib/starter_web/_data/modules/masonry.yml +8 -0
- data/lib/starter_web/_data/modules/masterslider.yml +6 -2
- data/lib/starter_web/_data/modules/navigator_menu.yml +13 -0
- data/lib/starter_web/_data/modules/particles.yml +3 -7
- data/lib/starter_web/_data/modules/rangeSlider.yml +35 -3
- data/lib/starter_web/_data/modules/scroller.yml +6 -2
- data/lib/starter_web/_data/modules/themer.yml +3 -0
- data/lib/starter_web/_data/modules/toccer.yml +5 -20
- data/lib/starter_web/_data/modules/translator.yml +5 -2
- data/lib/starter_web/_data/modules/waves.yml +3 -0
- data/lib/starter_web/_data/resources.yml +15 -15
- data/lib/starter_web/_data/templates/feed.xml +1 -1
- data/lib/starter_web/_plugins/index/lunr.rb +1 -1
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/pages/public/about/features.adoc +1 -1
- data/lib/starter_web/pages/public/asciidoc_skeletons/documentation/documentation.adoc +4 -5
- data/lib/starter_web/pages/public/asciidoc_skeletons/multi-document/multi.adoc +2 -3
- data/lib/starter_web/pages/public/asciidoc_skeletons/simple-document/simple.adoc +1 -1
- data/lib/starter_web/pages/public/blog/navigator/index.html +0 -3
- data/lib/starter_web/pages/public/bookshelf/viewer_biography.adoc +1 -1
- data/lib/starter_web/pages/public/bookshelf/whats_up.adoc +1 -1
- data/lib/starter_web/pages/public/features/general.adoc +1 -2
- data/lib/starter_web/pages/public/features/template.adoc +1 -1
- data/lib/starter_web/pages/public/learn/roundtrip/asciidoc_extensions.adoc +1 -1
- data/lib/starter_web/pages/public/learn/roundtrip/bootstrap_themes.adoc +1 -1
- data/lib/starter_web/pages/public/learn/roundtrip/icon_fonts.adoc +1 -1
- data/lib/starter_web/pages/public/learn/roundtrip/lunr_search.adoc +2 -3
- data/lib/starter_web/pages/public/learn/roundtrip/modal_extentions.adoc +1 -1
- data/lib/starter_web/pages/public/learn/roundtrip/present_images.adoc +3 -2
- data/lib/starter_web/pages/public/learn/roundtrip/present_videos.adoc +1 -1
- data/lib/starter_web/pages/public/learn/roundtrip/responsive_tables.adoc +1 -1
- data/lib/starter_web/pages/public/learn/roundtrip/typography.adoc +1 -1
- data/lib/starter_web/pages/public/learn/where_to_go.adoc +1 -1
- data/lib/starter_web/pages/public/legal/en/100_copyright.adoc +1 -1
- data/lib/starter_web/pages/public/legal/en/200_impress.adoc +1 -2
- data/lib/starter_web/pages/public/legal/en/300_privacy.adoc +1 -2
- data/lib/starter_web/pages/public/legal/en/400_comment_policy.adoc +1 -2
- data/lib/starter_web/pages/public/panels/intro_panel/panel.adoc +1 -1
- data/lib/starter_web/pages/public/plans/plans.adoc +1 -1
- data/lib/starter_web/pages/public/previewer/preview_bootstrap_theme.adoc +2 -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: a5ac9cb1c56208becadbf2798e6d13a5585bc72701a1934d11c2fd8c0419f8c3
|
4
|
+
data.tar.gz: ddf25d6c0a2cd919ede33d25f7119fb466f352d5244e4b489bcb34525256becf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3683ef0d81b11e42f32c8f3670c73ceb8c53ffeb09fb42cd3d5d261070220454f20436d65b4436d78c7a92f1a7203047e7f921decbd0f6c09d2b79b1fd8f49cc
|
7
|
+
data.tar.gz: 539e4a129ce95e6b598ed1c5f1da6f3d470196705d1a8117734db0eb2c82ea5a8063aadf6b3d7f3cf472cb8506492e4cbb53a7bccdb0a2ef58bee9f27180da67
|
@@ -73,7 +73,7 @@
|
|
73
73
|
{% if source == 'categories' %}
|
74
74
|
{% for tag in word_array %}
|
75
75
|
<li class="badge-tag">
|
76
|
-
<a href="#{{tag|downcase}}">
|
76
|
+
<a class="bg-primary" href="#{{tag|downcase}}">
|
77
77
|
{{ tag | capitalize }}
|
78
78
|
<span>{{ site.categories[tag] | size }}</span>
|
79
79
|
</a>
|
@@ -82,7 +82,7 @@
|
|
82
82
|
{% elsif source == 'tags' %}
|
83
83
|
{% for tag in word_array %}
|
84
84
|
<li class="badge-tag">
|
85
|
-
<a href="#{{ tag | replace: '+','_' | replace: ' ','_' | downcase }}">
|
85
|
+
<a class="bg-primary" href="#{{ tag | replace: '+','_' | replace: ' ','_' | downcase }}">
|
86
86
|
{{ tag }}
|
87
87
|
<span>{{ site.tags[tag] | size }}</span>
|
88
88
|
</a>
|
data/assets/data/banner.html
CHANGED
@@ -259,8 +259,8 @@ exclude_from_search: true
|
|
259
259
|
<img
|
260
260
|
class="sticker-image"
|
261
261
|
src="/assets/images/sticker/600x600/sticker-new-version.png"
|
262
|
-
alt="Get new version 2023.0.
|
263
|
-
title="Get new version 2023.0.
|
262
|
+
alt="Get new version 2023.0.16"
|
263
|
+
title="Get new version 2023.0.16"
|
264
264
|
style="width: 140px; height: 120px;"
|
265
265
|
>
|
266
266
|
</a>
|
@@ -99,11 +99,11 @@ exclude_from_search: true
|
|
99
99
|
<div class="switch">
|
100
100
|
<label>
|
101
101
|
<input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" checked disabled>
|
102
|
-
Necessary
|
102
|
+
Necessary
|
103
103
|
<span class="bmd-switch-track"></span>
|
104
104
|
</label>
|
105
105
|
<ul>
|
106
|
-
<li>Required to run the website</li>
|
106
|
+
<li class="mt-2" style="list-style-type: none;">Required to run the website</li>
|
107
107
|
</ul>
|
108
108
|
</div>
|
109
109
|
</div>
|
@@ -112,12 +112,12 @@ exclude_from_search: true
|
|
112
112
|
<label>
|
113
113
|
<input id="bccs-checkboxAnalysis" type="checkbox" name="bccs-checkboxAnalysis" checked>
|
114
114
|
<span class="bmd-switch-track"></span>
|
115
|
-
Analysis
|
115
|
+
Analysis
|
116
116
|
</label>
|
117
117
|
<ul>
|
118
|
-
<li>Usage monitoring for this site</li>
|
119
|
-
<li>Optimizing of the performance for this site</li>
|
120
|
-
<li>Optimizing of content for all visitors</li>
|
118
|
+
<li class="mt-2" style="list-style-type: none;">Usage monitoring for this site</li>
|
119
|
+
<li style="list-style-type: none;">Optimizing of the performance for this site</li>
|
120
|
+
<li style="list-style-type: none;">Optimizing of content for all visitors</li>
|
121
121
|
</ul>
|
122
122
|
</div>
|
123
123
|
</div>
|
@@ -129,9 +129,9 @@ exclude_from_search: true
|
|
129
129
|
Personalization (Persistent Cookies)
|
130
130
|
</label>
|
131
131
|
<ul>
|
132
|
-
<li>Collect user feedback for improvements</li>
|
133
|
-
<li>Storage of personal preferences from previous visits</li>
|
134
|
-
<li>Translation or comments to exchange visitor's experiences</li>
|
132
|
+
<li class="mt-2" style="list-style-type: none;">Collect user feedback for improvements</li>
|
133
|
+
<li style="list-style-type: none;">Storage of personal preferences from previous visits</li>
|
134
|
+
<li style="list-style-type: none;">Translation or comments to exchange visitor's experiences</li>
|
135
135
|
</ul>
|
136
136
|
</div>
|
137
137
|
</div>
|
@@ -194,10 +194,10 @@ exclude_from_search: true
|
|
194
194
|
<label>
|
195
195
|
<input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" checked disabled>
|
196
196
|
<span class="bmd-switch-track"></span>
|
197
|
-
Notwendig
|
197
|
+
Notwendig
|
198
198
|
</label>
|
199
199
|
<ul>
|
200
|
-
<li>Zum Betrieb der Website erforderlich</li>
|
200
|
+
<li style="list-style-type: none;">Zum Betrieb der Website erforderlich</li>
|
201
201
|
</ul>
|
202
202
|
</div>
|
203
203
|
</div>
|
@@ -206,12 +206,12 @@ exclude_from_search: true
|
|
206
206
|
<label>
|
207
207
|
<input id="bccs-checkboxAnalysis" type="checkbox" name="bccs-checkboxAnalysis" checked>
|
208
208
|
<span class="bmd-switch-track"></span>
|
209
|
-
Analysen
|
209
|
+
Analysen
|
210
210
|
</label>
|
211
211
|
<ul>
|
212
|
-
<li>Nutzungsüberwachung für diese Website</li>
|
213
|
-
<li>Optimierung der Leistung für diese Website</li>
|
214
|
-
<li>Optimierung des Inhalts für alle Besucher</li>
|
212
|
+
<li style="list-style-type: none;">Nutzungsüberwachung für diese Website</li>
|
213
|
+
<li style="list-style-type: none;">Optimierung der Leistung für diese Website</li>
|
214
|
+
<li style="list-style-type: none;">Optimierung des Inhalts für alle Besucher</li>
|
215
215
|
</ul>
|
216
216
|
</div>
|
217
217
|
</div>
|
@@ -220,12 +220,12 @@ exclude_from_search: true
|
|
220
220
|
<label>
|
221
221
|
<input id="bccs-checkboxPersonalization" type="checkbox" name="bccs-checkboxPersonalization" checked>
|
222
222
|
<span class="bmd-switch-track"></span>
|
223
|
-
Personalisierung
|
223
|
+
Personalisierung
|
224
224
|
</label>
|
225
225
|
<ul>
|
226
|
-
<li>Sammeln von Benutzer-Feedback für Verbesserungen</li>
|
227
|
-
<li>Speicherung Ihrer Präferenzen aus frühreren Besuchen</li>
|
228
|
-
<li>Übersetzungen oder Kommentare zum Austausch von Erfahrungen der Besucher</li>
|
226
|
+
<li style="list-style-type: none;">Sammeln von Benutzer-Feedback für Verbesserungen</li>
|
227
|
+
<li style="list-style-type: none;">Speicherung Ihrer Präferenzen aus frühreren Besuchen</li>
|
228
|
+
<li style="list-style-type: none;">Übersetzungen oder Kommentare zum Austausch von Erfahrungen der Besucher</li>
|
229
229
|
</ul>
|
230
230
|
</div>
|
231
231
|
</div>
|
data/assets/data/translator.html
CHANGED
@@ -81,10 +81,10 @@ exclude_from_search: true
|
|
81
81
|
<p class="mb-3">{{translate_options.google.modal_settings.body_text.en}}</p>
|
82
82
|
</div>
|
83
83
|
<p style="font-size: 90%">{{translate_options.google.modal_settings.language_selector_title.en}}</p>
|
84
|
-
<div id="dropdownJSON" class="mb-
|
84
|
+
<div id="dropdownJSON" class="notranslate mb-4" style="display:none"></div>
|
85
85
|
<p>
|
86
86
|
<a href="#google-privacy" data-bs-toggle="collapse" class="">Privacy Notice</a>
|
87
|
-
<a href="#google-options" data-bs-toggle="collapse" class="float-right">
|
87
|
+
<a href="#google-options" data-bs-toggle="collapse" class="float-right">Privacy</a>
|
88
88
|
</p>
|
89
89
|
|
90
90
|
<div id="google-privacy" class="collapse">
|
@@ -102,7 +102,7 @@ exclude_from_search: true
|
|
102
102
|
<label>
|
103
103
|
<input id="checkboxAnalysis" type="checkbox" name="checkboxAnalysis" checked>
|
104
104
|
<span class="bmd-switch-track"></span>
|
105
|
-
Analysis
|
105
|
+
Analysis
|
106
106
|
</label>
|
107
107
|
</div>
|
108
108
|
</div>
|
@@ -112,7 +112,7 @@ exclude_from_search: true
|
|
112
112
|
<label>
|
113
113
|
<input id="checkboxPersonalization" type="checkbox" name="checkboxPersonalization" checked>
|
114
114
|
<span class="bmd-switch-track"></span>
|
115
|
-
Personalization
|
115
|
+
Personalization
|
116
116
|
</label>
|
117
117
|
</div>
|
118
118
|
</div>
|
@@ -122,7 +122,7 @@ exclude_from_search: true
|
|
122
122
|
<label>
|
123
123
|
<input id="checkboxuseLanguageFromBrowser" type="checkbox" name="checkboxuseLanguageFromBrowser" checked disabled>
|
124
124
|
<span class="bmd-switch-track"></span>
|
125
|
-
Language
|
125
|
+
Language taken from browser
|
126
126
|
</label>
|
127
127
|
</div>
|
128
128
|
</div>
|
@@ -132,23 +132,22 @@ exclude_from_search: true
|
|
132
132
|
<label>
|
133
133
|
<input id="checkboxTranslateAllPages" type="checkbox" name="checkboxTranslateAllPages" checked disabled>
|
134
134
|
<span class="bmd-switch-track"></span>
|
135
|
-
|
135
|
+
Translate all pages
|
136
136
|
</label>
|
137
137
|
</div>
|
138
138
|
</div>
|
139
139
|
|
140
|
-
|
140
|
+
<!-- div class="translator-option" data-name="translationEnabled">
|
141
141
|
<div class="switch mb-1">
|
142
142
|
<label>
|
143
143
|
<input id="checkboxTranslationEnabled" type="checkbox" name="checkboxTranslationEnabled" checked>
|
144
144
|
<span class="bmd-switch-track"></span>
|
145
|
-
Translation
|
145
|
+
Translation Service
|
146
146
|
</label>
|
147
147
|
</div>
|
148
|
-
</div
|
148
|
+
</div -->
|
149
149
|
|
150
150
|
</div>
|
151
|
-
|
152
151
|
</div>
|
153
152
|
|
154
153
|
<div class="modal-footer">
|
@@ -125,112 +125,109 @@ var logText;
|
|
125
125
|
// -------------------------------------------------------------------------
|
126
126
|
init: function (options) {
|
127
127
|
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
128
|
+
var dependencies_met_page_ready = setInterval (function (options) {
|
129
|
+
var pageState = $('#no_flicker').css("display");
|
130
|
+
var pageVisible = (pageState == 'block') ? true: false;
|
131
|
+
if ( j1.getState() === 'finished' && pageVisible ) {
|
132
|
+
{% if analytics %}
|
133
|
+
|
134
|
+
// Load module DEFAULTS|CONFIG
|
135
|
+
analyticsDefaults = $.extend({}, {{analytics_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
|
136
|
+
analyticsSettings = $.extend({}, {{analytics_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
|
137
|
+
analyticsOptions = $.extend(true, {}, analyticsDefaults, analyticsSettings);
|
138
|
+
|
139
|
+
// [INFO ] [j1.adapter.analytics ] [ detected analytics provider (j1_config): {{analytics_provider}}} ]
|
140
|
+
// [INFO ] [j1.adapter.analytics ] [ start processing load region head, layout: {{page.layout}} ]
|
141
|
+
{% case analytics_provider %}
|
142
|
+
{% when "google" %}
|
143
|
+
// [INFO ] [j1.adapter.analytics ] [ place provider: Google Adsense ]
|
144
|
+
providerID = analyticsOptions.trackingID;
|
145
|
+
skipAllHosts = analyticsOptions.skipAllHosts;
|
146
|
+
optInOut = analyticsOptions.google.optInOut;
|
147
|
+
anonymizeIP = analyticsOptions.google.anonymizeIP;
|
148
|
+
validProviderID = (providerID.includes('your')) ? false : true;
|
145
149
|
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
150
|
+
// -----------------------------------------------------------------
|
151
|
+
// Default module settings
|
152
|
+
// -----------------------------------------------------------------
|
153
|
+
var settings = $.extend({
|
154
|
+
module_name: 'j1.adapter.analytics',
|
155
|
+
generated: '{{site.time}}'
|
156
|
+
}, options);
|
153
157
|
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
// initialize state flag
|
161
|
-
_this.setState('started');
|
162
|
-
logger.debug('\n' + 'state: ' + _this.getState());
|
163
|
-
logger.info('\n' + 'module is being initialized');
|
164
|
-
|
165
|
-
// remove cookies on invalid GA config or left from a previous
|
166
|
-
// session/page view if they exists
|
167
|
-
// ---------------------------------------------------------------------
|
168
|
-
gaCookies = j1.findCookie('_ga');
|
169
|
-
gaCookies.forEach(function (item) {
|
170
|
-
logger.warn('\n' + 'delete cookie created by Google Analytics: ' + item);
|
171
|
-
if (hostname == 'localhost') {
|
172
|
-
j1.removeCookie({ name: item, domain: false, secure: false });
|
173
|
-
} else {
|
174
|
-
j1.removeCookie({ name: item, domain: '.' + hostname, secure: false });
|
175
|
-
}
|
176
|
-
});
|
158
|
+
// -----------------------------------------------------------------
|
159
|
+
// Global variable settings
|
160
|
+
// -----------------------------------------------------------------
|
161
|
+
_this = j1.adapter.analytics;
|
162
|
+
logger = log4javascript.getLogger('j1.adapter.analytics.google');
|
177
163
|
|
178
|
-
|
179
|
-
|
164
|
+
// initialize state flag
|
165
|
+
_this.setState('started');
|
166
|
+
logger.debug('\n' + 'state: ' + _this.getState());
|
167
|
+
logger.info('\n' + 'module is being initialized');
|
180
168
|
|
181
|
-
|
182
|
-
|
183
|
-
|
169
|
+
// remove cookies on invalid GA config or left from a previous
|
170
|
+
// session/page view if they exists
|
171
|
+
// -----------------------------------------------------------------
|
172
|
+
gaCookies = j1.findCookie('_ga');
|
173
|
+
gaCookies.forEach(function (item) {
|
174
|
+
logger.debug('\n' + 'delete cookie created by Google Analytics: ' + item);
|
175
|
+
if (hostname == 'localhost') {
|
176
|
+
j1.removeCookie({ name: item, domain: false, secure: false });
|
177
|
+
} else {
|
178
|
+
j1.removeCookie({ name: item, domain: '.' + hostname, secure: false });
|
179
|
+
}
|
180
|
+
});
|
181
|
+
|
182
|
+
gaExists = document.getElementById('google-tag-manager') === null ? false : true;
|
183
|
+
skipHosts = skipAllHosts.replace(/,/g, ' ');
|
184
|
+
skipHost = skipHosts.includes(hostname);
|
185
|
+
|
186
|
+
user_consent = j1.readCookie(cookie_names.user_consent);
|
187
|
+
if (user_consent.analysis && skipHost && validProviderID) {
|
188
|
+
logger.debug('\n' + 'Google Analytics skipped for: ' + hostname);
|
189
|
+
}
|
184
190
|
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
191
|
+
if (!gaExists && !skipHost) {
|
192
|
+
// add ga api dynamically in the head section
|
193
|
+
// ---------------------------------------------------------------
|
194
|
+
logger.info('\n' + 'Google Analytics added for: ' + hostname);
|
195
|
+
logger.info('\n' + 'Google Analytics API added in section: head');
|
196
|
+
gaScript.async = true;
|
197
|
+
gaScript.id = 'google-tag-manager';
|
198
|
+
gaScript.src = '//www.googletagmanager.com/gtag/js?id=' + providerID;
|
199
|
+
document.head.appendChild(gaScript);
|
200
|
+
}
|
189
201
|
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
user_consent = j1.readCookie(cookie_names.user_consent);
|
202
|
-
if (user_consent.analysis && !skipHost ) {
|
203
|
-
if (validProviderID) {
|
202
|
+
user_consent = j1.readCookie(cookie_names.user_consent);
|
203
|
+
if (user_consent.analysis && !skipHost ) {
|
204
|
+
if (validProviderID) {
|
205
|
+
logger.info('\n' + 'user consent on analytics: ' + user_consent.analysis);
|
206
|
+
logger.info('\n' + 'enable Google Analytics on ID: ' + providerID);
|
207
|
+
GTagOptIn.register(providerID);
|
208
|
+
GTagOptIn.optIn();
|
209
|
+
} else {
|
210
|
+
logger.debug('\n' + 'invalid trackig id detected for Google Analytics: ' + providerID);
|
211
|
+
}
|
212
|
+
} else {
|
204
213
|
logger.info('\n' + 'user consent on analytics: ' + user_consent.analysis);
|
205
|
-
logger.
|
214
|
+
logger.debug('\n' + 'disable Google Analytics on ID: ' + providerID);
|
206
215
|
GTagOptIn.register(providerID);
|
207
|
-
GTagOptIn.
|
208
|
-
} else {
|
209
|
-
logger.warn('\n' + 'invalid trackig id detected for Google Analytics: ' + providerID);
|
216
|
+
GTagOptIn.optOut();
|
210
217
|
}
|
211
|
-
} else {
|
212
|
-
logger.info('\n' + 'user consent on analytics: ' + user_consent.analysis);
|
213
|
-
logger.warn('\n' + 'disable Google Analytics on ID: ' + providerID);
|
214
|
-
GTagOptIn.register(providerID);
|
215
|
-
GTagOptIn.optOut();
|
216
|
-
}
|
217
|
-
clearInterval(dependencies_met_page_ready);
|
218
|
-
} // END if getState 'finished'
|
219
|
-
}, 25);
|
220
218
|
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
logger.info('\n' + 'Google Analytics: disabled');
|
230
|
-
clearInterval(dependencies_met_page_ready);
|
219
|
+
{% when "custom" %}
|
220
|
+
// [INFO ] [j1.adapter.analytics ] [ place provider: Custom Provider ]
|
221
|
+
{% endcase %}
|
222
|
+
// [INFO ] [j1.adapter.analytics ] [ end processing ]
|
223
|
+
{% else %}
|
224
|
+
logger = log4javascript.getLogger('j1.adapter.analytics.google');
|
225
|
+
logger.info('\n' + 'Google Analytics: disabled');
|
226
|
+
{% endif %}
|
231
227
|
}
|
228
|
+
clearInterval(dependencies_met_page_ready);
|
232
229
|
}, 25);
|
233
|
-
|
230
|
+
|
234
231
|
return;
|
235
232
|
}, // END init
|
236
233
|
|
@@ -184,7 +184,7 @@ var logText;
|
|
184
184
|
logger = log4javascript.getLogger('j1.adapter.comments');
|
185
185
|
|
186
186
|
// check the site ID to be used for a provider
|
187
|
-
providerID = (typeof commentsOptions.site_id == "number") ? commentsOptions.site_id.toString() : commentsOptions.
|
187
|
+
providerID = (typeof commentsOptions.site_id == "number") ? commentsOptions.site_id.toString() : commentsOptions.site_id;
|
188
188
|
validProviderID = (providerID.includes('your')) ? false : true;
|
189
189
|
|
190
190
|
{% case comments_provider %}
|
@@ -195,7 +195,7 @@ var logText;
|
|
195
195
|
if (j1.getState() == 'finished') {
|
196
196
|
|
197
197
|
if (!validProviderID) {
|
198
|
-
logger.
|
198
|
+
logger.debug('\n' + 'invalid site id detected for Hyvor Talk: ' + providerID);
|
199
199
|
logger.info('\n' + 'skip initialization for provider: ' + comments_provider);
|
200
200
|
clearInterval(dependencies_met_page_ready);
|
201
201
|
return false;
|
@@ -253,7 +253,7 @@ var logText;
|
|
253
253
|
// disable Hyvor Talk
|
254
254
|
// ---------------------------------------------------------------
|
255
255
|
logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
|
256
|
-
logger.
|
256
|
+
logger.debug('\n' + 'disable Hyvor Talk on site id: ' + providerID);
|
257
257
|
|
258
258
|
// remove Hyvor Talk resources
|
259
259
|
// ---------------------------------------------------------------
|
@@ -272,7 +272,7 @@ var logText;
|
|
272
272
|
if (j1.getState() == 'finished') {
|
273
273
|
|
274
274
|
if (!validProviderID) {
|
275
|
-
logger.
|
275
|
+
logger.debug('\n' + 'invalid short name detected for Disqus: ' + providerID);
|
276
276
|
logger.info('\n' + 'skip initialization for provider: ' + comments_provider);
|
277
277
|
clearInterval(dependencies_met_page_ready);
|
278
278
|
return;
|
@@ -331,7 +331,7 @@ var logText;
|
|
331
331
|
$('#main-content').append('<div id="disqus_thread"></div>');
|
332
332
|
} else {
|
333
333
|
logger.info('\n' + 'user consent on comments: ' + user_consent.personalization);
|
334
|
-
logger.
|
334
|
+
logger.debug('\n' + 'disable comments provider' + ' {{comments_provider}} on short name: ' + providerID);
|
335
335
|
$('#leave-a-comment').remove();
|
336
336
|
$('#dq-web-api').remove();
|
337
337
|
$('#hdisqus_thread').remove();
|
@@ -180,7 +180,6 @@ j1.adapter.translator = (function (j1, window) {
|
|
180
180
|
gtCallbackScript.text += ' layout: google.translate.TranslateElement.FloatPosition.TOP_LEFT' + '\n';
|
181
181
|
gtCallbackScript.text += ' },' + '\n';
|
182
182
|
gtCallbackScript.text += ' "google_translate_element");' + '\n';
|
183
|
-
// gtCallbackScript.text += ' j1.adapter.translator.postTranslateElementInit(gtAPI);' + '\n';
|
184
183
|
gtCallbackScript.text += '}' + '\n';
|
185
184
|
document.head.appendChild(gtCallbackScript);
|
186
185
|
|
@@ -201,7 +200,9 @@ j1.adapter.translator = (function (j1, window) {
|
|
201
200
|
domainAttribute = '';
|
202
201
|
}
|
203
202
|
|
204
|
-
|
203
|
+
var pageState = $('#no_flicker').css("display");
|
204
|
+
var pageVisible = (pageState == 'block') ? true: false;
|
205
|
+
if ( j1.getState() === 'finished' && pageVisible ) {
|
205
206
|
_this.setState('started');
|
206
207
|
logger.debug('\n' + 'state: ' + _this.getState());
|
207
208
|
logger.info('\n' + 'module is being initialized');
|
@@ -220,11 +221,6 @@ j1.adapter.translator = (function (j1, window) {
|
|
220
221
|
});
|
221
222
|
}
|
222
223
|
|
223
|
-
// hide the google translate element if exists
|
224
|
-
if ($('google_translate_element')) {
|
225
|
-
$('google_translate_element').hide();
|
226
|
-
}
|
227
|
-
|
228
224
|
// show|hide translate button if enabled
|
229
225
|
if (translatorOptions.hideTranslatorIcon) {
|
230
226
|
if (!user_consent.analysis || !user_consent.personalization) {
|
@@ -291,9 +287,6 @@ j1.adapter.translator = (function (j1, window) {
|
|
291
287
|
if (user_translate.analysis && user_translate.personalization && user_translate.translationEnabled) {
|
292
288
|
if (translatorOptions.translatorName === 'google') {
|
293
289
|
head.appendChild(gtTranslateScript);
|
294
|
-
if ($('google_translate_element')) {
|
295
|
-
$('google_translate_element').hide();
|
296
|
-
}
|
297
290
|
}
|
298
291
|
} else {
|
299
292
|
if (translatorOptions.translatorName === 'google') {
|
@@ -9855,11 +9855,9 @@ body {
|
|
9855
9855
|
scrollbar-width: none;
|
9856
9856
|
-ms-overflow-style: none; }
|
9857
9857
|
|
9858
|
-
/* Firefox */
|
9859
9858
|
.hide-scrollbar-moz {
|
9860
9859
|
scrollbar-width: none; }
|
9861
9860
|
|
9862
|
-
/* WebKit */
|
9863
9861
|
.hide-scrollbar::-webkit-scrollbar {
|
9864
9862
|
width: 0px; }
|
9865
9863
|
|
@@ -24,10 +24,18 @@
|
|
24
24
|
}
|
25
25
|
|
26
26
|
/* hide the powered by */
|
27
|
-
.goog-logo-link {
|
28
|
-
|
29
|
-
|
27
|
+
.goog-logo-link {
|
28
|
+
display: none !important;
|
29
|
+
}
|
30
|
+
.goog-te-gadget {
|
31
|
+
height: 28px !important; overflow: hidden;
|
32
|
+
}
|
30
33
|
|
31
|
-
/*
|
32
|
-
|
33
|
-
|
34
|
+
/* hide the Google Translator TopBar (top frame) */
|
35
|
+
/* See: https://stackoverflow.com/questions/11248673/hiding-google-translate-bar */
|
36
|
+
body {
|
37
|
+
top: 0 !important;
|
38
|
+
}
|
39
|
+
body > .skiptranslate {
|
40
|
+
display: none;
|
41
|
+
}
|
@@ -12,4 +12,4 @@
|
|
12
12
|
# See: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
|
13
13
|
# -----------------------------------------------------------------------------
|
14
14
|
*/
|
15
|
-
#goog-gt-tt,.goog-te-balloon-frame{display:none!important}.goog-text-highlight{background:none!important;box-shadow:none!important}.goog-logo-link{display:none!important}.goog-te-gadget{height:28px!important;overflow:hidden}body{top:0!important}
|
15
|
+
#goog-gt-tt,.goog-te-balloon-frame{display:none !important}.goog-text-highlight{background:none !important;box-shadow:none !important}.goog-logo-link{display:none !important}.goog-te-gadget{height:28px !important;overflow:hidden}body{top:0 !important}body>.skiptranslate{display:none}
|
data/lib/j1/version.rb
CHANGED
data/lib/starter_web/Gemfile
CHANGED
@@ -79,7 +79,7 @@ gem 'j1-template', '~> 2023.0.0'
|
|
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.0.
|
82
|
+
# gem 'j1-template', '~> 2023.0.16'
|
83
83
|
#end
|
84
84
|
|
85
85
|
# ------------------------------------------------------------------------------
|
data/lib/starter_web/README.md
CHANGED
@@ -380,7 +380,7 @@ This command creates a **initial** project in folder **my-starter**.
|
|
380
380
|
2022-07-30 18:12:12 - GENERATE: Resolving dependencies...
|
381
381
|
2022-07-30 18:12:12 - GENERATE: Using bundler 2.3.7
|
382
382
|
...
|
383
|
-
2022-07-30 18:12:12 - GENERATE: Using j1-template 2023.0.
|
383
|
+
2022-07-30 18:12:12 - GENERATE: Using j1-template 2023.0.16
|
384
384
|
2022-07-30 18:12:12 - GENERATE: Bundle complete! 31 Gemfile dependencies, 78 gems now installed.
|
385
385
|
2022-07-30 18:12:12 - GENERATE: Bundled gems are installed into `../../.gem`
|
386
386
|
2022-07-30 18:12:12 - GENERATE: C:/Users/xxx/.gem/ruby/3.1.0;C:/DevTools/Ruby31-x64/lib/ruby/gems/3.1.0;
|
@@ -416,7 +416,7 @@ commands are available as well.
|
|
416
416
|
2022-07-30 18:17:48 - SETUP: Initialize the project ...
|
417
417
|
2022-07-30 18:17:48 - SETUP: Be patient, this will take a while ...
|
418
418
|
2022-07-30 18:17:49 - SETUP:
|
419
|
-
2022-07-30 18:17:49 - SETUP: > j1@2023.0.
|
419
|
+
2022-07-30 18:17:49 - SETUP: > j1@2023.0.16 setup C:\Users\xxx\j1-projects\my-starter
|
420
420
|
2022-07-30 18:17:49 - SETUP: > npm --silent run setup-start && npm --silent run setup-base && run-s -s setup:*
|
421
421
|
2022-07-30 18:17:49 - SETUP:
|
422
422
|
2022-07-30 18:17:50 - SETUP: Setup project for first use ..
|
@@ -461,7 +461,7 @@ browser. Let's start the journey ...
|
|
461
461
|
Check setup state of the J1 project ...
|
462
462
|
2022-07-30 18:26:18 - SITE: Starting up your site ...
|
463
463
|
2022-07-30 18:26:18 - SITE:
|
464
|
-
2022-07-30 18:26:18 - SITE: > j1@2023.0.
|
464
|
+
2022-07-30 18:26:18 - SITE: > j1@2023.0.16 j1-site C:\Users\jadams\j1-projects\my-starter
|
465
465
|
2022-07-30 18:26:18 - SITE: > run-p -s j1-site:*
|
466
466
|
2022-07-30 18:26:18 - SITE:
|
467
467
|
2022-07-30 18:26:20 - SITE: Startup UTILSRV ..
|
@@ -500,7 +500,7 @@ Check setup state of the J1 project ...
|
|
500
500
|
REBUILD: Rebuild the projects website ...
|
501
501
|
REBUILD: Be patient, this will take a while ...
|
502
502
|
2022-07-30 18:45:09 - REBUILD:
|
503
|
-
2022-07-30 18:45:09 - REBUILD: > j1@2023.0.
|
503
|
+
2022-07-30 18:45:09 - REBUILD: > j1@2023.0.16 rebuild C:\Users\xxx\j1-projects\my-starter
|
504
504
|
2022-07-30 18:45:09 - REBUILD: > run-s -s rebuild:* && run-s -s post-rebuild:*
|
505
505
|
2022-07-30 18:45:09 - REBUILD:
|
506
506
|
2022-07-30 18:45:10 - REBUILD: Rebuild site incremental ..
|
@@ -548,7 +548,7 @@ using Lerna for all packages:
|
|
548
548
|
2022-07-30 18:29:07 - RESET: Reset the project to factory state ...
|
549
549
|
2022-07-30 18:29:07 - RESET: Be patient, this will take a while ...
|
550
550
|
2022-07-30 18:29:08 - RESET:
|
551
|
-
2022-07-30 18:29:08 - RESET: > j1@2023.0.
|
551
|
+
2022-07-30 18:29:08 - RESET: > j1@2023.0.16 reset C:\Users\xxx\j1-projects\my-starter
|
552
552
|
2022-07-30 18:29:08 - RESET: > run-s -s reset:*
|
553
553
|
2022-07-30 18:29:08 - RESET:
|
554
554
|
2022-07-30 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.0.
|
56
|
+
version: 2023.0.16
|
57
57
|
|
58
58
|
# copyright
|
59
59
|
# ------------------------------------------------------------------------------
|
@@ -277,7 +277,6 @@ robots:
|
|
277
277
|
# ------------------------------------------------------------------------------
|
278
278
|
# BRAND configuration
|
279
279
|
# Set the brand image and favicon (located in /asset/images)
|
280
|
-
|
281
280
|
brand:
|
282
281
|
image: icons/j1/j1-512x512.png
|
283
282
|
image_height: 48px
|