j1-template 2021.1.12 → 2021.1.13
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/content_generator_app.html +1 -1
- data/_includes/themes/j1/layouts/content_generator_blog_archive.html +1 -1
- data/_includes/themes/j1/layouts/content_generator_collection.html +1 -1
- data/_includes/themes/j1/layouts/content_generator_page.html +4 -1
- data/_includes/themes/j1/layouts/content_generator_post.html +1 -1
- data/_includes/themes/j1/layouts/content_generator_raw.html +1 -1
- data/_includes/themes/j1/layouts/layout_metadata_generator.html +55 -0
- data/_includes/themes/j1/modules/connectors/comment/commento.html +31 -0
- data/_includes/themes/j1/modules/connectors/comment/custom-provider.html +7 -8
- data/_includes/themes/j1/modules/connectors/comment/disqus.html +12 -54
- data/_includes/themes/j1/modules/connectors/comment/facebook.html +7 -8
- data/_includes/themes/j1/modules/connectors/comment/hyvor.html +33 -0
- data/_includes/themes/j1/modules/connectors/comment/just-comments.html +31 -0
- data/_includes/themes/j1/modules/connectors/comments +3 -0
- data/_layouts/default.html +51 -0
- data/assets/data/disqus.js +81 -0
- data/assets/data/hyvor.js +72 -0
- data/assets/error_pages/HTTP204.html +2 -1
- data/assets/error_pages/HTTP400.html +2 -1
- data/assets/error_pages/HTTP401.html +2 -1
- data/assets/error_pages/HTTP403.html +2 -1
- data/assets/error_pages/HTTP404.html +2 -1
- data/assets/error_pages/HTTP444.html +93 -0
- data/assets/error_pages/HTTP500.html +2 -1
- data/assets/error_pages/HTTP501.html +2 -1
- data/assets/error_pages/HTTP502.html +2 -1
- data/assets/error_pages/HTTP503.html +2 -1
- data/assets/themes/j1/adapter/js/algolia.js +10 -10
- data/assets/themes/j1/adapter/js/asciidoctor.js +6 -6
- data/assets/themes/j1/adapter/js/attic.js +17 -17
- data/assets/themes/j1/adapter/js/bmd.js +6 -6
- data/assets/themes/j1/adapter/js/carousel.js +10 -10
- data/assets/themes/j1/adapter/js/clipboard.js +10 -10
- data/assets/themes/j1/adapter/js/cookieConsent.js +46 -20
- data/assets/themes/j1/adapter/js/fam.js +34 -34
- data/assets/themes/j1/adapter/js/framer.js +6 -6
- data/assets/themes/j1/adapter/js/j1.js +322 -209
- data/assets/themes/j1/adapter/js/justifiedGallery.js +11 -11
- data/assets/themes/j1/adapter/js/justifiedGalleryCustomizer.js +19 -19
- data/assets/themes/j1/adapter/js/lightbox.js +6 -6
- data/assets/themes/j1/adapter/js/logger.js +7 -7
- data/assets/themes/j1/adapter/js/mmenu.js +25 -25
- data/assets/themes/j1/adapter/js/navigator.js +48 -48
- data/assets/themes/j1/adapter/js/quicksearch.js +6 -6
- data/assets/themes/j1/adapter/js/rouge.js +7 -7
- data/assets/themes/j1/adapter/js/rtable.js +6 -6
- data/assets/themes/j1/adapter/js/themer.js +24 -20
- data/assets/themes/j1/adapter/js/toccer.js +9 -9
- data/assets/themes/j1/modules/backstretch/js/backstretch.js +3 -3
- data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js +27 -20
- data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.min.js +287 -1
- data/assets/themes/j1/modules/lunrSearch/js/quicksearch.js +1 -1
- data/assets/themes/j1/modules/themeSwitcher/js/switcher.js +19 -19
- data/lib/j1/version.rb +1 -1
- data/lib/starter_web/Gemfile +1 -1
- data/lib/starter_web/_config.yml +42 -24
- data/lib/starter_web/_data/j1_config.yml +22 -11
- data/lib/starter_web/_includes/attributes.asciidoc +1 -1
- data/lib/starter_web/_plugins/lunr_index.rb +1 -1
- data/lib/starter_web/index.html +3 -3
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/pages/public/asciidoc_skeletons/book/book.adoc +3 -0
- data/lib/starter_web/pages/public/asciidoc_skeletons/multi-document/multi.adoc +3 -0
- data/lib/starter_web/pages/public/asciidoc_skeletons/simple-document/simple.adoc +3 -0
- data/lib/starter_web/pages/public/blog/navigator/archive.html +4 -0
- data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html +4 -0
- data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html +4 -0
- data/lib/starter_web/pages/public/blog/navigator/archive/tagview.html +5 -1
- data/lib/starter_web/pages/public/blog/navigator/index.html +4 -0
- data/lib/starter_web/pages/public/cookieConsent.adoc +3 -0
- data/lib/starter_web/pages/public/learn/roundtrip/100_present_images.adoc +0 -1
- data/lib/starter_web/pages/public/learn/roundtrip/100_present_videos.adoc +2 -1
- data/lib/starter_web/pages/public/learn/roundtrip/200_typography.adoc +0 -2
- data/lib/starter_web/pages/public/learn/roundtrip/300_icon_fonts.adoc +0 -2
- data/lib/starter_web/pages/public/learn/roundtrip/400_asciidoc_extensions.adoc +0 -1
- data/lib/starter_web/pages/public/learn/roundtrip/410_bs_modals_extentions.adoc +0 -1
- data/lib/starter_web/pages/public/learn/roundtrip/420_responsive_tables_extensions.adoc +0 -1
- data/lib/starter_web/pages/public/learn/roundtrip/500_themes.adoc +0 -1
- data/lib/starter_web/pages/public/learn/roundtrip/600_quicksearch.adoc +0 -1
- data/lib/starter_web/pages/public/learn/where_to_go.adoc +0 -1
- data/lib/starter_web/pages/public/legal/en/100_copyright.adoc +3 -1
- data/lib/starter_web/pages/public/legal/en/200_impress.adoc +3 -1
- data/lib/starter_web/pages/public/legal/en/300_privacy.adoc +78 -17
- data/lib/starter_web/pages/public/legal/en/400_comment_policy.adoc +3 -1
- data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
- data/lib/starter_web/utilsrv/package.json +1 -1
- metadata +8 -3
- data/lib/starter_web/pages/public/learn/roundtrip/100_present_images.org.asciidoc +0 -244
@@ -154,7 +154,7 @@
|
|
154
154
|
//
|
155
155
|
if (docs.length > 0) {
|
156
156
|
var logger = log4javascript.getLogger("j1.searcher");
|
157
|
-
var log_text = 'cleanup tags and categories';
|
157
|
+
var log_text = '\n' + 'cleanup tags and categories';
|
158
158
|
logger.info(log_text);
|
159
159
|
$('.sr-tags').each(function() {
|
160
160
|
var sr_tags = $(this).html().replace(/^\s+(.*)(\s+·\s+$)/, "$1");
|
@@ -75,13 +75,13 @@
|
|
75
75
|
// ---------------------------------------------------------------------------
|
76
76
|
BootstrapThemeSwitcher.prototype = {
|
77
77
|
clear: function () {
|
78
|
-
logger.debug('bootstrapThemeSwitcher.clear');
|
78
|
+
logger.debug('\n' + 'bootstrapThemeSwitcher.clear');
|
79
79
|
return this.$element.each(function () {
|
80
80
|
this.$element.empty();
|
81
81
|
});
|
82
82
|
},
|
83
83
|
update: function () {
|
84
|
-
logger.debug('bootstrapThemeSwitcher.update');
|
84
|
+
logger.debug('\n' + 'bootstrapThemeSwitcher.update');
|
85
85
|
this.getThemes();
|
86
86
|
},
|
87
87
|
|
@@ -125,10 +125,10 @@
|
|
125
125
|
// detect|set user state cookie
|
126
126
|
user_state_detected = j1.existsCookie ( 'j1.user.state' );
|
127
127
|
if ( user_state_detected ) {
|
128
|
-
logger.debug('cookie found: j1.user.state');
|
128
|
+
logger.debug('\n' + 'cookie found: j1.user.state');
|
129
129
|
j1_user_state = j1.readCookie(user_state_cookie_name);
|
130
130
|
} else {
|
131
|
-
logger.error('cookie not found: j1.user.state');
|
131
|
+
logger.error('\n' + 'cookie not found: j1.user.state');
|
132
132
|
}
|
133
133
|
|
134
134
|
themeName = j1_user_state.theme_name;
|
@@ -141,7 +141,7 @@
|
|
141
141
|
if (settings.saveToCookie) {
|
142
142
|
if ( typeof Cookies === 'undefined' ) {
|
143
143
|
if ( debug === 'true' ) {
|
144
|
-
logger.error('cookies library not present');
|
144
|
+
logger.error('\n' + 'cookies library not present');
|
145
145
|
}
|
146
146
|
return false;
|
147
147
|
}
|
@@ -165,8 +165,8 @@
|
|
165
165
|
// reload current page (skip cache)
|
166
166
|
location.reload(true);
|
167
167
|
} else {
|
168
|
-
logger.warn('write to cookie : disabled');
|
169
|
-
logger.warn('selected theme not activated: ' + name);
|
168
|
+
logger.warn('\n' + 'write to cookie : disabled');
|
169
|
+
logger.warn('\n' + 'selected theme not activated: ' + name);
|
170
170
|
} // END if saveToCookie
|
171
171
|
|
172
172
|
}, // END switchTheme
|
@@ -177,7 +177,7 @@
|
|
177
177
|
loadThemeFromCookie: function (options) {
|
178
178
|
|
179
179
|
if ( typeof Cookies === 'undefined' ) {
|
180
|
-
logger.error('cookies library not present');
|
180
|
+
logger.error('\n' + 'cookies library not present');
|
181
181
|
return false;
|
182
182
|
}
|
183
183
|
|
@@ -187,10 +187,10 @@
|
|
187
187
|
user_state_detected = j1.existsCookie ( 'j1.user.state' );
|
188
188
|
|
189
189
|
if ( user_state_detected ) {
|
190
|
-
logger.info('cookie found: j1.user.state');
|
190
|
+
logger.info('\n' + 'cookie found: j1.user.state');
|
191
191
|
j1_user_state = j1.readCookie(user_state_cookie_name);
|
192
192
|
} else {
|
193
|
-
logger.error('cookie not found: j1.user.state');
|
193
|
+
logger.error('\n' + 'cookie not found: j1.user.state');
|
194
194
|
}
|
195
195
|
|
196
196
|
var themeName = j1_user_state.theme_name;
|
@@ -214,11 +214,11 @@
|
|
214
214
|
// -------------------------------------------------------------------------
|
215
215
|
addThemesToControl: function() {
|
216
216
|
if (typeof this.$element === 'undefined') {
|
217
|
-
logger.error('bootstrapThemeSelector|addThemesToControl: Element is undefined');
|
217
|
+
logger.error('\n' + 'bootstrapThemeSelector|addThemesToControl: Element is undefined');
|
218
218
|
return false;
|
219
219
|
}
|
220
220
|
if (typeof this.themesList === 'undefined') {
|
221
|
-
logger.error('bootstrapThemeSelector|addThemesToControl: Themes is undefined');
|
221
|
+
logger.error('\n' + 'bootstrapThemeSelector|addThemesToControl: Themes is undefined');
|
222
222
|
return false;
|
223
223
|
}
|
224
224
|
|
@@ -256,16 +256,16 @@
|
|
256
256
|
// detect|set user state cookie
|
257
257
|
user_state_detected = j1.existsCookie ( 'j1.user.state' );
|
258
258
|
if ( user_state_detected ) {
|
259
|
-
logger.debug('
|
259
|
+
logger.debug('\n' + 'user state cookie found');
|
260
260
|
j1_user_state = j1.readCookie(user_state_cookie_name);
|
261
261
|
} else {
|
262
|
-
logger.error('
|
262
|
+
logger.error('\n' + 'user state NOT cookie found');
|
263
263
|
}
|
264
264
|
|
265
265
|
themeName = j1_user_state.theme_name;
|
266
266
|
|
267
267
|
if ( debug === 'true' ) {
|
268
|
-
logger.debug('bootstrapThemeSelector: UL element selected');
|
268
|
+
logger.debug('\n' + 'bootstrapThemeSelector: UL element selected');
|
269
269
|
}
|
270
270
|
this.$element.empty();
|
271
271
|
|
@@ -305,7 +305,7 @@
|
|
305
305
|
});
|
306
306
|
|
307
307
|
} else if (this.$element.is('select')) {
|
308
|
-
logger.debug('bootstrapThemeSelector: SELECT element selected');
|
308
|
+
logger.debug('\n' + 'bootstrapThemeSelector: SELECT element selected');
|
309
309
|
this.$element.empty();
|
310
310
|
|
311
311
|
var optionSelectedMarker;
|
@@ -327,8 +327,8 @@
|
|
327
327
|
|
328
328
|
} else {
|
329
329
|
// no container found to add Theme list
|
330
|
-
logger.info('bootstrapThemeSelector: no UL or SELECT element found');
|
331
|
-
logger.error('bootstrapThemeSelector: failed');
|
330
|
+
logger.info('\n' + 'bootstrapThemeSelector: no UL or SELECT element found');
|
331
|
+
logger.error('\n' + 'bootstrapThemeSelector: failed');
|
332
332
|
// console.warn('bootstrapThemeSelector only works with ul or select elements');
|
333
333
|
}
|
334
334
|
}, // END addThemesToControl
|
@@ -351,7 +351,7 @@
|
|
351
351
|
base.addThemesToControl();
|
352
352
|
},
|
353
353
|
error: function (jqXHR, textStatus, errorThrown) {
|
354
|
-
logger.error('
|
354
|
+
logger.error('\n' + 'failed to retrieve the local feed from: \'' + base.settings.localFeed + '\'');
|
355
355
|
}
|
356
356
|
});
|
357
357
|
} else {
|
data/lib/j1/version.rb
CHANGED
data/lib/starter_web/Gemfile
CHANGED
@@ -54,7 +54,7 @@ gem 'jekyll', '~> 4.2'
|
|
54
54
|
|
55
55
|
# Theme Rubies, default: J1 Template (NOT used for the development system)
|
56
56
|
#
|
57
|
-
gem 'j1-template', '~> 2021.1.
|
57
|
+
gem 'j1-template', '~> 2021.1.13'
|
58
58
|
|
59
59
|
# ------------------------------------------------------------------------------
|
60
60
|
# 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.13
|
57
57
|
|
58
58
|
# version
|
59
59
|
# ------------------------------------------------------------------------------
|
@@ -597,9 +597,13 @@ defaults:
|
|
597
597
|
index: false
|
598
598
|
follow: false
|
599
599
|
|
600
|
-
|
600
|
+
personalization: false
|
601
|
+
|
602
|
+
analytics: true
|
603
|
+
comments: true
|
601
604
|
advertising: false
|
602
|
-
|
605
|
+
youtube: true
|
606
|
+
vimeo: true
|
603
607
|
|
604
608
|
toc: true
|
605
609
|
fam_menu_id: page_ctrl_simple
|
@@ -625,7 +629,7 @@ defaults:
|
|
625
629
|
# PUBLIC - FEATURED
|
626
630
|
#
|
627
631
|
- scope:
|
628
|
-
path: posts/public/featured
|
632
|
+
path: posts/public/featured
|
629
633
|
type: posts
|
630
634
|
|
631
635
|
values:
|
@@ -636,9 +640,13 @@ defaults:
|
|
636
640
|
index: false
|
637
641
|
follow: false
|
638
642
|
|
639
|
-
|
643
|
+
personalization: false
|
644
|
+
|
645
|
+
analytics: true
|
646
|
+
comments: true
|
640
647
|
advertising: false
|
641
|
-
|
648
|
+
youtube: true
|
649
|
+
vimeo: true
|
642
650
|
|
643
651
|
series: false
|
644
652
|
|
@@ -647,13 +655,13 @@ defaults:
|
|
647
655
|
scrollbar: false
|
648
656
|
|
649
657
|
icons:
|
650
|
-
|
658
|
+
category-icon: false # comment-text-outline
|
651
659
|
family: MDI
|
652
660
|
color: md-blue
|
653
661
|
size: 5x
|
654
662
|
|
655
663
|
images:
|
656
|
-
|
664
|
+
category-image: false # img26.jpg
|
657
665
|
dir: /assets/images/collections/blog/featured
|
658
666
|
|
659
667
|
resource_options:
|
@@ -665,7 +673,7 @@ defaults:
|
|
665
673
|
#
|
666
674
|
- scope:
|
667
675
|
type: posts
|
668
|
-
path: posts/public/series
|
676
|
+
path: posts/public/series
|
669
677
|
|
670
678
|
values:
|
671
679
|
layout: post
|
@@ -675,24 +683,22 @@ defaults:
|
|
675
683
|
index: false
|
676
684
|
follow: false
|
677
685
|
|
678
|
-
|
679
|
-
advertising: false
|
680
|
-
comments: false
|
686
|
+
personalization: false
|
681
687
|
|
682
|
-
|
683
|
-
|
684
|
-
|
685
|
-
|
686
|
-
|
688
|
+
analytics: true
|
689
|
+
comments: true
|
690
|
+
advertising: false
|
691
|
+
youtube: true
|
692
|
+
vimeo: true
|
687
693
|
|
688
694
|
icons:
|
689
|
-
|
695
|
+
category-icon: false # dots-horizontal-circle
|
690
696
|
family: MDI
|
691
697
|
color: md-indigo
|
692
698
|
size: 5x
|
693
699
|
|
694
700
|
images:
|
695
|
-
|
701
|
+
category-image: false # img26.jpg
|
696
702
|
dir: /assets/images/collections/blog/series
|
697
703
|
|
698
704
|
# ----------------------------------------------------------------------------
|
@@ -700,7 +706,7 @@ defaults:
|
|
700
706
|
#
|
701
707
|
- scope:
|
702
708
|
type: posts
|
703
|
-
path: posts/public/wikipedia
|
709
|
+
path: posts/public/wikipedia
|
704
710
|
|
705
711
|
values:
|
706
712
|
layout: post
|
@@ -710,9 +716,13 @@ defaults:
|
|
710
716
|
index: false
|
711
717
|
follow: false
|
712
718
|
|
713
|
-
|
714
|
-
|
719
|
+
personalization: false
|
720
|
+
|
721
|
+
analytics: true
|
715
722
|
comments: false
|
723
|
+
advertising: false
|
724
|
+
youtube: false
|
725
|
+
vimeo: false
|
716
726
|
|
717
727
|
series: false
|
718
728
|
|
@@ -721,13 +731,13 @@ defaults:
|
|
721
731
|
scrollbar: false
|
722
732
|
|
723
733
|
icons:
|
724
|
-
|
734
|
+
category-icon: false # wikipedia
|
725
735
|
family: MDI
|
726
736
|
color: md-indigo
|
727
737
|
size: 5x
|
728
738
|
|
729
739
|
images:
|
730
|
-
category-image:
|
740
|
+
category-image: false
|
731
741
|
dir: /assets/images/collections/blog/wikipedia
|
732
742
|
|
733
743
|
# ----------------------------------------------------------------------------
|
@@ -749,6 +759,14 @@ defaults:
|
|
749
759
|
index: false
|
750
760
|
follow: false
|
751
761
|
|
762
|
+
personalization: false
|
763
|
+
|
764
|
+
analytics: false
|
765
|
+
comments: false
|
766
|
+
advertising: false
|
767
|
+
youtube: false
|
768
|
+
vimeo: false
|
769
|
+
|
752
770
|
# ==============================================================================
|
753
771
|
# 6. LAYOUT configuration
|
754
772
|
#
|
@@ -384,19 +384,30 @@ body:
|
|
384
384
|
# ------------------------------------------------------------------------------
|
385
385
|
comments:
|
386
386
|
enabled: false
|
387
|
-
|
387
|
+
|
388
|
+
xhr_data_path: /assets/data
|
389
|
+
provider: hyvor # hyvor | disqus
|
388
390
|
|
389
|
-
|
390
|
-
|
391
|
-
|
392
|
-
# facebook: # currently NOT supported
|
393
|
-
# appid: 123
|
394
|
-
# num_posts: 5
|
395
|
-
# width: 580
|
396
|
-
# colorscheme: light
|
391
|
+
hyvor:
|
392
|
+
site_id: 'hyvor-site-id'
|
397
393
|
|
398
|
-
|
399
|
-
|
394
|
+
disqus:
|
395
|
+
site_id: '<your-site-short-name>'
|
396
|
+
|
397
|
+
# commento: # currently NOT supported
|
398
|
+
# site_id: 'commento-site-id'
|
399
|
+
#
|
400
|
+
# just-comments: # currently NOT supported
|
401
|
+
# site_id: 'just-comments-site-id'
|
402
|
+
|
403
|
+
# facebook: # currently NOT supported
|
404
|
+
# appid: 'facebook-app-id'
|
405
|
+
# num_posts: 5
|
406
|
+
# width: 580
|
407
|
+
# colorscheme: light
|
408
|
+
|
409
|
+
# custom: # currently NOT supported
|
410
|
+
# custom_data:
|
400
411
|
|
401
412
|
# ------------------------------------------------------------------------------
|
402
413
|
# ANALYTICS settings
|
@@ -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.13
|
416
416
|
:j1--site-name: Jekyll One
|
417
417
|
end::products[]
|
418
418
|
|
data/lib/starter_web/index.html
CHANGED