j1-template 2021.1.23 → 2021.1.27

Sign up to get free protection for your applications and to get access to all the features.
Files changed (32) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/themes/j1/layouts/content_generator_news_panel_posts.html +1 -1
  3. data/_includes/themes/j1/modules/connectors/survey/custom-provider.html +30 -0
  4. data/_includes/themes/j1/modules/connectors/survey/jotform.html +32 -0
  5. data/_includes/themes/j1/modules/connectors/surveys +58 -0
  6. data/assets/data/panel.html +2 -16
  7. data/assets/themes/j1/adapter/js/{infiniteScroll.js → j1scroll.js} +33 -69
  8. data/assets/themes/j1/core/css/themes/uno-light/bootstrap.css +42 -0
  9. data/assets/themes/j1/core/css/themes/uno-light/bootstrap.min.css +1 -1
  10. data/assets/themes/j1/modules/{infiniteScroll → j1Scroll}/css/theme/uno.css +4 -50
  11. data/assets/themes/j1/modules/{infiniteScroll → j1Scroll}/css/theme/uno.min.css +0 -0
  12. data/assets/themes/j1/modules/j1Scroll/js/j1scroll.js +252 -0
  13. data/assets/themes/j1/modules/showOnScroll/js/showOnScroll.js +19 -7
  14. data/lib/j1/version.rb +1 -1
  15. data/lib/starter_web/Gemfile +1 -1
  16. data/lib/starter_web/_config.yml +1 -1
  17. data/lib/starter_web/_data/resources.yml +26 -0
  18. data/lib/starter_web/_includes/attributes.asciidoc +1 -1
  19. data/lib/starter_web/_plugins/lunr_index.rb +1 -1
  20. data/lib/starter_web/collections/posts/public/series/_posts/2020-01-01-post-test-series.adoc +1 -1
  21. data/lib/starter_web/collections/posts/public/series/_posts/2020-01-02-post-test-series.adoc +1 -1
  22. data/lib/starter_web/collections/posts/public/series/_posts/2020-01-03-post-test-series.adoc +1 -1
  23. data/lib/starter_web/collections/posts/public/series/_posts/2020-01-04-post-test-series.adoc +1 -1
  24. data/lib/starter_web/index.html +1 -1
  25. data/lib/starter_web/package.json +1 -1
  26. data/lib/starter_web/pages/infinite-scroll-tester-5.adoc +119 -0
  27. data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
  28. data/lib/starter_web/utilsrv/package.json +1 -1
  29. metadata +10 -8
  30. data/assets/themes/j1/modules/infiniteScroll/js/infiniteScroll.js +0 -1909
  31. data/assets/themes/j1/modules/infiniteScroll/js/infiniteScroll.min.js +0 -11
  32. data/assets/themes/j1/modules/infiniteScroll/js/infiniteScroll.modified.js +0 -1913
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b62cb89da1e513ec4cad91941a7488629373a117a16046284ec659750fb5ee76
4
- data.tar.gz: e9b411f4299fcfbc228174f1cba85028bcdeab3ca4511d1415d89b5731ecb83c
3
+ metadata.gz: 7a970178e8bb5d0f6a828c80831fc08072c9ac911e20de5dbe80ec5ea8c8c33a
4
+ data.tar.gz: 81abe20ca6bf9a02e3472aae773f22b22140621df913baf67c4fce873d34510d
5
5
  SHA512:
6
- metadata.gz: 907649cbc4a3cf2ad8356cf9a0cf99b01ec93b01b72c82d969fdbf7bd3baefa86b5feab86dd779fbfde2dcbb71710767eb5c24d5d4e97512f95a33633581c425
7
- data.tar.gz: b5c8a9afdfc1c732280ad783c3afcda2a5711ef45a48be5930c56256ad4a7fc5de88af601a4132446b94358ca0d712b27bbe65ff6f1e468850222fbd47feb636
6
+ metadata.gz: 989fcda9a0ac7933b179e4d379580a0be55782c2ed4886e4559aec2ed58a6361394ebc9c4f9c936990cdd10a49ebf2510d247867065f5bdbc1e32a7331b3519a
7
+ data.tar.gz: 4b1e8d305b2428b87295d9c133cfc2599b6be469e8d4b8ad788f97ee45f7aba695c6a02d861b3504d22ae3310771a80793f1b5b6099e77c75a6d4da2cda4a1b5
@@ -294,7 +294,7 @@
294
294
  {% endif %}
295
295
  <h3 class="card-header bg-primary notoc">{{post.title}}</h3>
296
296
  <!-- Body|Excerpt -->
297
- <div class="card-body r-text-300">
297
+ <div class="card-body r-text-300 mt-3">
298
298
  {{post.excerpt|truncatewords: truncate_words}}
299
299
  </div>
300
300
  <!-- End Body|Excerpt -->
@@ -0,0 +1,30 @@
1
+ {% comment %}
2
+ # -----------------------------------------------------------------------------
3
+ # ~/_includes/themes/j1/modules/connectors/comments/custom-provider.html
4
+ # Support of custom comment provider for J1 Template
5
+ #
6
+ # Product/Info:
7
+ # https://jekyll.one
8
+ #
9
+ # Copyright (C) 2021 Juergen Adams
10
+ #
11
+ # J1 Template is licensed under the MIT License.
12
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
13
+ # -----------------------------------------------------------------------------
14
+ # Test data:
15
+ # liquid_var: {{ liquid_var | debug }}
16
+ # -----------------------------------------------------------------------------
17
+ {% endcomment %}
18
+
19
+ {% comment %} Liquid procedures
20
+ -------------------------------------------------------------------------------- {% endcomment %}
21
+
22
+ {% comment %} Variables
23
+ -------------------------------------------------------------------------------- {% endcomment %}
24
+
25
+
26
+
27
+ {% comment %} Main
28
+ -------------------------------------------------------------------------------- {% endcomment %}
29
+
30
+ <!-- Your code for the custom provider goes here -->
@@ -0,0 +1,32 @@
1
+ {% comment %}
2
+ # -----------------------------------------------------------------------------
3
+ # ~/_includes/themes/j1/modules/connectors/comments/jotform.html
4
+ # Support of survey provider JOTFORM for J1 Template
5
+ #
6
+ # Product/Info:
7
+ # https://jekyll.one
8
+ #
9
+ # Copyright (C) 2021 Juergen Adams
10
+ #
11
+ # J1 Template is licensed under the MIT License.
12
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
13
+ # -----------------------------------------------------------------------------
14
+ # Test data:
15
+ # liquid_var: {{ liquid_var | debug }}
16
+ # -----------------------------------------------------------------------------
17
+ {% endcomment %}
18
+
19
+ {% comment %} Liquid procedures
20
+ -------------------------------------------------------------------------------- {% endcomment %}
21
+
22
+ {% comment %} Variables
23
+ -------------------------------------------------------------------------------- {% endcomment %}
24
+
25
+
26
+ {% comment %} Main
27
+ -------------------------------------------------------------------------------- {% endcomment %}
28
+ <!-- [INFO ] [j1.modules.connectors.jotform ] [ place the thread container: start ] -->
29
+ <div id="jotform"></div>
30
+ <!-- [INFO ] [j1.modules.connectors.jotform ] [ connector depends on the cookie consent (personalization) ] -->
31
+ <!-- [INFO ] [j1.modules.connectors.jotform ] [ connector (dynamic) JS is enabled/disabled on OptIn/Out ] -->
32
+ <!-- [INFO ] [j1.modules.connectors.jotform ] [ place the thread container: end ] -->
@@ -0,0 +1,58 @@
1
+ {% comment %}
2
+ # -----------------------------------------------------------------------------
3
+ # ~/_includes/themes/j1/modules/connectors/surveys
4
+ # Liquid CONNECTOR for survey providers supported by J1 Template
5
+ #
6
+ # Product/Info:
7
+ # https://jekyll.one
8
+ #
9
+ # Copyright (C) 2021 Juergen Adams
10
+ #
11
+ # J1 Template is licensed under the MIT License.
12
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
13
+ # -----------------------------------------------------------------------------
14
+ # Test data:
15
+ # liquid_var: {{ liquid_var | debug }}
16
+ # -----------------------------------------------------------------------------
17
+ {% endcomment %}
18
+
19
+ {% comment %} Liquid procedures
20
+ -------------------------------------------------------------------------------- {% endcomment %}
21
+
22
+ {% comment %} Variables
23
+ -------------------------------------------------------------------------------- {% endcomment %}
24
+ {% assign comments = site.data.j1_config.survey.enabled %}
25
+ {% assign comments_page = page.survey.enabled %}
26
+ {% assign comment_provider = site.data.j1_config.survey.provider %}
27
+
28
+ {% comment %} Main
29
+ -------------------------------------------------------------------------------- {% endcomment %}
30
+
31
+ {% comment %} Check comments settings from SITE configuration
32
+ -------------------------------------------------------------------------------- {% endcomment %}
33
+ <!-- [INFO ] [j1.modules.connectors.survey ] [ Check comments settings from SITE configuration ] -->
34
+ <!-- [INFO ] [j1.modules.connectors.survey ] [ detected comments (site): {{comments}} ] -->
35
+
36
+ {% comment %} Check comments settings from PAGE configuration
37
+ -------------------------------------------------------------------------------- {% endcomment %}
38
+ <!-- [INFO ] [j1.modules.connectors.survey ] [ Check comments settings from PAGE configuration ] -->
39
+ <!-- [INFO ] [j1.modules.connectors.survey ] [ detected comments (page): {{page.survey}} ] -->
40
+
41
+ {% if comments_page <> nil %}
42
+ <!-- [INFO ] [j1.modules.connectors.survey ] [ overload comments settings from PAGE ] -->
43
+ {% assign comments = comments_page %}
44
+ {% endif %}
45
+
46
+ {% if comments %}
47
+ <!-- [INFO ] [j1.modules.connectors.survey ] [ start processing load region head, layout: {{page.layout}} ] -->
48
+ {% case comment_provider %}
49
+ {% when "jotform" %}
50
+ <!-- [INFO ] [j1.modules.connectors.survey ] [ place comment provider JOTFORM ] -->
51
+ {% include themes/{{site.template.name}}/modules/connectors/comment/disqus.html %}
52
+ {% when "custom" %}
53
+ <!-- [INFO ] [j1.modules.connectors.survey ] [ place comment provider CUSTOM ] -->
54
+ {% include themes/{{site.template.name}}/procedures/provider/comment/custom-provider.html %}
55
+ {% endcase %}
56
+
57
+ {% endif %}
58
+ <!-- [INFO ] [j1.modules.connectors.survey ] [ end processing ] -->
@@ -411,7 +411,7 @@ exclude_from_search: true
411
411
  </a>
412
412
  </h2>
413
413
  </div>
414
- <div id="{{list.service.id}}" class="collapse" aria-labelledby="{{list.service.id}}" data-parent="#{{card_id}}">
414
+ <div id="{{list.service.id}}" class="collapse mb-4" aria-labelledby="{{list.service.id}}" data-parent="#{{card_id}}">
415
415
  <div class="card-body r-text-200">
416
416
  {{list.service.description}}
417
417
  <hr>
@@ -539,7 +539,7 @@ exclude_from_search: true
539
539
  {% endif %}
540
540
  <h3 class="card-header bg-primary notoc">{{post.title}}</h3>
541
541
  <!-- Body|Excerpt -->
542
- <div class="card-body r-text-300">
542
+ <div class="card-body r-text-300 mt-4">
543
543
  {% comment %} {{post.excerpt|truncatewords: 50|replace:'...',' ...'|remove:'<div class="paragraph">'|remove:'</div>'|remove:'<p>'|remove:'</p>'}} {% endcomment %}
544
544
  {{post.excerpt|truncatewords: truncate_words}}
545
545
  </div>
@@ -640,20 +640,6 @@ exclude_from_search: true
640
640
  <!-- End recent posts -->
641
641
  {% endfor %}
642
642
 
643
- <div class="row page-load-status">
644
- <div class="loader-ellips infinite-scroll-request">
645
- <span class="loader-ellips__dot"></span>
646
- <span class="loader-ellips__dot"></span>
647
- <span class="loader-ellips__dot"></span>
648
- <span class="loader-ellips__dot"></span>
649
- </div>
650
- <p class="infinite-scroll-last">{{infinite_scroll_last}} <a href="/pages/public/blog/navigator/">Blog Navigator</a></p>
651
- </div>
652
-
653
- <div class="row page-scroll-last">
654
- <p class="infinite-scroll-last">{{infinite_scroll_last}} <a href="/pages/public/blog/navigator/">Blog Navigator</a></p>
655
- </div>
656
-
657
643
  </div>
658
644
  <!-- END container -->
659
645
 
@@ -6,8 +6,8 @@ regenerate: true
6
6
 
7
7
  {% comment %}
8
8
  # -----------------------------------------------------------------------------
9
- # ~/assets/themes/j1/adapter/js/infiniteScroll.js
10
- # Liquid template to adapt infiniteScroll
9
+ # ~/assets/themes/j1/adapter/js/j1Scroll.js
10
+ # Liquid template to adapt j1Scroll
11
11
  #
12
12
  # Product/Info:
13
13
  # https://jekyll.one
@@ -23,8 +23,8 @@ regenerate: true
23
23
 
24
24
  /*
25
25
  # -----------------------------------------------------------------------------
26
- # ~/assets/themes/j1/adapter/js/infiniteScroll.js
27
- # J1 Adapter for infiniteScroll
26
+ # ~/assets/themes/j1/adapter/js/j1Scroll.js
27
+ # J1 Adapter for j1Scroll
28
28
  #
29
29
  # Product/Info:
30
30
  # https://jekyll.one
@@ -47,7 +47,7 @@ regenerate: true
47
47
 
48
48
  {% comment %} Main
49
49
  -------------------------------------------------------------------------------- {% endcomment %}
50
- j1.adapter['infiniteScroll'] = (function (j1, window) {
50
+ j1.adapter['j1Scroll'] = (function (j1, window) {
51
51
 
52
52
  {% comment %} Set global variables
53
53
  ------------------------------------------------------------------------------ {% endcomment %}
@@ -84,8 +84,8 @@ j1.adapter['infiniteScroll'] = (function (j1, window) {
84
84
  // -----------------------------------------------------------------------
85
85
  // globals
86
86
  // -----------------------------------------------------------------------
87
- _this = j1.adapter.infiniteScroll;
88
- logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
87
+ _this = j1.adapter.j1Scroll;
88
+ logger = log4javascript.getLogger('j1.adapter.j1Scroll');
89
89
 
90
90
  // initialize state flag
91
91
  _this.setState('started');
@@ -96,87 +96,52 @@ j1.adapter['infiniteScroll'] = (function (j1, window) {
96
96
  // Default module settings
97
97
  // -----------------------------------------------------------------------
98
98
  var settings = $.extend({
99
- module_name: 'j1.adapter.infiniteScroll',
99
+ module_name: 'j1.adapter.j1Scroll',
100
100
  generated: '{{site.time}}'
101
101
  }, options);
102
102
 
103
103
  // -----------------------------------------------------------------------
104
- // infiniteScroll initializer
104
+ // j1Scroll initializer
105
105
  // -----------------------------------------------------------------------
106
- var log_text = '\n' + 'infiniteScroll is being initialized';
106
+ var log_text = '\n' + 'j1Scroll is being initialized';
107
107
  logger.info(log_text);
108
108
 
109
- // Add data attribute for tablesaw to all tables of a page
110
109
  var dependencies_met_page_ready = setInterval (function (options) {
111
- var lastPage = 4;
112
-
113
- if ( j1.getState() === 'finished' ) {
114
- var logger = log4javascript.getLogger('j1.infiniteScroll');
115
- var log_text = '\n module infiniteScroll is being initialized';
110
+ if (j1.getState() === 'finished') {
111
+ var log_text = '\n' + 'j1Scroll is being initialized';
116
112
  logger.info(log_text);
117
113
 
118
- function getPosts() {
119
- var pageNumber = ( this.loadCount + 1 ) + 1; // +1: offset for j1-paginator
120
- if ( pageNumber <= lastPage) {
121
- return `/assets/data/news_panel_posts/page${pageNumber}/index.html`;
122
- }
123
- }
124
-
125
- // jadams, 2021-09-12
126
- //
127
- var scrollOffset = 450 + 20;
128
- // var article_height = $('#home_news_panel-scroll-item').height();
129
- var article_height = document.getElementById('home_news_panel-scroll-item').clientHeight;
130
- var scrollThreshold = (article_height -200) * -1;
131
-
132
- $('#home_news_panel-scroll-group').infiniteScroll({
133
- path: getPosts,
134
- append: '#home_news_panel-scroll-item',
135
- history: false,
136
- checkLastPage: true,
137
- status: '.page-scroll-last',
138
- });
139
-
140
- $('.list-group').on( 'error.infiniteScroll', function( event, error, path, response ) {
141
- var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
142
- var log_text = `\n could not load next items: ${path}. ${error}`;
143
- logger.info(log_text);
144
- });
145
-
146
- $('.list-group').on( 'last.infiniteScroll', function( event, body, path ) {
147
- var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
148
- var log_text = `\n last page reached on ${path}`;
149
- logger.info(log_text);
150
- });
151
-
152
- $('.list-group').on( 'scrollThreshold.infiniteScroll', function( event ) {
153
- var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
154
- var log_text = '\n scroll position is less than scrollThreshold option distance';
155
- logger.info(log_text);
114
+ var postWrapperId = '#home_news_panel-scroll-group';
115
+ var paginatePath = '/assets/data/news_panel_posts/page';
116
+
117
+ // status: '.page-scroll-last',
118
+ // firstPage: 2,
119
+ // onInit: function(){}, // Callback after plugin has loaded
120
+ // onBeforeLoad: function(link){}, // Callback before new content is loaded
121
+ // onAfterLoad: function(html){} // Callback after new content has been loaded
122
+
123
+ $(postWrapperId).j1Scroll({
124
+ path: paginatePath,
125
+ elementScroll: false,
126
+ scrollThreshold: 300,
127
+ lastPage: 4,
128
+ infoLastPage: true,
156
129
  });
157
130
 
158
- $('.list-group').on( 'load.infiniteScroll', function( event, body, path, response ) {
159
- var elm = document.getElementById("home_news_panel-scroll-group");
131
+ $('.list-group').on( 'load.j1Scroll', function( event, body, path, response ) {
160
132
  var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
161
133
  var log_text = `\n loaded data from path: ${path}`;
162
134
  logger.info(log_text);
163
135
 
164
- var ww = $(window).width();
165
- var wh = $(window).height();
166
-
167
- var vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0)
168
- var vh = Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0)
136
+ var log_text = "\n initialize backdrops on load";
137
+ logger.info(log_text);
169
138
 
170
- var article_height = $('#home_news_panel-scroll-item').height();
139
+ // initialize backdrops
140
+ j1.core.createDropCap();
171
141
 
172
- // if (user_agent.includes('iPad') || user_agent.includes('Windows') || user_agent.includes('OS X')) {
173
- if (user_agent.includes('Windows') || !user_agent.includes('OS X')) {
174
- // on desktops, scroll the page to view appended elements
175
- // window.scrollBy(0, article_height);
176
- }
177
142
  });
178
143
 
179
- $('.list-group').on( 'request.infiniteScroll', function( event, path, fetchPromise ) {
144
+ $('.list-group').on( 'request.j1Scroll', function( event, path, fetchPromise ) {
180
145
  var logger = log4javascript.getLogger('j1.adapter.infiniteScroll');
181
146
  var log_text = `\n request for the next page to be loaded from path: ${path}`;
182
147
  logger.info(log_text);
@@ -185,7 +150,6 @@ j1.adapter['infiniteScroll'] = (function (j1, window) {
185
150
  clearInterval(dependencies_met_page_ready);
186
151
  }
187
152
  });
188
-
189
153
  }, // END init
190
154
 
191
155
  // -------------------------------------------------------------------------
@@ -17885,6 +17885,48 @@ a.card-title:hover {
17885
17885
  border-top: 1px solid rgba(0, 0, 0, 0.04);
17886
17886
  border-bottom: 1px solid rgba(0, 0, 0, 0.04); }
17887
17887
 
17888
+ .list-group-item {
17889
+ width: 96%;
17890
+ margin-right: 1% !important; }
17891
+
17892
+ /* Media breakpoints
17893
+ -------------------------------------------------------------------------------- */
17894
+ @media only screen and (min-width: 576px) {
17895
+ .list-group-item.items-auto {
17896
+ width: 48.3%; }
17897
+ .list-group-item.items-1 {
17898
+ width: 96%; }
17899
+ .list-group-item.items-2 {
17900
+ width: 48.3%; }
17901
+ .list-group-item.items-3 {
17902
+ width: 48.3%; }
17903
+ .list-group-item.items-4 {
17904
+ width: 48.3%; } }
17905
+
17906
+ @media only screen and (min-width: 768px) {
17907
+ .list-group-item.items-auto {
17908
+ width: 31.333%; }
17909
+ .list-group-item.items-1 {
17910
+ width: 96%; }
17911
+ .list-group-item.items-2 {
17912
+ width: 48.3%; }
17913
+ .list-group-item.items-3 {
17914
+ width: 48.3%; }
17915
+ .list-group-item.items-4 {
17916
+ width: 48.3%; } }
17917
+
17918
+ @media only screen and (min-width: 992px) {
17919
+ .list-group-item.items-auto {
17920
+ width: 23.8%; }
17921
+ .list-group-item.items-1 {
17922
+ width: 96%; }
17923
+ .list-group-item.items-2 {
17924
+ width: 48.3%; }
17925
+ .list-group-item.items-3 {
17926
+ width: 31.333%; }
17927
+ .list-group-item.items-4 {
17928
+ width: 23.8%; } }
17929
+
17888
17930
  /*
17889
17931
  # -----------------------------------------------------------------------------
17890
17932
  # ~/theme_uno/extentions/_pages.scss