j1-template 2021.1.4 → 2021.1.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (156) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/themes/j1/layouts/layout_metadata_generator.html +4 -4
  3. data/_includes/themes/j1/modules/connectors/ad/google-adsense.html +7 -15
  4. data/_includes/themes/j1/modules/connectors/ads +18 -7
  5. data/_includes/themes/j1/modules/connectors/analytic/google-analytics.html +7 -3
  6. data/_includes/themes/j1/modules/connectors/analytics +17 -3
  7. data/_includes/themes/j1/modules/connectors/comments +22 -8
  8. data/_includes/themes/j1/modules/connectors/translator +20 -6
  9. data/_includes/themes/j1/modules/navigator/generator.html +2 -2
  10. data/_includes/themes/j1/procedures/global/select_location.proc +3 -3
  11. data/_layouts/default.html +4 -7
  12. data/assets/data/cookieconsent.html +249 -0
  13. data/assets/data/quicklinks.html +18 -16
  14. data/assets/data/themes.json +6 -6
  15. data/assets/error_pages/HTTP204.html +30 -10
  16. data/assets/error_pages/HTTP400.html +29 -8
  17. data/assets/error_pages/HTTP401.html +29 -9
  18. data/assets/error_pages/HTTP403.html +29 -8
  19. data/assets/error_pages/HTTP404.html +29 -8
  20. data/assets/error_pages/HTTP500.html +29 -8
  21. data/assets/error_pages/HTTP501.html +29 -8
  22. data/assets/error_pages/HTTP502.html +29 -8
  23. data/assets/error_pages/HTTP503.html +30 -8
  24. data/assets/themes/j1/adapter/js/cookieConsent.js +290 -0
  25. data/assets/themes/j1/adapter/js/fam.js +2 -1
  26. data/assets/themes/j1/adapter/js/j1.js +154 -153
  27. data/assets/themes/j1/adapter/js/navigator.js +157 -200
  28. data/assets/themes/j1/adapter/js/themer.1.js +326 -0
  29. data/assets/themes/j1/adapter/js/themer.js +41 -57
  30. data/assets/themes/j1/adapter/js/toccer.js +4 -45
  31. data/assets/themes/j1/core/css/themes/uno-light/bootstrap.css +2 -2
  32. data/assets/themes/j1/core/css/themes/uno-light/bootstrap.min.css +1 -1
  33. data/assets/themes/j1/core/js/template.js +3 -9
  34. data/assets/themes/j1/core/js/template.js.map +1 -1
  35. data/assets/themes/j1/core/js/template.min.js +3 -9
  36. data/assets/themes/j1/core/js/template.min.js.map +1 -1
  37. data/assets/themes/j1/modules/cookieConsent/LICENSE +21 -0
  38. data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.js +301 -0
  39. data/assets/themes/j1/modules/cookieConsent/js/cookieConsent.min.js +301 -0
  40. data/assets/themes/j1/modules/fam/css/{uno → theme/uno}/fam.css +0 -0
  41. data/assets/themes/j1/modules/fam/css/theme/uno/fam.min.css +15 -0
  42. data/assets/themes/j1/modules/fam/js/fam.js +1 -6
  43. data/assets/themes/j1/modules/iframeResizer/examples/frame.absolute.html +4 -2
  44. data/assets/themes/j1/modules/iframeResizer/examples/frame.content.html +4 -3
  45. data/assets/themes/j1/modules/iframeResizer/examples/frame.hover.html +4 -2
  46. data/assets/themes/j1/modules/iframeResizer/examples/frame.nested.html +4 -2
  47. data/assets/themes/j1/modules/iframeResizer/examples/frame.textarea.html +4 -2
  48. data/assets/themes/j1/modules/iframeResizer/examples/frame.tolerance.html +4 -2
  49. data/assets/themes/j1/modules/iframeResizer/examples/index.html +2 -0
  50. data/assets/themes/j1/modules/iframeResizer/examples/two.html +4 -2
  51. data/assets/themes/j1/modules/mmenuLight/css/{mmenu.css → mmenu-light.css} +0 -0
  52. data/assets/themes/j1/modules/mmenuLight/css/{mmenu.min.css → mmenu-light.min.css} +0 -0
  53. data/assets/themes/j1/modules/mmenuLight/css/theme/{uno.css → uno/mmenu.css} +0 -0
  54. data/assets/themes/j1/modules/mmenuLight/css/theme/{uno.min.css → uno/mmenu.min.css} +0 -0
  55. data/assets/themes/j1/modules/rtable/css/theme/{uno.css → uno/rtable.css} +0 -0
  56. data/assets/themes/j1/modules/rtable/css/theme/{uno.min.css → uno/rtable.min.css} +0 -0
  57. data/assets/themes/j1/modules/themeSwitcher/js/switcher.js +34 -49
  58. data/assets/themes/j1/modules/themeSwitcher/js/switcher.min.js +410 -2
  59. data/assets/themes/j1/modules/util/js/domready.js +146 -0
  60. data/assets/themes/j1/modules/util/js/gtag-opt-in.js +1 -0
  61. data/lib/j1/version.rb +3 -3
  62. data/lib/j1_app/j1_auth_manager/auth_manager.rb +2 -3
  63. data/lib/starter_web/Gemfile +1 -1
  64. data/lib/starter_web/_config.yml +19 -10
  65. data/lib/starter_web/_data/_defaults/resources.yml +11 -8
  66. data/lib/starter_web/_data/j1_config.yml +21 -18
  67. data/lib/starter_web/_data/modules/{cookiebar.yml → cookieconsent.yml} +5 -4
  68. data/lib/starter_web/_data/modules/defaults/cookieconsent.yml +136 -0
  69. data/lib/starter_web/_data/modules/defaults/themer.yml +2 -1
  70. data/lib/starter_web/_data/pages/builder.yml +7 -7
  71. data/lib/starter_web/_data/private.default.yml +119 -0
  72. data/lib/starter_web/_data/private.yml +6 -6
  73. data/lib/starter_web/_data/resources.yml +15 -14
  74. data/lib/starter_web/_includes/attributes.asciidoc +10 -1
  75. data/lib/starter_web/_plugins/lunr_index.rb +1 -1
  76. data/lib/starter_web/assets/images/modules/attics/{cookies-1920x1200-bw.jpg → cookies-1920x1200.jpg} +0 -0
  77. data/lib/starter_web/assets/images/modules/attics/lianhao-1920x1280.jpg +0 -0
  78. data/lib/starter_web/collections/posts/public/featured/_posts/2020-01-01-about-cookies.adoc +2 -2
  79. data/lib/starter_web/dot.gitignore +1 -1
  80. data/lib/starter_web/index.html +3 -3
  81. data/lib/starter_web/package.json +2 -2
  82. data/lib/starter_web/pages/public/blog/navigator/archive.html +5 -3
  83. data/lib/starter_web/pages/public/blog/navigator/archive/categoryview.html +3 -2
  84. data/lib/starter_web/pages/public/blog/navigator/archive/dateview.html +6 -4
  85. data/lib/starter_web/pages/public/blog/navigator/archive/tagview.html +23 -5
  86. data/lib/starter_web/pages/public/cookieConsent.adoc +93 -0
  87. data/lib/starter_web/pages/public/learn/roundtrip/400_asciidoc_extensions.adoc +2 -1
  88. data/lib/starter_web/pages/public/legal/en/300_privacy.adoc +111 -213
  89. data/lib/starter_web/utilsrv/_defaults/package.json +1 -1
  90. data/lib/starter_web/utilsrv/package.json +1 -1
  91. metadata +24 -76
  92. data/_includes/themes/j1/modules/navigator/generator.org.html +0 -232
  93. data/assets/data/cookiebar.html +0 -288
  94. data/assets/data/footer.new.1.html +0 -256
  95. data/assets/data/footer.new.2.html +0 -256
  96. data/assets/data/footer.org.html +0 -249
  97. data/assets/error_pages/HTTP520.html +0 -68
  98. data/assets/error_pages/HTTP521.html +0 -68
  99. data/assets/error_pages/HTTP533.html +0 -68
  100. data/assets/themes/j1/adapter/js/cookiebar.js +0 -212
  101. data/assets/themes/j1/adapter/js/j1.new.js +0 -1878
  102. data/assets/themes/j1/adapter/js/j1.org.js +0 -1874
  103. data/assets/themes/j1/modules/_lightGallery/css/core/lg-fb-comment-box.css +0 -58
  104. data/assets/themes/j1/modules/_lightGallery/css/core/lg-fb-comment-box.min.css +0 -5
  105. data/assets/themes/j1/modules/_lightGallery/css/core/lg-transitions.css +0 -778
  106. data/assets/themes/j1/modules/_lightGallery/css/core/lg-transitions.min.css +0 -5
  107. data/assets/themes/j1/modules/_lightGallery/css/core/lightgallery.css +0 -981
  108. data/assets/themes/j1/modules/_lightGallery/css/core/lightgallery.min.css +0 -5
  109. data/assets/themes/j1/modules/_lightGallery/css/fonts/lg.eot +0 -0
  110. data/assets/themes/j1/modules/_lightGallery/css/fonts/lg.svg +0 -47
  111. data/assets/themes/j1/modules/_lightGallery/css/fonts/lg.ttf +0 -0
  112. data/assets/themes/j1/modules/_lightGallery/css/fonts/lg.woff +0 -0
  113. data/assets/themes/j1/modules/_lightGallery/css/img/loading.gif +0 -0
  114. data/assets/themes/j1/modules/_lightGallery/css/img/video-play.png +0 -0
  115. data/assets/themes/j1/modules/_lightGallery/css/img/vimeo-play.png +0 -0
  116. data/assets/themes/j1/modules/_lightGallery/css/img/youtube-play.png +0 -0
  117. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/animation-w.png +0 -0
  118. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/customize-w.png +0 -0
  119. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/dynamic-w.png +0 -0
  120. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/facebook-icon.svg +0 -10
  121. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/googleplus-icon.svg +0 -30
  122. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/html5-w.png +0 -0
  123. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/linked-in.png +0 -0
  124. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/module-w.png +0 -0
  125. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/play-button.png +0 -0
  126. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/responsive-w.png +0 -0
  127. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/thumb-w.png +0 -0
  128. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/touch-w.png +0 -0
  129. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/twitter-icon.svg +0 -15
  130. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/twitter.png +0 -0
  131. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/video1-w.png +0 -0
  132. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/zoom-w.png +0 -0
  133. data/assets/themes/j1/modules/_lightGallery/css/themes/icons/zoom.png +0 -0
  134. data/assets/themes/j1/modules/_lightGallery/css/themes/uno.css +0 -262
  135. data/assets/themes/j1/modules/_lightGallery/css/themes/uno.min.css +0 -15
  136. data/assets/themes/j1/modules/_lightGallery/js/core/lightgallery.js +0 -1362
  137. data/assets/themes/j1/modules/_lightGallery/js/core/lightgallery.min.js +0 -4
  138. data/assets/themes/j1/modules/_lightGallery/js/modules/j1/j1-video.js +0 -402
  139. data/assets/themes/j1/modules/_lightGallery/js/modules/j1/j1-video.min.js +0 -8
  140. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-autoplay.js +0 -206
  141. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-autoplay.min.js +0 -5
  142. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-fullscreen.js +0 -126
  143. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-fullscreen.min.js +0 -5
  144. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-hash.js +0 -101
  145. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-hash.min.js +0 -5
  146. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-pager.js +0 -105
  147. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-pager.min.js +0 -5
  148. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-share.js +0 -107
  149. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-share.min.js +0 -5
  150. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-thumbnail.js +0 -478
  151. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-thumbnail.min.js +0 -5
  152. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-video.js +0 -342
  153. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-video.min.js +0 -5
  154. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-zoom.js +0 -527
  155. data/assets/themes/j1/modules/_lightGallery/js/modules/lg-zoom.min.js +0 -5
  156. data/lib/starter_web/_data/modules/defaults/cookiebar.yml +0 -133
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 87c90ad224441e01f362a466acfbc93a089fc9c1a91402b43fc8434476ffd433
4
- data.tar.gz: 3e6110304061098be73fc59be51ab8356747e8d0c8acc965dc0609fd6934b0a2
3
+ metadata.gz: 97a2ffad558d631cb06dbbac5033bbd4acd2a0fd98d7008418521e49c012e463
4
+ data.tar.gz: 853ef7944411765e0c17fa317a313ce32a1d0942b64fc6a210add62929eb1a78
5
5
  SHA512:
6
- metadata.gz: bc0aa9d6f7abe65be13a8d1f8568f259a66d9366ba54a5ba0ecf50f7ccb9b847e24310cb095d7d55a1ec1dc9c6344415c70143ec9a9e1264963c86edce03b8b4
7
- data.tar.gz: 2a00b24f31e303fc2003ac5cb23b0715b203fcf377895cd13b67a9b8f3ee9c995f7baa0b1464120555d0ad38496b82ee25f49892b0e0c2c6be1261d96f598652
6
+ metadata.gz: 3f16a6a99c5c13cee200aa184bb54804f1d7f4f41f32bf301198d44a896c70ebadc5aa7aa148f5a99d135aef24d4367f215f76943c1d65983be35863a10326e4
7
+ data.tar.gz: 4a29e5243834485b4c7a35174777614e6e31ff17a20b24619069772c60c6cc9ca9b27faf66fec5ce91a4de9de065a7405bc38ce20360d635147aa1c7cf835506
@@ -193,8 +193,8 @@
193
193
  {% comment %} PRELOAD CSS files
194
194
  -------------------------------------------------------------------------------- {% endcomment %}
195
195
  {% if template_config.preload.css.preload %}
196
- <!-- [INFO ] [j1.layout.meta_data_generator.html ] [ Gratulations! PRELOAD of css: enabled ] -->
197
- <!-- [SEO ] [j1.layout.meta_data_generator.html ] [ request PRELOAD of font to prioritize fetching ] -->
196
+ <!-- [INFO ] [j1.layout.meta_data_generator.html ] [ Gratulations! PRELOAD of css: enabled ] -->
197
+ <!-- [SEO ] [j1.layout.meta_data_generator.html ] [ request PRELOAD of font to prioritize fetching ] -->
198
198
  {% assign css = template_config.preload.css.css %}
199
199
  {% assign files = template_config.preload.css.files %}
200
200
  {% for file in css %}
@@ -213,8 +213,8 @@
213
213
  {% comment %} PRELOAD JS files
214
214
  -------------------------------------------------------------------------------- {% endcomment %}
215
215
  {% if template_config.preload.js.preload %}
216
- <!-- [INFO ] [j1.layout.meta_data_generator.html ] [ Gratulations! PRELOAD of js: enabled ] -->
217
- <!-- [SEO ] [j1.layout.meta_data_generator.html ] [ request PRELOAD of font to prioritize fetching ] -->
216
+ <!-- [INFO ] [j1.layout.meta_data_generator.html ] [ Gratulations! PRELOAD of js: enabled ] -->
217
+ <!-- [SEO ] [j1.layout.meta_data_generator.html ] [ request PRELOAD of font to prioritize fetching ] -->
218
218
  {% assign js = template_config.preload.js.js %}
219
219
  {% assign files = template_config.preload.js.files %}
220
220
  {% for file in js %}
@@ -1,7 +1,7 @@
1
1
  {% comment %}
2
2
  # -----------------------------------------------------------------------------
3
3
  # ~/_includes/themes/j1/procedures/provider/ad/google-adsense.html
4
- # Support of Advertising Provider Google Adsense for J1 Template
4
+ # Support of advertising provider Google Adsense for J1 Template
5
5
  #
6
6
  # Product/Info:
7
7
  # http://jekyll.one
@@ -26,20 +26,6 @@
26
26
  {% comment %} Main
27
27
  -------------------------------------------------------------------------------- {% endcomment %}
28
28
 
29
- <!-- Google Adsense -->
30
- <script data-ad-client="{{publisher_id}}"
31
- async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
32
- </script>
33
-
34
- {% comment %} to be checked
35
- --------------------------------------------------------------------------------
36
- <script data-ad-client="{{publisher_id}}"
37
- async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
38
- </script>
39
- -------------------------------------------------------------------------------- {% endcomment %}
40
-
41
- {% comment %} to be checked
42
- --------------------------------------------------------------------------------
43
29
  <script data-ad-client="{{publisher_id}}"
44
30
  $(document).ready(function() {
45
31
  var dependencies_met_page_finished = setInterval (function () {
@@ -49,6 +35,12 @@
49
35
  }
50
36
  }, 25); // END dependencies_met_page_finished
51
37
  </script>
38
+
39
+ {% comment %} to be checked
40
+ --------------------------------------------------------------------------------
41
+ <script data-ad-client="{{publisher_id}}"
42
+ async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
43
+ </script>
52
44
  -------------------------------------------------------------------------------- {% endcomment %}
53
45
 
54
46
  {% comment %} Old Ads code
@@ -22,22 +22,33 @@
22
22
  {% comment %} Variables
23
23
  -------------------------------------------------------------------------------- {% endcomment %}
24
24
  {% assign advertising = site.data.j1_config.advertising.enabled %}
25
+ {% assign advertising_page = page.advertising.enabled %}
25
26
  {% assign advertising_provider = site.data.j1_config.advertising.provider %}
26
27
 
27
28
  {% comment %} Main
28
29
  -------------------------------------------------------------------------------- {% endcomment %}
29
- <!-- [INFO ] [j1.modules.connectors.ads ] [ detected advertising (j1_config): {{advertising}} ] -->
30
- <!-- [INFO ] [j1.modules.connectors.ads ] [ detected advertising (page): {{page.advertising}}} ] -->
30
+ <!-- [INFO ] [j1.modules.connectors.ads ] [ Check ads settings from SITE configuration ] -->
31
+ <!-- [INFO ] [j1.modules.connectors.ads ] [ detected ads (site): {{advertising}} ] -->
31
32
 
32
- {% if advertising and page.advertising %}
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}} ] -->
33
+ {% comment %} Check ads settings from PAGE configuration
34
+ -------------------------------------------------------------------------------- {% endcomment %}
35
+ <!-- [INFO ] [j1.modules.connectors.ads ] [ Check ads settings from PAGE configuration ] -->
36
+ <!-- [INFO ] [j1.modules.connectors.ads ] [ detected ads (page): {{page.advertising}} ] -->
37
+
38
+ {% if advertising_page <> nil %}
39
+ <!-- [INFO ] [j1.modules.connectors.ads ] [ overload ads settings from PAGE ] -->
40
+ {% assign advertising = advertising_page %}
41
+ {% endif %}
42
+
43
+ {% if advertising %}
44
+ <!-- [INFO ] [j1.modules.connectors.ads ] [ detected advertising provider (j1_config): {{advertising_provider}}} ] -->
45
+ <!-- [INFO ] [j1.modules.connectors.ads ] [ start processing load region head, layout: {{page.layout}} ] -->
35
46
  {% case advertising_provider %}
36
47
  {% when "google" %}
37
- <!-- [INFO ] [j1.modules.connectors.ads ] [ place provider: Google Adsense ] -->
48
+ <!-- [INFO ] [j1.modules.connectors.ads ] [ place provider: Google Adsense ] -->
38
49
  {% include themes/{{site.template.name}}/modules/connectors/ad/google-adsense.html %}
39
50
  {% when "custom" %}
40
- <!-- [INFO ] [j1.modules.connectors.ads ] [ place provider: Custom Provider ] -->
51
+ <!-- [INFO ] [j1.modules.connectors.ads ] [ place provider: Custom Provider ] -->
41
52
  {% include themes/{{site.template.name}}/modules/connectors/ad/custom-provider.html %}
42
53
  {% endcase %}
43
54
 
@@ -1,7 +1,7 @@
1
1
  {% comment %}
2
2
  # -----------------------------------------------------------------------------
3
3
  # ~/_includes/themes/j1/modules/connectors/analytic/google-analytics.html
4
- # Support of Analytics Provider Google Analytics (V4) for J1 Template
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
- <!-- Google Analytics: provide global site tag (gtag.js) -->
29
+ <!-- load the GA library -->
30
30
  <script async src="https://www.googletagmanager.com/gtag/js?id={{tracking_id}}"></script>
31
+
32
+ <!-- GA depends on the cookie consent and is enabled/disabled on OptIn/Out-->
33
+ <!--
31
34
  <script>
32
35
  window.dataLayer = window.dataLayer || [];
33
36
  function gtag(){dataLayer.push(arguments);}
34
37
  gtag('js', new Date());
35
38
  gtag('config', '{{tracking_id}}');
36
39
  </script>
40
+ -->
@@ -22,15 +22,29 @@
22
22
  {% comment %} Variables
23
23
  -------------------------------------------------------------------------------- {% endcomment %}
24
24
  {% assign analytics = site.data.j1_config.analytics.enabled %}
25
+ {% assign analytics_page = page.analytics.enabled %}
25
26
  {% assign analytics_provider = site.data.j1_config.analytics.provider %}
26
27
 
27
28
 
28
29
  {% comment %} Main
29
30
  -------------------------------------------------------------------------------- {% endcomment %}
30
- <!-- [INFO ] [j1.modules.connectors.analytics ] [ detected analytics (j1_config): {{analytics}} ] -->
31
- <!-- [INFO ] [j1.modules.connectors.analytics ] [ detected analytics (page): {{page.analytics}}} ] -->
32
31
 
33
- {% if analytics and page.analytics %}
32
+ {% comment %} Check analytics settings from SITE configuration
33
+ -------------------------------------------------------------------------------- {% endcomment %}
34
+ <!-- [INFO ] [j1.modules.connectors.analytics ] [ Check analytics settings from SITE configuration ] -->
35
+ <!-- [INFO ] [j1.modules.connectors.analytics ] [ detected analytics (site): {{analytics}} ] -->
36
+
37
+ {% comment %} Check analytics settings from PAGE configuration
38
+ -------------------------------------------------------------------------------- {% endcomment %}
39
+ <!-- [INFO ] [j1.modules.connectors.analytics ] [ Check analytics settings from PAGE configuration ] -->
40
+ <!-- [INFO ] [j1.modules.connectors.analytics ] [ detected analytics (page): {{page.analytics}} ] -->
41
+
42
+ {% if analytics_page <> nil %}
43
+ <!-- [INFO ] [j1.modules.connectors.analytics ] [ overload analytics settings from PAGE ] -->
44
+ {% assign analytics = analytics_page %}
45
+ {% endif %}
46
+
47
+ {% if analytics %}
34
48
  <!-- [INFO ] [j1.modules.connectors.analytics ] [ detected analytics provider (j1_config): {{analytics_provider}}} ] -->
35
49
  <!-- [INFO ] [j1.modules.connectors.analytics ] [ start processing load region head, layout: {{page.layout}} ] -->
36
50
  {% case analytics_provider %}
@@ -22,26 +22,40 @@
22
22
  {% comment %} Variables
23
23
  -------------------------------------------------------------------------------- {% endcomment %}
24
24
  {% assign comments = site.data.j1_config.comments.enabled %}
25
+ {% assign comments_page = page.comments.enabled %}
25
26
  {% assign comment_provider = site.data.j1_config.comments.provider %}
26
27
 
27
28
  {% comment %} Main
28
29
  -------------------------------------------------------------------------------- {% endcomment %}
29
- <!-- [INFO ] [j1.modules.connectors.comments ] [ detected comments (j1_config): {{comments}} ] -->
30
- <!-- [INFO ] [j1.modules.connectors.comments ] [ detected comments (page): {{page.comments}}} ] -->
31
30
 
32
- {% if comments and page.comments %}
33
- <!-- [INFO ] [j1.modules.connectors.comments ] [ start processing load region head, layout: {{page.layout}} ] -->
31
+ {% comment %} Check comments settings from SITE configuration
32
+ -------------------------------------------------------------------------------- {% endcomment %}
33
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ Check comments settings from SITE configuration ] -->
34
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ detected comments (site): {{comments}} ] -->
35
+
36
+ {% comment %} Check comments settings from PAGE configuration
37
+ -------------------------------------------------------------------------------- {% endcomment %}
38
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ Check comments settings from PAGE configuration ] -->
39
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ detected comments (page): {{page.comments}} ] -->
40
+
41
+ {% if comments_page <> nil %}
42
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ overload comments settings from PAGE ] -->
43
+ {% assign comments = comments_page %}
44
+ {% endif %}
45
+
46
+ {% if comments %}
47
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ start processing load region head, layout: {{page.layout}} ] -->
34
48
  {% case comment_provider %}
35
49
  {% when "disqus" %}
36
- <!-- [INFO ] [j1.modules.connectors.comments ] [ place comment provider DISQUS ] -->
50
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ place comment provider DISQUS ] -->
37
51
  {% include themes/{{site.template.name}}/modules/connectors/comment/disqus.html %}
38
52
  {% when "facebook" %}
39
- <!-- [INFO ] [j1.modules.connectors.comments ] [ place comment provider FACEBOOK ] -->
53
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ place comment provider FACEBOOK ] -->
40
54
  {% include themes/{{site.template.name}}/procedures/provider/comment/facebook.html %}
41
55
  {% when "custom" %}
42
- <!-- [INFO ] [j1.modules.connectors.comments ] [ place comment provider CUSTOM ] -->
56
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ place comment provider CUSTOM ] -->
43
57
  {% include themes/{{site.template.name}}/procedures/provider/comment/custom-provider.html %}
44
58
  {% endcase %}
45
59
 
46
60
  {% endif %}
47
- <!-- [INFO ] [j1.modules.connectors.comments ] [ end processing ] -->
61
+ <!-- [INFO ] [j1.modules.connectors.comments ] [ end processing ] -->
@@ -22,23 +22,37 @@
22
22
  {% comment %} Variables
23
23
  -------------------------------------------------------------------------------- {% endcomment %}
24
24
  {% assign translation = site.data.j1_config.translation.enabled %}
25
+ {% assign translation_page = page.translation.enabled %}
25
26
  {% assign translation_provider = site.data.j1_config.translation.provider %}
26
27
 
27
28
  {% comment %} Main
28
29
  -------------------------------------------------------------------------------- {% 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
+ {% comment %} Check translation settings from SITE configuration
32
+ -------------------------------------------------------------------------------- {% endcomment %}
33
+ <!-- [INFO ] [j1.modules.connectors.translation ] [ Check translation settings from SITE configuration ] -->
34
+ <!-- [INFO ] [j1.modules.connectors.translation ] [ detected translation (site): {{translation}} ] -->
35
+
36
+ {% comment %} Check translation settings from PAGE configuration
37
+ -------------------------------------------------------------------------------- {% endcomment %}
38
+ <!-- [INFO ] [j1.modules.connectors.translation ] [ Check translation settings from PAGE configuration ] -->
39
+ <!-- [INFO ] [j1.modules.connectors.translation ] [ detected translation (page): {{page.translation}} ] -->
40
+
41
+ {% if translation_page <> nil %}
42
+ <!-- [INFO ] [j1.modules.connectors.translation ] [ overload translation settings from PAGE ] -->
43
+ {% assign translation = translation_page %}
44
+ {% endif %}
31
45
 
32
46
  {% if translation %}
33
- <!-- [INFO ] [j1.modules.connectors.translator ] [ start processing load region head, layout: {{page.layout}} ] -->
47
+ <!-- [INFO ] [j1.modules.connectors.translation ] [ start processing load region head, layout: {{page.layout}} ] -->
34
48
  {% case translation_provider %}
35
49
  {% when "google" %}
36
- <!-- [INFO ] [j1.modules.connectors.translator ] [ place Google Translator ] -->
50
+ <!-- [INFO ] [j1.modules.connectors.translation ] [ place Google Translator ] -->
37
51
  {% include themes/{{site.template.name}}/modules/connectors/translators/google-translator.html %}
38
52
  {% when "custom" %}
39
- <!-- [INFO ] [j1.modules.connectors.translator ] [ place Custom Translation Provider ] -->
53
+ <!-- [INFO ] [j1.modules.connectors.translation ] [ place Custom Translation Provider ] -->
40
54
  {% include themes/{{site.template.name}}/modules/connectors/translators/custom-translator.html %}
41
55
  {% endcase %}
42
56
 
43
57
  {% endif %}
44
- <!-- [INFO ] [j1.modules.connectors.translator ] [ end processing ] -->
58
+ <!-- [INFO ] [j1.modules.connectors.translation ] [ end processing ] -->
@@ -50,8 +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
- {% assign cookiebar_defaults = site.data.modules.defaults.cookiebar.defaults %}
54
- {% assign cookiebar_settings = site.data.modules.cookiebar.settings %}
53
+ {% assign consent_defaults = site.data.modules.defaults.cookieconsent.defaults %}
54
+ {% assign consent_settings = site.data.modules.cookieconsent.settings %}
55
55
 
56
56
  {% comment %} Set config data
57
57
  -------------------------------------------------------------------------------- {% endcomment %}
@@ -81,7 +81,7 @@
81
81
  <!-- [INFO ] [j1.procedures.select_location.proc ] [ fallback location LOCAL selected: {{location_local}} ] -->
82
82
  {% capture location_source %}{{base_path}}/{{location_local}}{% endcapture %}
83
83
  {% else %}
84
- <!-- [FATAL ] [j1.procedures.select_location.proc ] [ no valid resource locator for REMOTE found ] -->
84
+ <!-- [ERROR ] [j1.procedures.select_location.proc ] [ no valid resource locator for REMOTE found ] -->
85
85
  <!-- [WARN ] [j1.procedures.select_location.proc ] [ fallback location LOCAL selected ] -->
86
86
  {% capture location_source %}{{base_path}}/{{location_local}}{% endcapture %}
87
87
  {% comment %} DISABLED !!!
@@ -97,7 +97,7 @@
97
97
  <!-- [INFO ] [j1.procedures.select_location.proc ] [ preferred location LOCAL detected: {{location_local}} ] -->
98
98
  {% capture location_source %}{{base_path}}/{{location_local}}{% endcapture %}
99
99
  {% else %}
100
- <!-- [FATAL ] [j1.procedures.select_location.proc ] [ no valid resource locator for LOCAL found ] -->
100
+ <!-- [ERROR ] [j1.procedures.select_location.proc ] [ no valid resource locator for LOCAL found ] -->
101
101
  <!-- [WARN ] [j1.procedures.select_location.proc ] [ fallback location LOCAL selected ] -->
102
102
  {% capture location_source %}{{base_path}}/{{locator}}{% endcapture %}
103
103
  {% comment %} DISABLED !!!
@@ -109,7 +109,7 @@
109
109
  {% comment %} NO valid locator detected
110
110
  -------------------------------------------------------------------------- {% endcomment %}
111
111
  {% else %}
112
- <!-- [FATAL ] [j1.procedures.select_location.proc ] [ no valid resource locator found ] -->
112
+ <!-- [ERROR ] [j1.procedures.select_location.proc ] [ no valid resource locator found ] -->
113
113
  <!-- [WARN ] [j1.procedures.select_location.proc ] [ fallback location LOCAL selected ] -->
114
114
  {% capture location_source %}{{base_path}}/{{locator}}{% endcapture %}
115
115
  {% comment %} DISABLED !!!
@@ -62,8 +62,6 @@ layout: compress
62
62
 
63
63
  {% comment %} Set config data
64
64
  -------------------------------------------------------------------------------- {% endcomment %}
65
- {% assign cookiebar_settings = modules.cookiebar.settings %}
66
- {% assign cookiebar_defaults = modules.defaults.cookiebar.defaults %}
67
65
 
68
66
  {% comment %} Webhooks disabled
69
67
  --------------------------------------------------------------------------------
@@ -73,7 +71,6 @@ layout: compress
73
71
 
74
72
  {% comment %} Set config options
75
73
  -------------------------------------------------------------------------------- {% endcomment %}
76
- {% assign cookiebar_options = cookiebar_defaults | merge: cookiebar_settings %}
77
74
  {% assign tooltips_options = template_config.bootstrap.tooltips %}
78
75
  {% assign popovers_options = template_config.bootstrap.popovers %}
79
76
 
@@ -160,14 +157,14 @@ layout: compress
160
157
  </body>
161
158
 
162
159
  {% comment %} Place|Initialize module components
160
+ ------------------------------------------------------------------------------
161
+ NOTE: xhr_container should be DYNAMICALLY placed by
162
+ the module using it !!!
163
+ Example CookieConsent
163
164
  ------------------------------------------------------------------------------ {% endcomment %}
164
165
 
165
166
  {% comment %} Place container for Cookiebar modals
166
167
  ------------------------------------------------------------------------------ {% endcomment %}
167
- {% if cookiebar_options.enabled %}
168
- <!-- [INFO ] [j1.layout.default.html ] [ place container for Cookiebar modals ] -->
169
- <div id="{{cookiebar_options.xhr_container_id}}"></div>
170
- {% endif %}
171
168
 
172
169
  {% comment %} Place container for WebHook modals
173
170
  ------------------------------------------------------------------------------ {% endcomment %}
@@ -0,0 +1,249 @@
1
+ ---
2
+ regenerate: true
3
+ ---
4
+
5
+ {% capture cache %}
6
+
7
+ {% comment %}
8
+ # -----------------------------------------------------------------------------
9
+ # ~/assets/data/cookieconsent.html
10
+ # Liquid PROCEDURE to generate the HTML (data) portion of all modals used
11
+ # by J1 Cookie Consent module
12
+ #
13
+ # Product/Info:
14
+ # https://jekyll.one
15
+ #
16
+ # Copyright (C) 2021 Juergen Adams
17
+ #
18
+ # J1 Template is licensed under the MIT License.
19
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
20
+ # -----------------------------------------------------------------------------
21
+ # Test data:
22
+ # liquid_var: {{ liquid_var | debug }}
23
+ # config: {{ config | debug }}
24
+ # -----------------------------------------------------------------------------
25
+ {% endcomment %}
26
+
27
+ {% comment %} Liquid procedures
28
+ -------------------------------------------------------------------------------- {% endcomment %}
29
+
30
+ {% comment %} Set global settings
31
+ -------------------------------------------------------------------------------- {% endcomment %}
32
+ {% assign environment = site.environment %}
33
+
34
+ {% comment %} Set config files
35
+ -------------------------------------------------------------------------------- {% endcomment %}
36
+ {% assign modules = site.data.modules %}
37
+
38
+ {% comment %} Process YML config data
39
+ ================================================================================ {% endcomment %}
40
+
41
+ {% comment %} Set config files
42
+ -------------------------------------------------------------------------------- {% endcomment %}
43
+ {% assign consent_defaults = modules.defaults.cookieconsent.defaults %}
44
+ {% assign consent_settings = modules.cookieconsent.settings %}
45
+
46
+ {% comment %} Set config options
47
+ -------------------------------------------------------------------------------- {% endcomment %}
48
+ {% assign consent_options = consent_defaults | merge: consent_settings %}
49
+
50
+ {% assign production = false %}
51
+ {% if environment == 'prod' or environment == 'production' %}
52
+ {% assign production = true %}
53
+ {% endif %}
54
+
55
+
56
+ {% comment %} Main
57
+ ================================================================================ {% endcomment %}
58
+ <!-- [INFO ] [j1.assets.data.cookiebar.html ] [ set meta data (robots) to exclude HTML datafiles from index ] -->
59
+ <head>
60
+ <meta name="robots" content="noindex, nofollow" />
61
+ </head>
62
+
63
+ {% comment %} Modal cookie consent dialog (default: en-EN)
64
+ -------------------------------------------------------------------------------- {% endcomment %}
65
+ <div id="consent-data-en">
66
+ <div id="modal-consent-en" class="modal-dialog modal-frame modal-top modal-notify modal-primary" role="document">
67
+ <div class="modal-content">
68
+ <div class="modal-header">
69
+ <p class="lead">{{consent_options.consent_modal_title.en}}</p>
70
+ </div>
71
+ <div class="modal-body">
72
+ <div class="bccs-body-text" style="font-size: 90%">
73
+ <p class="mb-4">{{consent_options.body_text.en}}</p>
74
+ </div>
75
+ <p>
76
+ <a href="#bccs-privacy" data-toggle="collapse" class="">Privacy Notice</a>
77
+ <a href="#bccs-options" data-toggle="collapse" class="float-right">Settings</a>
78
+ </p>
79
+
80
+ <div id="bccs-privacy" class="collapse">
81
+ <div class="bccs-body-text" style="font-size: 90%">
82
+ <p class="mb-4">{{consent_options.privacy_notice.en}}</p>
83
+ </div>
84
+ </div>
85
+
86
+ <div id="bccs-options" class="collapse">
87
+ <p class="tagline mt-4 mb-1"><b>Your settings</b></p>
88
+ <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-3"></div>
89
+
90
+ <div class="bccs-option" data-name="necessary">
91
+ <div class="switch">
92
+ <label>
93
+ <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" disabled="" checked="">
94
+ <span class="bmd-switch-track"></span>
95
+ Necessary
96
+ </label>
97
+ <ul>
98
+ <li>Required to run the website</li>
99
+ </ul>
100
+ </div>
101
+ </div>
102
+ <div class="bccs-option" data-name="analyses">
103
+ <div class="switch">
104
+ <label>
105
+ <input id="bccs-checkboxAnalyses" type="checkbox" name="bccs-checkboxAnalyses" checked="">
106
+ <span class="bmd-switch-track"></span>
107
+ Analyses
108
+ </label>
109
+ <ul>
110
+ <li>Monitoring website usage</li>
111
+ <li>Optimizing the user experience</li>
112
+ </ul>
113
+ </div>
114
+ </div>
115
+ <div class="bccs-option" data-name="personalization">
116
+ <div class="switch">
117
+ <label>
118
+ <input id="bccs-checkboxPersonalization" type="checkbox" name="bccs-checkboxPersonalization" checked="">
119
+ <span class="bmd-switch-track"></span>
120
+ Personalization
121
+ </label>
122
+ <ul>
123
+ <li>Storage of your preferences from previous visits</li>
124
+ <li>Collecting user feedback to improve our website</li>
125
+ <li>Recording of your interests in order to provide customised content and offers</li>
126
+ </ul>
127
+ </div>
128
+ </div>
129
+ </div>
130
+ </div>
131
+ <div class="modal-footer">
132
+ <button id="bccs-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="">
133
+ I do not agree
134
+ </button>
135
+ <button id="bccs-buttonAgree" type="button" class="btn btn-primary btn-raised" style="">
136
+ Agree
137
+ </button>
138
+ <button id="bccs-buttonSave" type="button" class="btn btn-primary" style="display: none;">
139
+ Save selection
140
+ </button>
141
+ <button id="bccs-buttonAgreeAll" type="button" class="btn btn-primary btn-raised" style="display: none;">
142
+ Agree on all
143
+ </button>
144
+ </div>
145
+ </div>
146
+ </div>
147
+ </div>
148
+
149
+ {% comment %} END Modal cookie consent dialog (en-EN)
150
+ -------------------------------------------------------------------------------- {% endcomment %}
151
+
152
+
153
+
154
+ {% comment %} Modal cookie consent dialog (de-DE)
155
+ -------------------------------------------------------------------------------- {% endcomment %}
156
+ <div id="consent-data-de">
157
+ <div id="modal-consent-de" class="modal-dialog modal-frame modal-top modal-notify modal-primary" role="document">
158
+ <div class="modal-content">
159
+ <div class="modal-header">
160
+ <p class="lead">{{consent_options.consent_modal_title.de}}</p>
161
+ </div>
162
+ <div class="modal-body">
163
+ <div class="bccs-body-text" style="font-size: 90%">
164
+ <p class="mb-4">{{consent_options.body_text.de}}</p>
165
+ </div>
166
+ <p>
167
+ <a href="#bccs-privacy" data-toggle="collapse" class="">Datenschutzerklärung</a>
168
+ <a href="#bccs-options" data-toggle="collapse" class="float-right">Einstellungen</a>
169
+ </p>
170
+
171
+ <div id="bccs-privacy" class="collapse">
172
+ <div class="bccs-body-text" style="font-size: 90%">
173
+ <p class="mb-4">{{consent_options.privacy_notice.de}}</p>
174
+ </div>
175
+ </div>
176
+
177
+ <div id="bccs-options" class="collapse">
178
+ <p class="tagline mt-4 mb-1"><b>Ihre Einstellungen</b></p>
179
+ <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-3"></div>
180
+
181
+ <div class="bccs-option" data-name="necessary">
182
+ <div class="switch">
183
+ <label>
184
+ <input id="bccs-checkboxNecessary" type="checkbox" name="bccs-checkboxNecessary" disabled="" checked="">
185
+ <span class="bmd-switch-track"></span>
186
+ Notwendig
187
+ </label>
188
+ <ul>
189
+ <li>Zum Betrieb der Website erforderlich</li>
190
+ </ul>
191
+ </div>
192
+ </div>
193
+ <div class="bccs-option" data-name="analyses">
194
+ <div class="switch">
195
+ <label>
196
+ <input id="bccs-checkboxAnalyses" type="checkbox" name="bccs-checkboxAnalyses" checked="">
197
+ <span class="bmd-switch-track"></span>
198
+ Analysen
199
+ </label>
200
+ <ul>
201
+ <li>Beobachtung der Website-Nutzung</li>
202
+ <li>Optimierung der Benutzererfahrung</li>
203
+ </ul>
204
+ </div>
205
+ </div>
206
+ <div class="bccs-option" data-name="personalization">
207
+ <div class="switch">
208
+ <label>
209
+ <input id="bccs-checkboxPersonalization" type="checkbox" name="bccs-checkboxPersonalization" checked="">
210
+ <span class="bmd-switch-track"></span>
211
+ Personalisierung
212
+ </label>
213
+ <ul>
214
+ <li>Speicherung Ihrer Präfererenzen aus frühreren Besuchen</li>
215
+ <li>Sammeln von Benutzer-Feedback zur Verbesserung unserer Website</li>
216
+ <li>Erfassung Ihrer Interessen, um maßgeschneiderte Inhalte und Angebote anzubieten</li>
217
+ </ul>
218
+ </div>
219
+ </div>
220
+ </div>
221
+ </div>
222
+ <div class="modal-footer">
223
+ <button id="bccs-buttonDoNotAgree" type="button" class="btn btn-link text-decoration-none" style="">
224
+ Ich bin nicht einverstanden
225
+ </button>
226
+ <button id="bccs-buttonAgree" type="button" class="btn btn-primary btn-raised" style="">
227
+ Einverstanden
228
+ </button>
229
+ <button id="bccs-buttonSave" type="button" class="btn btn-primary" style="display: none;">
230
+ Auswahl speichern
231
+ </button>
232
+ <button id="bccs-buttonAgreeAll" type="button" class="btn btn-primary btn-raised" style="display: none;">
233
+ Allen zustimmen
234
+ </button>
235
+ </div>
236
+ </div>
237
+ </div>
238
+ </div>
239
+ {% comment %} END Modal cookie consent dialog (de-DE)
240
+ -------------------------------------------------------------------------------- {% endcomment %}
241
+
242
+ {% endcapture %}
243
+
244
+ {% if production %}
245
+ {% capture _LINE_FEED %}{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ cache | strip_html_comments }}{% else %}{% capture _content %}{{ cache | strip_html_comments }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ cache | strip_html_comments | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}
246
+ {% else %}
247
+ {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
248
+ {% endif %}
249
+ {% assign cache = nil %}