j1-template 2021.0.7 → 2021.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f01dd4e427270ca3a7ac4c21fb868f5ee0985c5dd9767eda91b64b466c2c0c8
-  data.tar.gz: 4e7ae30275c4102dd4e383249841d6f33365d8eaf36c775855d59c855ac77f5f
+  metadata.gz: a125175cbe45e72e471f0791b41c61e57a1ec4c0e018269aabda6312df689c33
+  data.tar.gz: 24ef960d123e60c66aedd129e5e39a22e6647402cd42ecb479a9f9b10298846e
 SHA512:
-  metadata.gz: 0a8ac5dbfbae496773157bba92744bddb436c8793a148093ae9d273f67a11cc813ee4ff1cf2e60d2d952e12459bd404975dbba34e686c22c86e6e58926a2d31d
-  data.tar.gz: 4e2e4c16c0ef2b743f94a1c47e536297ceb8e20e441ffcda893c7a070925575ae66dc2e87bb33d9ba428b80957b51ed8610f6d9db87f1692fc725700e9a71168
+  metadata.gz: 22232a87fdccaa04aa4e3cb6f2b7270995db3a7af3ed83e87f328bc60242763d6f383a905bb2c072811adb6d4aef30aaf39829dfaa3c9e3a3e1201938a86d135
+  data.tar.gz: 4a37a140f0cce1a465d70009738d0fe5ff4226a1120184fbef93e16286d64dc704811d00e09388b38a6f96d759225e14aa615685fbd4416adea02784c0e3743e

data/_includes/themes/j1/procedures/global/create_bs_button.proc

@@ -75,7 +75,7 @@
     {% endfor %}
 
     {% if button_href and button_target %}
-      {% capture bs_button_html %}<a href="{{button_href}}" target="{{ button_target }}" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
+      {% capture bs_button_html %}<a href="{{button_href}}" target="{{ button_target }}" rel="noopener" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
     {% elsif button_href %}
       {% capture bs_button_html %}<a href="{{button_href}}" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
     {% else %}

data/assets/data/menu.html

@@ -318,7 +318,7 @@ regenerate:                             true
       {% assign menu_type = '' %}
 
 
-      {% comment %}Collect TOP-LEVEL items (NO sub-menu)
+      {% comment %} Collect TOP-LEVEL items (NO sub-menu)
       -------------------------------------------------------------------------- {% endcomment %}
       {% when 'top_level_item' %}
         <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [found menu-type: menu-top-level-only] -->
@@ -465,35 +465,6 @@ regenerate:                             true
   {% endfor %}
   <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [nav_menu_settings: end menu] -->
   </ul>
-
-  <style>
-  /* jadams, 2021-02-16: unclear why global styles defined in CSS file */
-  /* (bootsttrap.css) not applied. For that reason, given locally for now */
-  .scrollable-menu {
-      height: auto;
-      max-height: 300px;
-      overflow-x: hidden;
-  }
-
-  .scrollable-menu::-webkit-scrollbar {
-      -webkit-appearance: none;
-      width: 12px;
-      background-color: #f5f5f5;
-  }
-
-  .scrollable-menu::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.3);
-    background-color: #424242;
-  }
-
-  .scrollable-menu::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-    border-radius: 0px;
-    background-color: #f5f5f5;
-  }
-  </style>
-
   <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [nav_menu_settings: end navbar] -->
   <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [nav_menu_settings: end processing] -->
 {% endcapture %}

data/assets/themes/j1/adapter/js/fam.js

@@ -396,16 +396,39 @@ j1.adapter['fam'] = (function (j1, window) {
       var currentNode;
       var prev_node;
       var anchor_id;
+      var index                = 0;
+      var maxNode              = $(nodes).length-1;
+      var $toc                 = $('#sidebar');
+      var current_header_id    = $toc.find('.is-active-link').attr('href');
+      var toccerScrollDuration = {{toccer_options.scrollSmoothDuration}};
+      var toccerScrollOffset   = {{toccer_options.scrollSmoothOffset}};
+
+      // Scroll offset correction if mobile or window width <= 992
+      // For smaller window sizes, the height of the menubar changes
+      //
+      // if (j1.core.isMobile() || $(window).width() <= 992) { scrollOffset += 30; }
+
+      // calculate offset for correct (smooth) scroll position
+      //
+      var $pagehead       = $('.attic');
+      var $navbar         = $('nav.navbar');
+      var $adblock        = $('#adblock');
+
+      var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+      var fontSize        = $('body').css('font-size').replace('px','');
+      var start           = window.pageYOffset;
+
+      var l               = parseInt(fontSize);
+
+      var h               = $pagehead.length ? $pagehead.height() : 0;
+      var n               = $navbar.length ? $navbar.height() : 0;
+      var a               = $adblock.length ? $adblock.height() : 0;
 
-      var index             = 0;
-      var maxNode           = $(nodes).length - 1;
-      var $toc              = $('#sidebar');
-      var current_header_id = $toc.find('.is-active-link').attr('href');
-      var scrollDuration    = {{toccer_options.scrollSmoothDuration}};
-      var scrollOffset      = {{toccer_options.scrollSmoothOffset}};
+      var scrollOffset    = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
 
-      // Correction if mobile (offset: desktop -90px, mobile -80px)
-      scrollOffset          = j1.core.isMobile() ? scrollOffset + 10 : scrollOffset;
+      // static offset, to be checked why this is needed
+      //
+      scrollOffset        = scrollOffset + toccerScrollOffset;
 
       nodes.each(function () {
         currentNode = $(this).find(current_header_id);
@@ -418,7 +441,7 @@ j1.adapter['fam'] = (function (j1, window) {
             anchor_id           = '#' + previous_header_id;
 
             j1.core.scrollSmooth.scroll( anchor_id, {
-              duration: scrollDuration,
+              duration: toccerScrollDuration,
               offset: scrollOffset,
               callback: null
             });
@@ -439,12 +462,12 @@ j1.adapter['fam'] = (function (j1, window) {
       var nextNode;
       var next_header_id;
       var next_anchor_id;
-      var index             = 0;
-      var maxNode           = $(nodes).length-1;
-//    var maxNode           = $(nodes).length;
-      var $toc              = $('#sidebar');
-      var scrollDuration    = {{toccer_options.scrollSmoothDuration}};
-      var scrollOffset      = {{toccer_options.scrollSmoothOffset}};
+      var index                 = 0;
+      var maxNode               = $(nodes).length-1;
+      var $toc                  = $('#sidebar');
+      var scrollDuration        = {{toccer_options.scrollSmoothDuration}};
+      var toccerScrollDuration  = {{toccer_options.scrollSmoothDuration}};
+      var toccerScrollOffset    = {{toccer_options.scrollSmoothOffset}};
 
       current_header_id = $toc.find('.is-active-link').attr('href');
       nodes.each(function () {
@@ -453,28 +476,37 @@ j1.adapter['fam'] = (function (j1, window) {
           if (index == maxNode) {
             return false;
           } else {
-//          nextNode              = nodes[index];
-//          next_header_id        = $(nextNode).find(':header').first()[0].id;
-//          anchor_id             = '#' + next_header_id;
             nextNode              = nodes[index+1];
             next_header_id        = $(nextNode).find(':header').first()[0].id;
             next_anchor_id        = '#' + next_header_id;
 
-            // Correction if mobile (offset: desktop -90px, mobile -80px)
-            scrollOffset          = j1.core.isMobile() ? scrollOffset + 10 : scrollOffset;
+            // calculate offset for correct (smooth) scroll position
+            //
+            var $pagehead       = $('.attic');
+            var $navbar         = $('nav.navbar');
+            var $adblock        = $('#adblock');
+
+            var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+            var fontSize        = $('body').css('font-size').replace('px','');
+            var start           = window.pageYOffset;
+
+            var l               = parseInt(fontSize);
 
-            // j1.core.scrollSmooth.scroll( next_anchor_id, {
-            //   duration: scrollDuration,
-            //   offset: scrollOffset,
-            //   callback: tocbot.refresh()
-            // });
+            var h               = $pagehead.length ? $pagehead.height() : 0;
+            var n               = $navbar.length ? $navbar.height() : 0;
+            var a               = $adblock.length ? $adblock.height() : 0;
+
+            var scrollOffset    = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
+
+            // static offset, to be checked why this is needed
+            //
+            scrollOffset        = scrollOffset + toccerScrollOffset;
 
             j1.core.scrollSmooth.scroll( next_anchor_id, {
-              duration: scrollDuration,
+              duration: toccerScrollDuration,
               offset: scrollOffset,
               callback: null
             });
-
           }
         }
         index < maxNode ? index++ : index;

data/assets/themes/j1/adapter/js/j1.js

@@ -172,7 +172,8 @@ var j1 = (function () {
 
   // user SESSION cookie (initial values)
   var user_session = {
-    'mode':                 'na',
+    'mode':                 'web',
+    'writer':               'web',
     'locale':               navigator.language || navigator.userLanguage,
     'user_name':            '{{template_config.user.user_name}}',
     'provider':             '{{template_config.user.provider}}',
@@ -324,7 +325,7 @@ var j1 = (function () {
       // detect middleware (mode 'app') and update user session cookie
       // -----------------------------------------------------------------------
       // if (user_session.mode === 'na' || user_session.mode === 'app') {
-      if (user_session.mode === 'na') {
+      if (user_session.mode === 'app') {
         var url           = new liteURL(window.location.href);
         var ep_status     = baseUrl + '/status' + '?page=' + window.location.pathname;
         var detectTimeout =  50;

data/assets/themes/j1/adapter/js/themer.js

@@ -187,7 +187,8 @@ j1.adapter['themer'] = (function (j1, window) {
 
       j1.writeCookie({
         name: cookie_user_state_name,
-        data: user_state
+        data: user_state,
+        expires: 365                                                            // was missing
       });
 
       // jadams, 2021-01-03: dependency has to be checked in more detail
@@ -196,32 +197,55 @@ j1.adapter['themer'] = (function (j1, window) {
         if (j1.getState() == 'finished') {
           if (themerOptions.enabled) {
             // enable BS ThemeSwitcher
+            //
             logger.info('themes detected as: enabled');
             logger.info('theme is being initialized: ' + user_state.theme_name);
 
+            // jadams, 2021-02-22: make sure that remote themes are loaded
+            // max retries = max_count
+
+            // load list of remote themes
+            //
             if ( $('#remote_themes').length ) {
-              /* eslint-disable */
-              // initialize Bootswatch Theme Switcher
-              $('#remote_themes').bootstrapThemeSwitcher.defaults = {
-                debug:                    themerOptions.debug,
-                saveToCookie:             themerOptions.saveToCookie,
-                cssThemeLink:             themerOptions.cssThemeLink,
-                cookieThemeName:          themerOptions.cookieThemeName,
-                cookieDefaultThemeName:   themerOptions.cookieDefaultThemeName,
-                cookieThemeCss:           themerOptions.cookieThemeCss,
-                cookieThemeExtensionCss:  themerOptions.cookieThemeExtensionCss,
-                cookieExpiration:         themerOptions.cookieExpiration,
-                cookiePath:               themerOptions.cookiePath,
-                defaultCssFile:           themerOptions.defaultCssFile,
-                bootswatchApiUrl:         themerOptions.bootswatchApiUrl,
-                bootswatchApiVersion:     themerOptions.bootswatchApiVersion,
-                loadFromBootswatch:       themerOptions.loadFromBootswatch,
-                localFeed:                themerOptions.localThemes,
-                excludeBootswatch:        themerOptions.excludeBootswatch,
-                includeBootswatch:        themerOptions.includeBootswatch,
-                skipIncludeBootswatch:    themerOptions.skipIncludeBootswatch
-              }
-              /* eslint-enable */
+              var interval_count = 0;
+              var max_count      = themerOptions.retries;                          
+
+              var dependencies_met_remote_themes_loaded = setInterval(function() {
+                interval_count += 1;
+                if ( document.getElementById("remote_themes").getElementsByTagName("li").length == 0  ) {
+                  /* eslint-disable */
+                  // initialize Bootswatch Theme Switcher
+                  $('#remote_themes').bootstrapThemeSwitcher.defaults = {
+                    debug:                    themerOptions.debug,
+                    saveToCookie:             themerOptions.saveToCookie,
+                    cssThemeLink:             themerOptions.cssThemeLink,
+                    cookieThemeName:          themerOptions.cookieThemeName,
+                    cookieDefaultThemeName:   themerOptions.cookieDefaultThemeName,
+                    cookieThemeCss:           themerOptions.cookieThemeCss,
+                    cookieThemeExtensionCss:  themerOptions.cookieThemeExtensionCss,
+                    cookieExpiration:         themerOptions.cookieExpiration,
+                    cookiePath:               themerOptions.cookiePath,
+                    defaultCssFile:           themerOptions.defaultCssFile,
+                    bootswatchApiUrl:         themerOptions.bootswatchApiUrl,
+                    bootswatchApiVersion:     themerOptions.bootswatchApiVersion,
+                    loadFromBootswatch:       themerOptions.loadFromBootswatch,
+                    localFeed:                themerOptions.localThemes,
+                    excludeBootswatch:        themerOptions.excludeBootswatch,
+                    includeBootswatch:        themerOptions.includeBootswatch,
+                    skipIncludeBootswatch:    themerOptions.skipIncludeBootswatch
+                  }
+                  /* eslint-enable */
+                } else {
+                  logger.info('remote themes loaded: successfully');
+                  logger.debug('remote themes loaded: successfully after: ' + interval_count * 25 + ' ms');
+                  clearInterval(dependencies_met_remote_themes_loaded);
+                }
+                if (interval_count > max_count) {
+                  logger.warn('remote themes loading: failed');
+                  logger.warn('continue processing');
+                  clearInterval(dependencies_met_remote_themes_loaded);
+                }
+              }, 25);
 
               logger.info('theme loaded: ' + user_state.theme_name);
               logger.info('theme css file: ' + user_state.theme_css);

data/assets/themes/j1/adapter/js/toccer.js

@@ -194,23 +194,23 @@ j1.adapter['toccer'] = (function () {
             // calculate (tocbot page) offset DYMICALLY for correct
             // smoothscroll position
             //
-            var $pagehead       = $('.attic');
-            var $navbar         = $('nav.navbar');
-            var $adblock        = $('#adblock');
-
-            var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
-            var fontSize        = $('body').css('font-size').replace('px','');
-            var start           = window.pageYOffset;
-
-            var l               = parseInt(fontSize);
-
-            var h               = $pagehead.length ? $pagehead.height() : 0;
-            var n               = $navbar.length ? $navbar.height() : 0;
-            var a               = $adblock.length ? $adblock.height() : 0;
-
-            var o               = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
-
-            settings.scrollSmoothOffset = o;
+            // var $pagehead       = $('.attic');
+            // var $navbar         = $('nav.navbar');
+            // var $adblock        = $('#adblock');
+            //
+            // var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+            // var fontSize        = $('body').css('font-size').replace('px','');
+            // var start           = window.pageYOffset;
+            //
+            // var l               = parseInt(fontSize);
+            //
+            // var h               = $pagehead.length ? $pagehead.height() : 0;
+            // var n               = $navbar.length ? $navbar.height() : 0;
+            // var a               = $adblock.length ? $adblock.height() : 0;
+            //
+            // var o               = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
+            //
+            // settings.scrollSmoothOffset = o;
 
             _this.initToccerCore(settings);
 
@@ -228,6 +228,7 @@ j1.adapter['toccer'] = (function () {
     // Set Toccer options
     // -------------------------------------------------------------------------
     initToccerCore: function (options) {
+      var scrollOffset;
 
       if (options  !== undefined) {
         var settings = $.extend({}, options);
@@ -235,10 +236,33 @@ j1.adapter['toccer'] = (function () {
         var settings = false;
       }
 
+      // calculate offset for correct (smooth) scroll position
+      //
+      var $pagehead       = $('.attic');
+      var $navbar         = $('nav.navbar');
+      var $adblock        = $('#adblock');
+
+      var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+      var fontSize        = $('body').css('font-size').replace('px','');
+      var start           = window.pageYOffset;
+
+      var l               = parseInt(fontSize);
+
+      var h               = $pagehead.length ? $pagehead.height() : 0;
+      var n               = $navbar.length ? $navbar.height() : 0;
+      var a               = $adblock.length ? $adblock.height() : 0;
+
+      scrollOffset        = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
+
+      // static offset, to be checked why this is needed
+      //
+      scrollOffset        = scrollOffset + moduleOptions.scrollSmoothOffset
+
       _this.setState('running');
       logger.info('state: ' + _this.getState());
 
       // tocbot get fired if HTML portion is loaded (AJAX load finished)
+      //
       var dependencies_met_ajax_load_finished = setInterval (function () {
         if ($('#toc_mmenu').length) {
           /* eslint-disable */
@@ -267,7 +291,7 @@ j1.adapter['toccer'] = (function () {
             scrollContainer:        null,
             scrollSmooth:           moduleOptions.scrollSmooth,
             scrollSmoothDuration:   moduleOptions.scrollSmoothDuration,
-            scrollSmoothOffset:     moduleOptions.scrollSmoothOffset,
+            scrollSmoothOffset:     scrollOffset,
             headingsOffset:         1,
             throttleTimeout:        moduleOptions.throttleTimeout
           });
@@ -276,6 +300,61 @@ j1.adapter['toccer'] = (function () {
           clearInterval(dependencies_met_ajax_load_finished);
         } // END AJAX load finished
       }, 25); // END dependencies_met_ajax_load_finished
+
+      $(window).on('resize', function() {
+        var scrollOffset;
+        // re-calculate offset for correct (smooth) scroll position
+        //
+        var $pagehead       = $('.attic');
+        var $navbar         = $('nav.navbar');
+        var $adblock        = $('#adblock');
+
+        var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+        var fontSize        = $('body').css('font-size').replace('px','');
+        var start           = window.pageYOffset;
+
+        var l               = parseInt(fontSize);
+
+        var h               = $pagehead.length ? $pagehead.height() : 0;
+        var n               = $navbar.length ? $navbar.height() : 0;
+        var a               = $adblock.length ? $adblock.height() : 0;
+
+        scrollOffset        = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
+
+        // static offset, to be checked why this is needed
+        //
+        scrollOffset        = scrollOffset + moduleOptions.scrollSmoothOffset
+
+        tocbot.refresh({
+          log:                    moduleOptions.log,
+          activeLinkColor:        moduleOptions.activeLinkColor,
+          tocSelector:            moduleOptions.tocSelector,
+          headingSelector:        moduleOptions.headingSelector,
+          ignoreSelector:         moduleOptions.ignoreSelector,
+          contentSelector:        moduleOptions.contentSelector,
+          collapseDepth:          moduleOptions.collapseDepth,
+          throttleTimeout:        moduleOptions.throttleTimeout,
+          hasInnerContainers:     false,
+          includeHtml:            false,
+          linkClass:              'toc-link',
+          extraLinkClasses:       '',
+          activeLinkClass:        'is-active-link',
+          listClass:              'toc-list',
+          extraListClasses:       '',
+          isCollapsedClass:       'is-collapsed',
+          collapsibleClass:       'is-collapsible',
+          listItemClass:          'toc-list-item',
+          positionFixedSelector:  '',
+          positionFixedClass:     'is-position-fixed',
+          fixedSidebarOffset:     'auto',
+          scrollContainer:        null,
+          scrollSmooth:           moduleOptions.scrollSmooth,
+          scrollSmoothDuration:   moduleOptions.scrollSmoothDuration,
+          scrollSmoothOffset:     scrollOffset,
+          headingsOffset:         1,
+          throttleTimeout:        moduleOptions.throttleTimeout
+        });
+      });
     }, // END initToccerCore
 
     // -------------------------------------------------------------------------