j1-template 2021.1.1 → 2021.1.6

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

@@ -152,8 +152,9 @@ j1.adapter['justifiedGalleryCustomizer'] = (function (j1, window) {
       // data loader
       // ---------------------------------------------------------------------
       j1.xhrData ({
-        xhr_container_id: customizerOptions.xhr_container_id,
-        xhr_data_path:    customizerOptions.xhr_data_path },
+        xhr_container_id:   customizerOptions.xhr_container_id,
+        xhr_data_path:      customizerOptions.xhr_data_path,
+        xhr_data_element:   customizerOptions.xhr_data_element },
         'j1.adapter.gallery_customizer',
         'null'
       );

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

@@ -209,13 +209,17 @@ j1.adapter['mmenu'] = (function (j1, window) {
       to
         {% if forloop.last %}'data_loaded'{% else %}'data_loaded'{% endif %}){% if forloop.last %}{% else %},{% endif %}
       -------------------------------------------------------------------------- {% endcomment %}
+
       {% for item in nav_mmenu_options.menus %} {% if item.menu.enabled %}
-      {% assign menu_id       = item.menu.xhr_container_id %}
-      {% assign xhr_data_path = item.menu.xhr_data_path %}
+
+      {% assign menu_id           = item.menu.xhr_container_id %}
+      {% assign xhr_data_path     = item.menu.xhr_data_path %}
+      {% assign xhr_data_element  = item.menu.xhr_data_element %}
 
       j1.xhrData ({
-        xhr_container_id: '{{menu_id}}',
-        xhr_data_path:    '{{xhr_data_path}}'},
+        xhr_container_id:   '{{menu_id}}',
+        xhr_data_path:      '{{xhr_data_path}}',
+        xhr_data_element:   '{{xhr_data_element}}' },
         'j1.adapter.mmenu',
         {% if forloop.last %}'data_loaded'{% else %}'null'{% endif %}){% if forloop.last %};{% else %};{% endif %}
 

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

@@ -160,13 +160,17 @@ j1.adapter['navigator'] = (function (j1, window) {
 
   var nav_menu_id                 = '{{nav_menu_id}}';
   var nav_quicklinks_id           = '{{nav_quicklinks_id}}';
+
   var authclient_modals_id        = '{{authclient_modals_id}}';
+  var authclient_xhr_data_element = '{{authclient_options.xhr_data_element}}';
+  var authclient_modals_data_path = '{{authclient_options.xhr_data_path}}';
 
-  var colors_data_path            = '{{template_config.colors_data_path}}';
-  var font_size_data_path         = '{{template_config.font_size_data_path}}';
   var nav_menu_data_path          = '{{nav_menu_options.data_path}}';
   var nav_quicklinks_data_path    = '{{quicklinks_options.data_path}}';
-  var authclient_modals_data_path = '{{authclient_options.xhr_data_path}}';
+
+  var colors_data_path            = '{{template_config.colors_data_path}}';
+  var font_size_data_path         = '{{template_config.font_size_data_path}}';
+
 
   var cookie_names                = j1.getCookieNames();
   var cookie_user_session_name    = cookie_names.user_session;
@@ -235,7 +239,16 @@ j1.adapter['navigator'] = (function (j1, window) {
       var navAuthClientOptions                      = {};
       var navAuthMAnagerConfig                      = {};
 
+      var user_state                                = {};
+      var cookie_names                              = j1.getCookieNames();
+      var cookie_user_state_name                    = cookie_names.user_state;
+
       var themerOptions                             = {};
+      var interval_count                            = 0;
+      var user_state_detected;
+      var themes_count;
+      var max_count                                 = 100;
+
 
       navDefaults                                   = $.extend({}, {{navigator_defaults | replace: '=>', ':' }});
       navBarConfig                                  = $.extend({}, {{nav_bar_options | replace: '=>', ':' }});
@@ -282,26 +295,29 @@ j1.adapter['navigator'] = (function (j1, window) {
       // Workaround: Set 'data_loaded' to be returned by all Deferred in
       // the chain.
       // See: https://stackoverflow.com/questions/5436327/jquery-deferreds-and-promises-then-vs-done
-      //
+      // authclient_xhr_data_element
       // -----------------------------------------------------------------------
       // data loader
       // -----------------------------------------------------------------------
 
       j1.xhrData({
-        xhr_container_id: navQuicklinksOptions.xhr_container_id,
-        xhr_data_path:    navQuicklinksOptions.xhr_data_path },
+        xhr_container_id:   navQuicklinksOptions.xhr_container_id,
+        xhr_data_path:      navQuicklinksOptions.xhr_data_path,
+        xhr_data_element:   navQuicklinksOptions.xhr_data_element },
         'j1.adapter.navigator',
         null);
       j1.xhrData({
-        xhr_container_id: navAuthClientConfig.xhr_container_id,
-        xhr_data_path:    navAuthClientConfig.xhr_data_path },
+        xhr_container_id:   navAuthClientConfig.xhr_container_id,
+        xhr_data_path:      navAuthClientConfig.xhr_data_path,
+        xhr_data_element:   navAuthClientConfig.xhr_data_element },
         'j1.adapter.navigator',
         null);
       j1.xhrData({
-        xhr_container_id: navMenuOptions.xhr_container_id,
-        xhr_data_path:    navMenuOptions.xhr_data_path },
+        xhr_container_id:   navMenuOptions.xhr_container_id,
+        xhr_data_path:      navMenuOptions.xhr_data_path,
+        xhr_data_element:   navMenuOptions.xhr_data_element },
         'j1.adapter.navigator',
-        'null');
+        'data_loaded');
 
       var dependencies_met_load_menu_finished = setInterval (function () {
         if (j1.xhrDOMState['#'+navQuicklinksOptions.xhr_container_id] == 'not loaded' ||
@@ -339,30 +355,69 @@ j1.adapter['navigator'] = (function (j1, window) {
 
           // load themes (to menu) if themer is enabled|finished
           if (themerEnabled) {
+
+            logText = 'theme switcher: enabled';
+            logger.info(logText);
+
+            // Detect|Set J1 UserState
+            user_state_detected = j1.existsCookie(cookie_user_state_name);
+            if (user_state_detected) {
+              user_state        = j1.readCookie(cookie_user_state_name);
+            }
+
             var dependencies_met_page_finished = setInterval(function() {
-              // jadams, 2020-10-03: NOT needed to wait for j1 finished
+//            jadams, 2020-10-03: NOT needed to wait for j1 get finished
 //            if (j1.getState() == 'finished') {
-              if (j1.adapter.themer.getState() == 'finished') {
+//            jadams, 2021-06-22: disabled check on themer get finished
+//            if (j1.adapter.themer.getState() == 'finished') {
+              if ('true' === 'true') {
                 // initialize theme switcher menus
-                logText = 'theme switcher detect: enabled';
-                logger.info(logText);
 
                 logText = 'load themes';
                 logger.info(logText);
 
-                // load REMOTE themes from Bootswatch API (localFeed EMPTY!)
-                $('#remote_themes').bootstrapThemeSwitcher({
-                  localFeed: '',
-                  bootswatchApiVersion: themerOptions.bootswatchApiVersion
-                });
-
                 // load LOCAL themes from JSON data
                 logText = 'load local themes (json file)';
                 logger.info(logText);
                 $('#local_themes').bootstrapThemeSwitcher({
                   localFeed: themerOptions.localThemes
                 });
-                clearInterval(dependencies_met_page_finished);
+
+                // load REMOTE themes from Bootswatch API (localFeed EMPTY!)
+                $('#remote_themes').bootstrapThemeSwitcher({
+                  localFeed: '',
+                  bootswatchApiVersion: themerOptions.bootswatchApiVersion
+                });
+
+                // jadams, 2021-04-22: Up to now, it is unclear why in some
+                // cases the menu bar is NOT fully loaded for THEMES
+                // TODO: Add additional checks to find the reason
+
+                // added same checks (as already done by adapter themer) to
+                // check if remote theme menu detected as LOADED
+                //
+                var dependencies_met_remote_themes_loaded = setInterval(function() {
+                  interval_count += 1;
+                  themes_count = document.getElementById("remote_themes").getElementsByTagName("li").length;
+                  if ( themes_count > 0  ) {
+                    logger.info('remote themes loaded: successfully');
+                    logger.info('remote themes loaded: successfully after: ' + interval_count * 25 + ' ms');
+
+                    clearInterval(dependencies_met_remote_themes_loaded);
+//                  clearInterval(dependencies_met_page_finished);
+                  } else {
+                      logger.debug('wait for theme to be loaded: ' + user_state.theme_name);
+                  }
+                  if (interval_count > max_count) {
+                    logger.warn('remote themes loading: failed');
+                    logger.warn('continue processing');
+                    clearInterval(dependencies_met_remote_themes_loaded);
+//                  clearInterval(dependencies_met_page_finished);
+                  }
+                  clearInterval(dependencies_met_page_finished);
+                }, 25);
+
+//              clearInterval(dependencies_met_page_finished);
               }
               _this.setState('initialized');
             }, 25); // END 'dependencies_met_page_finished'

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

@@ -101,32 +101,34 @@ j1.adapter['themer'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var environment                 = '{{environment}}';
-  var themerOptions               = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
-  var user_state                  = {};
-  var cookie_names                = j1.getCookieNames();
-  var cookie_user_state_name      = cookie_names.user_state;
-  var user_state_detected         = false;
-  var styleLoaded                 = false;
-  var id                          = 'default';
+  var environment               = '{{environment}}';
+  var themerOptions             = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
+  var user_state                = {};
+  var user_consent              = {};
+  var cookie_names              = j1.getCookieNames();
+  var user_state_detected       = false;
+  var styleLoaded               = false;
+  var id                        = 'default';
   var user_state_cookie;
   var theme_css_html;
   var _this;
   var logger;
   var logText;
 
+  var cssExtension              = (environment === 'production')
+                                  ? '.min.css'
+                                  : '.css';
+
   var default_theme_name        = '{{default_theme.name}}';
   var default_theme_author      = '{{default_theme.author}}';
-  var default_theme_author_url  = '{{default_theme.theme_author_url}}';
+  var default_theme_author_url  = '{{default_theme.author_url}}';
   var default_theme_css_name    = default_theme_name.toLowerCase().replace(' ', '-');
-  var default_theme_css         = (environment == 'production')
-                                  ? '{{asset_path}}/{{theme_base}}/' +default_theme_css_name+ '/bootstrap.min.css'
-                                  : '{{asset_path}}/{{theme_base}}/' +default_theme_css_name+ '/bootstrap.css';
+  var default_theme_css         = '{{asset_path}}/{{theme_base}}/' + default_theme_css_name + '/bootstrap' + cssExtension;
 
   // ---------------------------------------------------------------------------
   // helper functions
   // ---------------------------------------------------------------------------
-  // Example: var styleLoaded = styleSheetLoaded('');
+
   function styleSheetLoaded(styleSheet) {
     var sheets = document.styleSheets, stylesheet = sheets[(sheets.length - 1)];
 
@@ -157,15 +159,15 @@ j1.adapter['themer'] = (function (j1, window) {
       _this.state = 'started';
       logger.info('state: ' + _this.getState());
 
-      // Detect|Set J1 UserState
-      user_state_detected = j1.existsCookie(cookie_user_state_name);
+      // detect|set user state cookie
+      user_state_detected = j1.existsCookie(cookie_names.user_state);
       if (user_state_detected) {
-        user_state            = j1.readCookie(cookie_user_state_name);
+        user_state        = j1.readCookie(cookie_names.user_state);
+        user_consent       = j1.readCookie(cookie_names.user_consent);
       }
 
-      // initial user_state cookie
-      //
-      if ( user_state.theme_name == '') {
+      // initial theme data
+      if (user_state.theme_css === '') {
         user_state.theme_name       = default_theme_name;
         user_state.theme_css        = default_theme_css;
         user_state.theme_author     = default_theme_author;
@@ -175,29 +177,35 @@ j1.adapter['themer'] = (function (j1, window) {
       styleLoaded     = styleSheetLoaded(user_state.theme_css);
       theme_css_html  = '<link rel="stylesheet" id="' + id + '" href="' + user_state.theme_css + '" type="text/css" />';
 
-      // skip loading UNO CSS file except it is NOT loaded
-      //
+      // skip loading theme UNO css file except NOT loaded
       if (!user_state.theme_name.includes('Uno') || !styleLoaded) {
         $('head').append(theme_css_html);
       }
 
       // store if theme_switcher is enabled
-      //
       user_state.theme_switcher = themerOptions.enabled;
 
-      j1.writeCookie({
-        name: cookie_user_state_name,
-        data: user_state,
-        expires: 365                                                            // was missing
-      });
+      if (!user_consent.analyses || !user_consent.personalization)  {
+        // expire state cookie to session
+        j1.writeCookie({
+          name:     cookie_names.user_state,
+          data:     user_state,
+          samesite: 'Strict'
+        });
+      } else {
+        j1.writeCookie({
+          name:     cookie_names.user_state,
+          data:     user_state,
+          samesite: 'Strict',
+          expires:  365
+        });
+      }
 
       // jadams, 2021-01-03: dependency has to be checked in more detail
-      //
       var dependencies_met_j1_finished = setInterval (function () {
         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);
 

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

@@ -156,65 +156,25 @@ j1.adapter['toccer'] = (function () {
       /* eslint-enable */
 
       // save config settings into the toccer object for global access
-      //
       _this['moduleOptions'] = moduleOptions;
 
-      // if (options  !== undefined) {
-      //   var settings = $.extend({}, options);
-      // } else {
-      //   var settings = false;
-      // }
-
       // cast text-based booleans
-      var  isToc = (moduleOptions.toc === 'true');
-      var  isComments = (moduleOptions.comments === 'true');
+      var isToc = (moduleOptions.toc === 'true');
+      var isComments = (moduleOptions.comments === 'true');
 
-      if (moduleOptions.collapseDepth === undefined) {
+      if ( typeof moduleOptions.collapseDepth === 'undefined') {
         moduleOptions.collapseDepth = 3;
       }
 
-      // if (settings.scrollSmoothOffset === undefined) {
-      //   settings.scrollSmoothOffset = {{toccer_options.scrollSmoothOffset}};
-      // }
-      //
-      // if (settings.enabled === undefined) {
-      //   settings.enabled = true;
-      // }
-
-      // save config settings into the toccer object for global|later access
-      //
-      // _this['moduleOptions'] = settings;
-
       if (isToc) {
         var dependencies_met_navigator = setInterval(function() {
 //        if ( j1.adapter.navigator.getState() == 'finished' ) {
           if ( j1.getState() == 'finished' ) {
             var settings = j1.adapter.toccer.moduleOptions;
 
-            // 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;
-
             _this.initToccerCore(settings);
-
             _this.setState('finished');
+
             logger.info('state: ' + _this.getState());
             logger.info('module initialized successfully');
             logger.info('met dependencies for: j1');
@@ -322,7 +282,6 @@ j1.adapter['toccer'] = (function () {
         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({

data/assets/themes/j1/core/css/themes/uno-dark/bootstrap.css

@@ -7269,7 +7269,7 @@ a.text-dark:hover, a.text-dark:focus {
 */
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_alert.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_alert.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7315,7 +7315,7 @@ a.text-dark:hover, a.text-dark:focus {
 
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_badge.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_badge.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7351,7 +7351,7 @@ a.text-dark:hover, a.text-dark:focus {
 
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_buttons.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_buttons.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7444,7 +7444,7 @@ a.text-dark:hover, a.text-dark:focus {
 
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_cards.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_cards.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7459,14 +7459,16 @@ a.text-dark:hover, a.text-dark:focus {
   border: 0;
   border-radius: 0; }
   .card .card-header {
-    border-bottom: 1px solid #757575; }
+    border-bottom: 0; }
   .card .card-footer {
-    background-color: #1565c0 !important;
-    border-top: 1px solid #757575; }
+    background-color: transparent !important;
+    border-top: 0; }
+  .card hr {
+    border-top: 1px solid #757575 !important; }
 
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_dropdowns.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_dropdowns.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7482,7 +7484,7 @@ a.text-dark:hover, a.text-dark:focus {
 
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_forms.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_forms.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7525,7 +7527,7 @@ select.form-control[size], select.form-control[multiple] {
 
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_jumbotron.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_jumbotron.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7566,7 +7568,7 @@ li > a:hover {
 
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_navbar.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_navbar.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7642,7 +7644,7 @@ li > a:hover {
 
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_navs.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_navs.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7784,7 +7786,7 @@ button:focus {
 
 /*
  # -----------------------------------------------------------------------------
- # ~/100_template_css/scss/theme_uno_dark/theme/_tables.scss
+ # ~/100_template_css/scss/theme_uno_dark/bootstrap/_tables.scss
  #
  # Product/Info:
  # https://jekyll.one
@@ -7949,7 +7951,8 @@ table tr.even, table tr.alt, table tr:nth-of-type(even) {
 */
 .post-headline h1,
 .post-headline h2 {
-  border-bottom: 1px dotted  #0d47a1 !important; }
+  color: #bdbdbd;
+  border-bottom: 1px dotted #424242 !important; }
 
 /*
  # -----------------------------------------------------------------------------