j1-template 2021.1.28 → 2021.1.29

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6d149f9e04f389fc677449fe654ff144b8536834de7cb6bc9f61c806df4ca858
4
- data.tar.gz: 95ee34bd117d6c2b6a49274d21048be1cb5e530a6474d3055f006aa8e2197f34
3
+ metadata.gz: 1dea149afebef9dd59d1a3c57c11c49529f276a14b45cd23233c329c15241832
4
+ data.tar.gz: 49d03803cbb2b25b16bcca736824eff674d275ae5fd43e981e390c36b6d640f3
5
5
  SHA512:
6
- metadata.gz: 2fa157e83398f1cb9fb4f1307706acc3e1a003566e8b07ff963cac9031846798bc4fc3f667e669678fe4ced86bd07e593ac7c166e0c4ff25662be7c98e27e9fe
7
- data.tar.gz: f89a9f07ffccf9f204d2aac60fdb386deac13b1bf018e9e12fe5a6ad7b06e1df20c62c00999c4c2a9f82552e191f8b9ef8b173e01bc74ad28ff675e0ee57f75a
6
+ metadata.gz: 68d532d58db2ea87b11911fdec65f1b038567c4f3984198a4c739806f232b057f660c79d5f7d8d1c9a5262a3ad25631e78581ca18dea30eae8dcd2dae175d81e
7
+ data.tar.gz: '05359dea7e854aad8a78e75ed863b60df4f547637da8d9b0276d31f6959195d2854ddc5fa4e348a2c3a62e9b170a9b80bb2a8521af2f4f7927fb9e36d7b5614a'
@@ -87,7 +87,7 @@
87
87
 
88
88
  {% comment %} Set global settings
89
89
  -------------------------------------------------------------------------------- {% endcomment %}
90
- {% assign nav_bar_id = navigator_defaults.nav_bar.xhr_container_id %}
90
+ {% assign nav_bar_id = navigator_defaults.nav_bar.container_id %}
91
91
  {% assign nav_menu_id = navigator_defaults.nav_menu.xhr_container_id %}
92
92
  {% assign nav_mmenu_id = navigator_defaults.nav_mmenu.xhr_container_id %}
93
93
  {% assign nav_sidebar_id = navigator_defaults.nav_sidebar.xhr_container_id %}
@@ -1000,7 +1000,7 @@ var j1 = (function () {
1000
1000
  }
1001
1001
  } else {
1002
1002
  if (comments) {
1003
- logger.warn('\n' + 'enable comment provider: ' + comment_provider);
1003
+ logger.info('\n' + 'enable comment provider: ' + comment_provider);
1004
1004
  $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
1005
1005
  if (comment_provider === 'disqus') {
1006
1006
  logger.info('\n' + 'load comment provider code: ' + comment_provider);
@@ -1042,9 +1042,9 @@ var j1 = (function () {
1042
1042
  if (tracking_enabled && !tracking_id_valid) {
1043
1043
  logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
1044
1044
  } else if (tracking_enabled && tracking_id_valid) {
1045
- logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
1045
+ logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
1046
1046
  } else {
1047
- logger.warn('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
1047
+ logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
1048
1048
  }
1049
1049
  } else {
1050
1050
  logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);
@@ -1150,7 +1150,7 @@ var j1 = (function () {
1150
1150
  }
1151
1151
  } else {
1152
1152
  if (comments) {
1153
- logger.warn('\n' + 'enable comment provider: ' + comment_provider);
1153
+ logger.info('\n' + 'enable comment provider: ' + comment_provider);
1154
1154
  $('#main-content').append('<h2 id="leave-a-comment" class="mt-4">{{comments_headline}}</h2>');
1155
1155
  if (comment_provider === 'disqus') {
1156
1156
  logger.info('\n' + 'load comment provider code: ' + comment_provider);
@@ -1203,9 +1203,9 @@ var j1 = (function () {
1203
1203
  if (tracking_enabled && !tracking_id_valid) {
1204
1204
  logger.error('\n' + 'tracking enabled, but invalid tracking id found: ' + tracking_id);
1205
1205
  } else if (tracking_enabled && tracking_id_valid) {
1206
- logger.warn('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
1206
+ logger.info('\n' + 'tracking enabled, tracking id found: ' + tracking_id);
1207
1207
  } else {
1208
- logger.warn('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
1208
+ logger.info('\n' + 'tracking disabled, tracking id found: ' + tracking_id);
1209
1209
  }
1210
1210
  } else {
1211
1211
  logger.warn('\n' + 'tracking not allowed, privacy settings for analysis: ' + user_consent.analyses);
@@ -27,7 +27,6 @@ regenerate: true
27
27
  {% comment %} Set global settings
28
28
  -------------------------------------------------------------------------------- {% endcomment %}
29
29
  {% assign environment = site.environment %}
30
- {% assign template_version = site.version %}
31
30
  {% assign asset_path = "/assets/themes/j1" %}
32
31
 
33
32
  {% comment %} Process YML config data
@@ -83,9 +82,11 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
83
82
  {% comment %} Set global variables
84
83
  ------------------------------------------------------------------------------ {% endcomment %}
85
84
  var environment = '{{environment}}';
85
+ var language = '{{site.language}}';
86
86
  var user_agent = platform.ua;
87
87
  var moduleOptions = {};
88
88
  var _this;
89
+ var lastPageInfo;
89
90
  var logger;
90
91
  var logText;
91
92
 
@@ -173,6 +174,8 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
173
174
  {% assign scrollOffset = item.scroller.scrollOffset %}
174
175
  {% assign lastPage = item.scroller.lastPage %}
175
176
  {% assign infoLastPage = item.scroller.infoLastPage %}
177
+ {% assign lastPageInfo_en = item.scroller.lastPageInfo_en %}
178
+ {% assign lastPageInfo_de = item.scroller.lastPageInfo_de %}
176
179
 
177
180
  // scroller_id: {{ scroller_id }}
178
181
  var log_text = '\n' + 'j1Scroll is being initialized on: ' + '{{scroller_id}}';
@@ -190,6 +193,20 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
190
193
  var container = '#' + '{{container}}';
191
194
  var pagePath = '{{path}}';
192
195
 
196
+ if (language === 'en') {
197
+ lastPageInfo = '<div class="page-scroll-last"><p class="infinite-scroll-last">';
198
+ lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
199
+ lastPageInfo += '</p></div>';
200
+ } else if (language === 'de') {
201
+ lastPageInfo = '<div class="page-scroll-last"><p class="infinite-scroll-last">';
202
+ lastPageInfo += '{{lastPageInfo_de|strip_newlines}}';
203
+ lastPageInfo += '</p></div>';
204
+ } else {
205
+ lastPageInfo = '<div class="page-scroll-last"><p class="infinite-scroll-last">';
206
+ lastPageInfo += '{{lastPageInfo_en|strip_newlines}}';
207
+ lastPageInfo += '</p></div>';
208
+ }
209
+
193
210
  // Create an j1Scroll instance if container exists
194
211
  if ($(container).length) {
195
212
  $(container).j1Scroll({
@@ -198,6 +215,7 @@ j1.adapter['j1Scroll'] = (function (j1, window) {
198
215
  scrollOffset: {{scrollOffset}},
199
216
  lastPage: {{lastPage}},
200
217
  infoLastPage: {{infoLastPage}},
218
+ lastPageInfo: lastPageInfo,
201
219
  });
202
220
  }
203
221