j1-template 2021.1.1 → 2021.1.6
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 +23 -9
- data/_includes/themes/j1/modules/connectors/ad/google-adsense.html +1 -1
- data/_includes/themes/j1/modules/connectors/ads +3 -5
- data/_includes/themes/j1/modules/connectors/analytic/google-analytics.html +9 -5
- data/_includes/themes/j1/modules/connectors/analytics +4 -2
- data/_includes/themes/j1/modules/connectors/comments +7 -6
- data/_includes/themes/j1/modules/connectors/translator +3 -4
- data/_includes/themes/j1/modules/navigator/generator.html +4 -40
- data/_includes/themes/j1/modules/navigator/procedures/topsearch.proc +2 -2
- data/_includes/themes/j1/procedures/global/create_bs_button.proc +64 -22
- data/_includes/themes/j1/procedures/posts/collate_timeline.proc +14 -10
- data/_layouts/default.html +4 -7
- data/assets/data/authclient.html +231 -229
- data/assets/data/banner.html +30 -32
- data/assets/data/cookieconsent.html +249 -0
- data/assets/data/fam.html +1 -1
- data/assets/data/footer.html +1 -1
- data/assets/data/gallery_customizer.html +10 -5
- data/assets/data/menu.html +3 -3
- data/assets/data/mmenu.html +4 -3
- data/assets/data/mmenu_sidebar.html +1 -1
- data/assets/data/mmenu_toc.html +1 -1
- data/assets/data/panel.html +20 -16
- data/assets/data/quicklinks.html +20 -18
- data/assets/data/themes.json +6 -6
- data/assets/themes/j1/adapter/js/{cookiebar.js → cookieConsent.js} +129 -55
- data/assets/themes/j1/adapter/js/j1.js +147 -145
- data/assets/themes/j1/adapter/js/justifiedGalleryCustomizer.js +3 -2
- data/assets/themes/j1/adapter/js/mmenu.js +8 -4
- data/assets/themes/j1/adapter/js/navigator.js +77 -22
- data/assets/themes/j1/adapter/js/themer.js +37 -29
- data/assets/themes/j1/adapter/js/toccer.js +4 -45
- data/assets/themes/j1/core/css/themes/uno-dark/bootstrap.css +17 -14
- data/assets/themes/j1/core/css/themes/uno-dark/bootstrap.min.css +1 -1
- data/assets/themes/j1/core/css/themes/uno-light/bootstrap.css +3960 -240
- data/assets/themes/j1/core/css/themes/uno-light/bootstrap.min.css +1 -1
- data/assets/themes/j1/core/js/template.js +3 -9
- data/assets/themes/j1/core/js/template.js.map +1 -1
- data/assets/themes/j1/core/js/template.min.js +3 -9
- data/assets/themes/j1/core/js/template.min.js.map +1 -1
- data/assets/themes/j1/modules/cookieConsent/LICENSE +21 -0
- data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js +286 -0
- data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.min.js +28 -0
- data/assets/themes/j1/modules/fam/css/{uno → theme/uno}/fam.css +0 -0
- data/assets/themes/j1/modules/fam/css/theme/uno/fam.min.css +15 -0
- data/assets/themes/j1/modules/fam/js/fam.js +1 -6
- data/assets/themes/j1/modules/iframeResizer/examples/frame.absolute.html +4 -2
- data/assets/themes/j1/modules/iframeResizer/examples/frame.content.html +4 -3
- data/assets/themes/j1/modules/iframeResizer/examples/frame.hover.html +4 -2
- data/assets/themes/j1/modules/iframeResizer/examples/frame.nested.html +4 -2
- data/assets/themes/j1/modules/iframeResizer/examples/frame.textarea.html +4 -2
- data/assets/themes/j1/modules/iframeResizer/examples/frame.tolerance.html +4 -2
- data/assets/themes/j1/modules/iframeResizer/examples/index.html +2 -0
- data/assets/themes/j1/modules/iframeResizer/examples/two.html +4 -2
- data/assets/themes/j1/modules/mmenuLight/css/{mmenu.css → mmenu-light.css} +0 -0
- data/assets/themes/j1/modules/mmenuLight/css/{mmenu.min.css → mmenu-light.min.css} +0 -0
- data/assets/themes/j1/modules/mmenuLight/css/theme/{uno.css → uno/mmenu.css} +0 -0
- data/assets/themes/j1/modules/mmenuLight/css/theme/{uno.min.css → uno/mmenu.min.css} +0 -0
- data/assets/themes/j1/modules/rtable/css/theme/{uno.css → uno/rtable.css} +0 -0
- data/assets/themes/j1/modules/rtable/css/theme/{uno.min.css → uno/rtable.min.css} +0 -0
- data/assets/themes/j1/modules/themeSwitcher/js/switcher.js +33 -47
- data/assets/themes/j1/modules/themeSwitcher/js/switcher.min.js +410 -2
- data/assets/themes/j1/modules/util/js/domready.js +146 -0
- data/assets/themes/j1/modules/util/js/gtag-opt-in.js +1 -0
- data/lib/j1/version.rb +1 -1
- data/lib/j1_app/j1_auth_manager/auth_manager.rb +2 -3
- data/lib/starter_web/Gemfile +1 -1
- data/lib/starter_web/_config.yml +8 -7
- data/lib/starter_web/_data/_defaults/resources.yml +11 -8
- data/lib/starter_web/_data/apps/defaults/justifiedGalleryCustomizer.yml +1 -0
- data/lib/starter_web/_data/blocks/banner.yml +30 -24
- data/lib/starter_web/_data/blocks/panel.yml +9 -7
- data/lib/starter_web/_data/builder/blog_navigator.yml +6 -1
- data/lib/starter_web/_data/j1_config.yml +22 -19
- data/lib/starter_web/_data/layouts/blog_archive.yml +9 -0
- data/lib/starter_web/_data/layouts/default.yml +17 -27
- data/lib/starter_web/_data/layouts/home.yml +6 -5
- data/lib/starter_web/_data/layouts/page.yml +1 -1
- data/lib/starter_web/_data/modules/{cookiebar.yml → cookieconsent.yml} +4 -4
- data/lib/starter_web/_data/modules/defaults/authentication.yml +1 -0
- data/lib/starter_web/_data/modules/defaults/cookieconsent.yml +135 -0
- data/lib/starter_web/_data/modules/defaults/navigator.yml +5 -2
- data/lib/starter_web/_data/modules/defaults/themer.yml +2 -1
- data/lib/starter_web/_data/modules/navigator.yml +24 -21
- data/lib/starter_web/_data/modules/navigator_menu.yml +1 -1
- data/lib/starter_web/_data/pages/builder.yml +7 -7
- data/lib/starter_web/_data/private.default.yml +119 -0
- data/lib/starter_web/_data/private.yml +6 -6
- data/lib/starter_web/_data/resources.yml +19 -15
- data/lib/starter_web/_includes/attributes.asciidoc +10 -1
- data/lib/starter_web/_plugins/lunr_index.rb +1 -1
- data/lib/starter_web/assets/images/modules/attics/christa-dodoo-1920x1280.jpg +0 -0
- data/lib/starter_web/assets/images/modules/attics/{cookies-1920x1200-bw.jpg → cookies-1920x1200.jpg} +0 -0
- data/lib/starter_web/assets/images/modules/attics/lianhao-1920x1280.jpg +0 -0
- data/lib/starter_web/collections/posts/public/featured/_posts/0000-00-00-welcome-to-j1.adoc.erb +3 -9
- data/lib/starter_web/collections/posts/public/featured/_posts/2020-01-01-about-cookies.adoc +4 -4
- data/lib/starter_web/collections/posts/public/featured/_posts/2021-03-01-site-generators.adoc +1 -7
- data/lib/starter_web/collections/posts/public/featured/_posts/2021-03-03-about-j1.adoc +2 -7
- data/lib/starter_web/collections/posts/public/series/_posts/2020-01-01-post-test-series.adoc +0 -4
- data/lib/starter_web/collections/posts/public/series/_posts/2020-01-02-post-test-series.adoc +0 -4
- data/lib/starter_web/collections/posts/public/series/_posts/2020-01-03-post-test-series.adoc +0 -4
- data/lib/starter_web/collections/posts/public/series/_posts/2020-01-04-post-test-series.adoc +0 -4
- data/lib/starter_web/collections/posts/public/wikipedia/_posts/2016-11-20-minneapolis.adoc +3 -0
- data/lib/starter_web/collections/posts/public/wikipedia/_posts/2016-11-24-narcisse-snake-dens.adoc +3 -0
- data/lib/starter_web/collections/posts/public/wikipedia/_posts/2016-11-26-columbia-river.adoc +3 -0
- data/lib/starter_web/dot.gitignore +1 -1
- data/lib/starter_web/index.html +3 -3
- data/lib/starter_web/package.json +1 -1
- data/lib/starter_web/pages/public/blog/navigator/archive.html +43 -23
- data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html +51 -27
- data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html +48 -26
- data/lib/starter_web/pages/public/blog/navigator/archive/tagview.html +44 -12
- data/lib/starter_web/pages/public/blog/navigator/index.html +1 -1
- data/lib/starter_web/pages/public/cookieConsent.adoc +93 -0
- data/lib/starter_web/pages/public/learn/roundtrip/100_present_images.org.asciidoc +244 -0
- data/lib/starter_web/pages/public/learn/roundtrip/400_asciidoc_extensions.adoc +2 -1
- data/lib/starter_web/pages/public/learn/where_to_go.adoc +0 -16
- data/lib/starter_web/pages/public/legal/en/300_privacy.adoc +104 -209
- data/lib/starter_web/pages/public/panels/intro_panel/panel.adoc +6 -1
- data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
- data/lib/starter_web/utilsrv/package.json +1 -1
- metadata +25 -14
- data/assets/data/cookiebar.html +0 -285
- data/lib/starter_web/_data/modules/defaults/cookiebar.yml +0 -132
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a5ceecb6b421d85c3db86a44fba73d25650012ace9626b1a53ff082d16a61e9e
|
4
|
+
data.tar.gz: 7093783266335d7524f406c452bff71b8a9979f0b9d172c7025c01f9559ffc36
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a63666eeb929986759194324a01d601aec108c9f5f1716326668786779d84db989d97adfe02c40ef065faf54fb13743f900dca24e6934c4988e0c8110802ba3f
|
7
|
+
data.tar.gz: f702196b47569beb2d080ddcc75db8c4d4e7a3512a03d6bd291937d5a88167e7343dff4ac2a984978d269c42685b6766cb08ebca40aa74c0cbd35b3e63aa4183
|
@@ -128,33 +128,47 @@
|
|
128
128
|
|
129
129
|
{% comment %} Check robot settings from site configuration
|
130
130
|
-------------------------------------------------------------------------------- {% endcomment %}
|
131
|
-
|
131
|
+
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [ Check robot settings from SITE configuration ] -->
|
132
|
+
{% if site.robots.index and site.robots.index <> nil %}
|
133
|
+
<!-- [DEBUG ] [j1.layout.meta_data_generator.html ] [ Found SITE configuration robots_index: {{site.robots.index}} ] -->
|
132
134
|
{% capture robots_index %}<meta name="robots" content="index" />{% endcapture %}
|
133
135
|
{% else %}
|
136
|
+
<!-- [DEBUG ] [j1.layout.meta_data_generator.html ] [ Set DEFAULT configuration robots_index: noindex ] -->
|
134
137
|
{% capture robots_index %}<meta name="robots" content="noindex" />{% endcapture %}
|
135
138
|
{% endif %}
|
136
139
|
|
137
|
-
{% if site.robots.follow %}
|
140
|
+
{% if site.robots.follow and site.robots.follow <> nil %}
|
141
|
+
<!-- [DEBUG ] [j1.layout.meta_data_generator.html ] [ Found SITE configuration robots_follow: {{site.robots.index}} ] -->
|
138
142
|
{% capture robots_follow %}<meta name="robots" content="follow" />{% endcapture %}
|
139
143
|
{% else %}
|
144
|
+
<!-- [DEBUG ] [j1.layout.meta_data_generator.html ] [ Set DEFAULT configuration robots_follow: nofollow ] -->
|
140
145
|
{% capture robots_follow %}<meta name="robots" content="nofollow" />{% endcapture %}
|
141
146
|
{% endif %}
|
142
147
|
|
148
|
+
{% comment %} page.robots.index: {{ page.robots.index | debug }} {% endcomment %}
|
149
|
+
|
143
150
|
{% comment %} Check robot settings from page (or default SCOPE)
|
144
151
|
-------------------------------------------------------------------------------- {% endcomment %}
|
152
|
+
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [ Check robot settings from PAGE configuration ] -->
|
153
|
+
<!-- [DEBUG ] [j1.layout.meta_data_generator.html ] [ Found PAGE configuration robots_index: {{page.robots.index}} ] -->
|
154
|
+
<!-- [DEBUG ] [j1.layout.meta_data_generator.html ] [ Found PAGE configuration robots_follow: {{page.robots.follow}} ] -->
|
145
155
|
{% if page.robots.index %}
|
146
|
-
{% capture robots_index %}<meta name="robots" content="index"
|
147
|
-
{%
|
148
|
-
|
156
|
+
{% capture robots_index %}<meta name="robots" content="index" />{% endcapture %}
|
157
|
+
{% endif %}
|
158
|
+
|
159
|
+
{% if page.robots.index == false %}
|
160
|
+
{% capture robots_index %}<meta name="robots" content="noindex" />{% endcapture %}
|
149
161
|
{% endif %}
|
150
162
|
|
151
163
|
{% if page.robots.follow %}
|
152
|
-
{% capture robots_follow %}<meta name="robots" content="follow"
|
153
|
-
{%
|
154
|
-
|
164
|
+
{% capture robots_follow %}<meta name="robots" content="follow" />{% endcapture %}
|
165
|
+
{% endif %}
|
166
|
+
|
167
|
+
{% if page.robots.follow == false %}
|
168
|
+
{% capture robots_follow %}<meta name="robots" content="nofollow" />{% endcapture %}
|
155
169
|
{% endif %}
|
156
170
|
|
157
|
-
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [
|
171
|
+
<!-- [INFO ] [j1.layout.meta_data_generator.html ] [ Place detected/overloaded meta tags for robots ] -->
|
158
172
|
{{robots_index}}
|
159
173
|
{{robots_follow}}
|
160
174
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
{% comment %}
|
2
2
|
# -----------------------------------------------------------------------------
|
3
3
|
# ~/_includes/themes/j1/procedures/provider/ad/google-adsense.html
|
4
|
-
# Support of
|
4
|
+
# Support of advertising provider Google Adsense for J1 Template
|
5
5
|
#
|
6
6
|
# Product/Info:
|
7
7
|
# http://jekyll.one
|
@@ -24,16 +24,14 @@
|
|
24
24
|
{% assign advertising = site.data.j1_config.advertising.enabled %}
|
25
25
|
{% assign advertising_provider = site.data.j1_config.advertising.provider %}
|
26
26
|
|
27
|
-
|
28
27
|
{% comment %} Main
|
29
28
|
-------------------------------------------------------------------------------- {% endcomment %}
|
30
|
-
<!-- [INFO ] [j1.modules.connectors.ads ] [ detected advertising (
|
29
|
+
<!-- [INFO ] [j1.modules.connectors.ads ] [ detected advertising (j1_config): {{advertising}} ] -->
|
31
30
|
<!-- [INFO ] [j1.modules.connectors.ads ] [ detected advertising (page): {{page.advertising}}} ] -->
|
32
|
-
<!-- [INFO ] [j1.modules.connectors.ads ] [ detected advertising (provider): {{advertising_provider}}} ] -->
|
33
|
-
<!-- [INFO ] [j1.modules.connectors.ads ] [ start processing load region head, layout: {{page.layout}} ] -->
|
34
31
|
|
35
32
|
{% if advertising and page.advertising %}
|
36
|
-
|
33
|
+
<!-- [INFO ] [j1.modules.connectors.ads ] [ detected advertising provider (j1_config): {{advertising_provider}}} ] -->
|
34
|
+
<!-- [INFO ] [j1.modules.connectors.ads ] [ start processing load region head, layout: {{page.layout}} ] -->
|
37
35
|
{% case advertising_provider %}
|
38
36
|
{% when "google" %}
|
39
37
|
<!-- [INFO ] [j1.modules.connectors.ads ] [ place provider: Google Adsense ] -->
|
@@ -1,7 +1,7 @@
|
|
1
1
|
{% comment %}
|
2
2
|
# -----------------------------------------------------------------------------
|
3
3
|
# ~/_includes/themes/j1/modules/connectors/analytic/google-analytics.html
|
4
|
-
# Support of
|
4
|
+
# Support of analytics provider Google Analytics for J1 Template
|
5
5
|
#
|
6
6
|
# Product/Info:
|
7
7
|
# http://jekyll.one
|
@@ -21,16 +21,20 @@
|
|
21
21
|
|
22
22
|
{% comment %} Variables
|
23
23
|
-------------------------------------------------------------------------------- {% endcomment %}
|
24
|
-
{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id
|
24
|
+
{% assign tracking_id = site.data.j1_config.analytics.google.tracking_id %}
|
25
25
|
|
26
26
|
{% comment %} Main
|
27
27
|
-------------------------------------------------------------------------------- {% endcomment %}
|
28
28
|
|
29
|
-
|
29
|
+
|
30
|
+
<!-- Google Analytics: load the GA library -->
|
30
31
|
<script async src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>
|
31
|
-
|
32
|
+
<!-- Google Analytics: GA cookies disabled by default -->
|
33
|
+
<!-- GA cookies disabled by default -->
|
34
|
+
<!-- GA depends on the cookie consent and is enabled/disabled on OptIn/Out-->
|
35
|
+
<!--script>
|
32
36
|
window.dataLayer = window.dataLayer || [];
|
33
37
|
function gtag(){dataLayer.push(arguments);}
|
34
38
|
gtag('js', new Date());
|
35
39
|
gtag('config', '{{tracking_id}}');
|
36
|
-
</script
|
40
|
+
</script-->
|
@@ -27,10 +27,12 @@
|
|
27
27
|
|
28
28
|
{% comment %} Main
|
29
29
|
-------------------------------------------------------------------------------- {% endcomment %}
|
30
|
+
<!-- [INFO ] [j1.modules.connectors.analytics ] [ detected analytics (j1_config): {{analytics}} ] -->
|
31
|
+
<!-- [INFO ] [j1.modules.connectors.analytics ] [ detected analytics (page): {{page.analytics}}} ] -->
|
30
32
|
|
31
|
-
<!-- [INFO ] [j1.modules.connectors.analytics ] [ start processing load region head, layout: {{page.layout}} ] -->
|
32
33
|
{% if analytics and page.analytics %}
|
33
|
-
|
34
|
+
<!-- [INFO ] [j1.modules.connectors.analytics ] [ detected analytics provider (j1_config): {{analytics_provider}}} ] -->
|
35
|
+
<!-- [INFO ] [j1.modules.connectors.analytics ] [ start processing load region head, layout: {{page.layout}} ] -->
|
34
36
|
{% case analytics_provider %}
|
35
37
|
{% when "google" %}
|
36
38
|
<!-- [INFO ] [j1.modules.connectors.analytics ] [ place Google Analytics ] -->
|
@@ -26,21 +26,22 @@
|
|
26
26
|
|
27
27
|
{% comment %} Main
|
28
28
|
-------------------------------------------------------------------------------- {% endcomment %}
|
29
|
+
<!-- [INFO ] [j1.modules.connectors.comments ] [ detected comments (j1_config): {{comments}} ] -->
|
30
|
+
<!-- [INFO ] [j1.modules.connectors.comments ] [ detected comments (page): {{page.comments}}} ] -->
|
29
31
|
|
30
|
-
<!-- [INFO ] [j1.layout.connectors.comments ] [ start processing load region head, layout: {{page.layout}} ] -->
|
31
32
|
{% if comments and page.comments %}
|
32
|
-
|
33
|
+
<!-- [INFO ] [j1.modules.connectors.comments ] [ start processing load region head, layout: {{page.layout}} ] -->
|
33
34
|
{% case comment_provider %}
|
34
35
|
{% when "disqus" %}
|
35
|
-
<!-- [INFO ] [j1.
|
36
|
+
<!-- [INFO ] [j1.modules.connectors.comments ] [ place comment provider DISQUS ] -->
|
36
37
|
{% include themes/{{site.template.name}}/modules/connectors/comment/disqus.html %}
|
37
38
|
{% when "facebook" %}
|
38
|
-
<!-- [INFO ] [j1.
|
39
|
+
<!-- [INFO ] [j1.modules.connectors.comments ] [ place comment provider FACEBOOK ] -->
|
39
40
|
{% include themes/{{site.template.name}}/procedures/provider/comment/facebook.html %}
|
40
41
|
{% when "custom" %}
|
41
|
-
<!-- [INFO ] [j1.
|
42
|
+
<!-- [INFO ] [j1.modules.connectors.comments ] [ place comment provider CUSTOM ] -->
|
42
43
|
{% include themes/{{site.template.name}}/procedures/provider/comment/custom-provider.html %}
|
43
44
|
{% endcase %}
|
44
45
|
|
45
46
|
{% endif %}
|
46
|
-
<!-- [INFO ] [j1.
|
47
|
+
<!-- [INFO ] [j1.modules.connectors.comments ] [ end processing ] -->
|
@@ -24,13 +24,13 @@
|
|
24
24
|
{% assign translation = site.data.j1_config.translation.enabled %}
|
25
25
|
{% assign translation_provider = site.data.j1_config.translation.provider %}
|
26
26
|
|
27
|
-
|
28
27
|
{% comment %} Main
|
29
28
|
-------------------------------------------------------------------------------- {% endcomment %}
|
29
|
+
<!-- [INFO ] [j1.modules.connectors.translation ] [ detected translation (j1_config): {{translation}} ] -->
|
30
|
+
<!-- [INFO ] [j1.modules.connectors.translation ] [ detected translation (page): {{page.translation}}} ] -->
|
30
31
|
|
31
|
-
<!-- [INFO ] [j1.modules.connectors.translator ] [ start processing load region head, layout: {{page.layout}} ] -->
|
32
32
|
{% if translation %}
|
33
|
-
|
33
|
+
<!-- [INFO ] [j1.modules.connectors.translator ] [ start processing load region head, layout: {{page.layout}} ] -->
|
34
34
|
{% case translation_provider %}
|
35
35
|
{% when "google" %}
|
36
36
|
<!-- [INFO ] [j1.modules.connectors.translator ] [ place Google Translator ] -->
|
@@ -42,4 +42,3 @@
|
|
42
42
|
|
43
43
|
{% endif %}
|
44
44
|
<!-- [INFO ] [j1.modules.connectors.translator ] [ end processing ] -->
|
45
|
-
|
@@ -50,22 +50,8 @@
|
|
50
50
|
{% assign navigator_defaults = site.data.modules.defaults.navigator.defaults %}
|
51
51
|
{% assign navigator_settings = site.data.modules.navigator.settings %}
|
52
52
|
|
53
|
-
{%
|
54
|
-
|
55
|
-
{% assign consent_defaults = site.data.modules.defaults.cookie_consent.defaults %}
|
56
|
-
{% assign consent_settings = site.data.modules.cookie_consent.settings %}
|
57
|
-
{% assign cookie_consent_options = consent_defaults | merge: consent_settings %}
|
58
|
-
-------------------------------------------------------------------------------- {% endcomment %}
|
59
|
-
|
60
|
-
{% assign cookiebar_defaults = site.data.modules.defaults.cookiebar.defaults %}
|
61
|
-
{% assign cookiebar_settings = site.data.modules.cookiebar.settings %}
|
62
|
-
|
63
|
-
{% comment %} SSM module NOT used anymore
|
64
|
-
--------------------------------------------------------------------------------
|
65
|
-
{% assign ssm_settings = modules.ssm.settings %}
|
66
|
-
{% assign ssm_defaults = modules.defaults.ssm.defaults %}
|
67
|
-
{% assign ssm_options = ssm_defaults | merge: ssm_settings %}
|
68
|
-
-------------------------------------------------------------------------------- {% endcomment %}
|
53
|
+
{% assign consent_defaults = site.data.modules.defaults.cookieconsent.defaults %}
|
54
|
+
{% assign consent_settings = site.data.modules.cookieconsent.settings %}
|
69
55
|
|
70
56
|
{% comment %} Set config data
|
71
57
|
-------------------------------------------------------------------------------- {% endcomment %}
|
@@ -92,7 +78,6 @@
|
|
92
78
|
{% assign auth_manager_options = authentication_options.j1_auth %}
|
93
79
|
{% assign nav_mmenu_options = nav_mmenu_defaults | merge: nav_mmenu_settings %}
|
94
80
|
|
95
|
-
|
96
81
|
{% comment %} Set navBarOptions
|
97
82
|
-------------------------------------------------------------------------------- {% endcomment %}
|
98
83
|
{% assign brand_position = nav_bar_options.brand_position %}
|
@@ -126,16 +111,7 @@
|
|
126
111
|
{% comment %} Main
|
127
112
|
-------------------------------------------------------------------------------- {% endcomment %}
|
128
113
|
|
129
|
-
{% comment %} Generate
|
130
|
-
--------------------------------------------------------------------------------
|
131
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ check for ssm ] -->
|
132
|
-
{% if ssm_options.enabled %}
|
133
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ place ssm container for AJAX load ] -->
|
134
|
-
<nav id="ssm-container" class="ssm-btns-right ssm-anim-slide no-r-text"></nav>
|
135
|
-
{% endif %}
|
136
|
-
-------------------------------------------------------------------------------- {% endcomment %}
|
137
|
-
|
138
|
-
{% comment %} Generate TopSearch container
|
114
|
+
{% comment %} Generate search container
|
139
115
|
-------------------------------------------------------------------------------- {% endcomment %}
|
140
116
|
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ check for topsearch ] -->
|
141
117
|
{% if topsearch_options.enabled %}
|
@@ -148,19 +124,8 @@
|
|
148
124
|
-------------------------------------------------------------------------------- {% endcomment %}
|
149
125
|
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: mmenu ] -->
|
150
126
|
{% for item in nav_mmenu_options.menus %}
|
151
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html ] [
|
152
|
-
|
153
|
-
{% comment %} Condition DISABLED for testing
|
154
|
-
--------------------------------------------------------------------------------
|
155
|
-
{% if item.menu.enabled %}
|
156
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ place mmenu container for AJAX load ] -->
|
127
|
+
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ place mmenu container {{item.menu.xhr_container_id}} for AJAX load ] -->
|
157
128
|
<nav id="{{item.menu.xhr_container_id}}"></nav>
|
158
|
-
{% endif %}
|
159
|
-
-------------------------------------------------------------------------------- {% endcomment %}
|
160
|
-
|
161
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ place mmenu container for AJAX load ] -->
|
162
|
-
<nav id="{{item.menu.xhr_container_id}}"></nav>
|
163
|
-
|
164
129
|
{% endfor %}
|
165
130
|
|
166
131
|
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: navigation ] -->
|
@@ -168,7 +133,6 @@
|
|
168
133
|
|
169
134
|
{% comment %} Place brand image
|
170
135
|
------------------------------------------------------------------------------ {% endcomment %}
|
171
|
-
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ end processing: sidebar ] -->
|
172
136
|
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ start processing: main menue ] -->
|
173
137
|
{% if brand_position == "left" %}
|
174
138
|
<!-- [INFO ] [j1.modules.navigator.generator.html ] [ place brand image to the: left ] -->
|
@@ -45,7 +45,7 @@
|
|
45
45
|
|
46
46
|
{% comment %} Set quicksearch properties
|
47
47
|
-------------------------------------------------------------------------------- {% endcomment %}
|
48
|
-
{% assign topsearch_id = topsearch_options.
|
48
|
+
{% assign topsearch_id = topsearch_options.container_id %}
|
49
49
|
{% assign icon_family = topsearch_options.icon_family | downcase %}
|
50
50
|
{% assign placeholder = topsearch_options.placeholder %}
|
51
51
|
{% assign search_heading_lead = topsearch_options.search_heading_lead %}
|
@@ -89,7 +89,7 @@
|
|
89
89
|
------------------------------------------------------------------------------ {% endcomment %}
|
90
90
|
{% if quick_search %}
|
91
91
|
<!-- [INFO ] [j1.modules.navigator.topsearch.proc ] [ start processing: top search ] -->
|
92
|
-
<div id="
|
92
|
+
<div id="{{topsearch_id}}" class="top-search ml-4 mr-4" style="display: none;">
|
93
93
|
<div class="input-group">
|
94
94
|
<span class="input-group-addon"><i class="mdi mdi-magnify mdi-2x" style="color:#9E9E9E"></i></span>
|
95
95
|
<input id="search-query" type="text" name="q" placeholder="QuickSearch" autocomplete="off" class="form-control">
|
@@ -57,31 +57,73 @@
|
|
57
57
|
{% comment %} Create BS link button
|
58
58
|
------------------------------------------------------------------------------ {% endcomment %}
|
59
59
|
|
60
|
-
{% for item in button_data %}
|
61
|
-
|
62
|
-
{%
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
60
|
+
{% for item in button_data %} {% for button in item[1] %}
|
61
|
+
{% assign key = button[0] %}
|
62
|
+
{% assign value = button[1] %}
|
63
|
+
{% if key == 'title' %} {% assign button_title = value %} {% endif %}
|
64
|
+
{% if key == 'tagline' %} {% assign button_tagline = value %} {% endif %}
|
65
|
+
{% if key == 'class' %} {% assign button_class = value %} {% endif %}
|
66
|
+
{% if key == 'style' %} {% assign button_style = value %} {% endif %}
|
67
|
+
{% if key == 'icon' %} {% assign button_icon = value %} {% endif %}
|
68
|
+
{% if key == 'icon_color' %} {% assign button_icon_color = value %} {% endif %}
|
69
|
+
{% if key == 'icon_size' %} {% assign button_icon_size = value %} {% endif %}
|
70
|
+
{% if key == 'href' %} {% assign button_href = value %} {% endif %}
|
71
|
+
{% if key == 'target' %} {% assign button_target = value %} {% endif %}
|
72
|
+
{% endfor %} {% endfor %}
|
73
|
+
|
74
|
+
{% comment %} jadams, 2021-04-24:
|
75
|
+
TODO, mr-x on font-icon are to be scaled on icon-size (fixed on: mr-3)
|
76
|
+
-------------------------------------------------------------------------------- {% endcomment %}
|
77
|
+
|
78
|
+
{% if button_tagline %}
|
79
|
+
{% if button_href and button_target %}
|
80
|
+
{% capture bs_button_html %}
|
81
|
+
<a href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
|
82
|
+
<i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-3"></i>
|
83
|
+
<span class="float-right text-left mt-2">
|
84
|
+
{{button_title}}
|
85
|
+
<span class="d-block r-text-200 text-lowercase">{{button_tagline}}</span>
|
86
|
+
</span>
|
87
|
+
</a>
|
88
|
+
{% endcapture %}
|
89
|
+
{% elsif button_href %}
|
90
|
+
{% capture bs_button_html %}
|
91
|
+
<a href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
|
92
|
+
<i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-3"></i>
|
93
|
+
<span class="float-right text-left mt-2">
|
94
|
+
{{button_title}}
|
95
|
+
<span class="d-block r-text-200 text-lowercase">{{button_tagline}}</span>
|
96
|
+
</span>
|
97
|
+
</a>
|
98
|
+
{% endcapture %}
|
99
|
+
{% else %}
|
100
|
+
{% capture bs_button_html %}INFO: No valid value for parameter href found{% endcapture %}
|
101
|
+
{% endif %}
|
81
102
|
{% else %}
|
82
|
-
{%
|
103
|
+
{% if button_href and button_target %}
|
104
|
+
{% capture bs_button_html %}
|
105
|
+
<a href="{{button_href}}" target="{{button_target}}" rel="noopener" class="{{button_class}}" style="{{button_style}}">
|
106
|
+
<i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i>
|
107
|
+
<span class="float-right text-left">
|
108
|
+
{{button_title}}
|
109
|
+
</span>
|
110
|
+
</a>
|
111
|
+
{% endcapture %}
|
112
|
+
{% elsif button_href %}
|
113
|
+
{% capture bs_button_html %}
|
114
|
+
<a href="{{button_href}}" class="{{button_class}}" style="{{button_style}}">
|
115
|
+
<i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i>
|
116
|
+
<span class="float-right text-left">
|
117
|
+
{{button_title}}
|
118
|
+
</span>
|
119
|
+
</a>
|
120
|
+
{% endcapture %}
|
121
|
+
{% else %}
|
122
|
+
{% capture bs_button_html %}INFO: No valid value for parameter href found{% endcapture %}
|
123
|
+
{% endif %}
|
83
124
|
{% endif %}
|
84
125
|
|
126
|
+
|
85
127
|
{% when 'input' %}
|
86
128
|
{% comment %} Create BS link button
|
87
129
|
------------------------------------------------------------------------------ {% endcomment %}
|
@@ -43,6 +43,7 @@
|
|
43
43
|
{% comment %} Variables
|
44
44
|
-------------------------------------------------------------------------------- {% endcomment %}
|
45
45
|
{% assign builder_config = site.data.builder.blog_navigator.collate_timeline %}
|
46
|
+
{% assign truncate_words = site.excerpt_truncate_words %}
|
46
47
|
{% assign header_title = false %}
|
47
48
|
{% assign header_tagline = false %}
|
48
49
|
{% assign posts_collate = include.items %}
|
@@ -140,11 +141,12 @@
|
|
140
141
|
<p class="card-subtitle text-muted">{{post.tagline}}</p>
|
141
142
|
</div>
|
142
143
|
<div class="timeline-excerpt mb-4">
|
143
|
-
{% assign excerpt = post.excerpt|truncatewords:
|
144
|
+
{% assign excerpt = post.excerpt|truncatewords: truncate_words|replace:'...',' ...'|strip_html|strip_newlines|strip %}
|
144
145
|
<i class="timeline-icon {{icon_family}} {{icon_family}}-{{icon_name}} {{icon_family}}-{{icon_size}} {{icon_family}}-{{icon_color}}"></i>
|
145
146
|
{{excerpt}}
|
146
147
|
</div>
|
147
|
-
<div class="card-footer">
|
148
|
+
<div class="card-footer r-text-200 text-lowercase">
|
149
|
+
<hr class="my-3">
|
148
150
|
<a href="{{post.url}}#readmore"
|
149
151
|
class="btn btn-secondary btn-raised btn-flex mb-0">
|
150
152
|
<i class="mdi mdi-eye mdi-lg mr-1" style="color:#FFFFFF;">
|
@@ -162,10 +164,11 @@
|
|
162
164
|
<p class="card-subtitle text-muted">{{post.tagline}}</p>
|
163
165
|
</div>
|
164
166
|
<div class="timeline-excerpt mb-4">
|
165
|
-
{% assign excerpt = post.excerpt|truncatewords:
|
167
|
+
{% assign excerpt = post.excerpt|truncatewords: truncate_words|replace:'...',' ...'|strip_html|strip_newlines|strip %}
|
166
168
|
{{excerpt}}
|
167
169
|
</div>
|
168
|
-
<div class="card-footer">
|
170
|
+
<div class="card-footer r-text-200 text-lowercase">
|
171
|
+
<hr class="my-3">
|
169
172
|
<a href="{{post.url}}#readmore"
|
170
173
|
class="btn btn-secondary btn-raised btn-flex mb-0">
|
171
174
|
<i class="mdi mdi-eye mdi-lg mr-1" style="color:#FFFFFF;">
|
@@ -181,7 +184,7 @@
|
|
181
184
|
<p class="card-subtitle text-muted">{{post.tagline}}</p>
|
182
185
|
</div -->
|
183
186
|
<div class="excerpt">
|
184
|
-
{% assign excerpt = post.excerpt|truncatewords:
|
187
|
+
{% assign excerpt = post.excerpt|truncatewords: truncate_words|replace:'...',' ...'|strip_html|strip_newlines|strip %}
|
185
188
|
{{excerpt}}
|
186
189
|
</div>
|
187
190
|
</div>
|
@@ -193,21 +196,22 @@
|
|
193
196
|
{% assign comment_count = sharing.comment_count %}
|
194
197
|
{% endfor %}
|
195
198
|
|
196
|
-
<div class="card-footer r-text-200">
|
199
|
+
<div class="card-footer r-text-200 text-lowercase">
|
200
|
+
<hr class="my-3">
|
197
201
|
<div class="card-footer-text">
|
198
202
|
{% if post.date %}
|
199
|
-
<i class="mdi mdi-calendar-blank mr-1"></i> {{post.date | date: "%Y %B, %e"}}
|
203
|
+
<i class="mdi mdi-calendar-blank md-grey-600 mr-1"></i> {{post.date | date: "%Y %B, %e"}}
|
200
204
|
{% endif %}
|
201
205
|
{% if likes_count %}
|
202
206
|
<span class="font-weight-bold"> · </span>
|
203
|
-
<i class="mdi mdi-heart mr-1"></i> {{likes_count}}
|
207
|
+
<i class="mdi mdi-heart md-grey-600 mr-1"></i> {{likes_count}}
|
204
208
|
{% endif %}
|
205
209
|
{% if comment_count %}
|
206
210
|
<span class="font-weight-bold"> · </span>
|
207
|
-
<i class="mdi mdi-comment mr-1"></i> {{comment_count}}
|
211
|
+
<i class="mdi mdi-comment md-grey-600 mr-1"></i> {{comment_count}}
|
208
212
|
{% endif %}
|
209
213
|
</div>
|
210
|
-
<a class="card-link
|
214
|
+
<a class="card-link text-muted text-lowercase"
|
211
215
|
href="{{post.url}}#readmore">
|
212
216
|
Read · {{post.tagline}}
|
213
217
|
</a>
|