j1-template 2021.0.16 → 2021.1.4

data/assets/themes/j1/adapter/js/{jf_gallery.js → justifiedGallery.js}

@@ -6,7 +6,7 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/justified_gallery.js
+ # ~/assets/themes/j1/adapter/js/justifiedGallery.js
  # Liquid template to create the J1 Adapter for Justified Gallery
  #
  # Product/Info:
@@ -37,8 +37,8 @@ regenerate:                             true
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign jf_gallery_defaults   = apps.defaults.justified_gallery.defaults %}
-{% assign jf_gallery_settings   = apps.justified_gallery.settings %}
+{% assign jf_gallery_defaults   = apps.defaults.justifiedGallery.defaults %}
+{% assign jf_gallery_settings   = apps.justifiedGallery.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -51,7 +51,7 @@ regenerate:                             true
 
 /*
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/justified_gallery.js
+ # ~/assets/themes/j1/adapter/js/justifiedGallery.js
  # JS Adapter for JustifiedGallery
  #
  # Product/Info:
@@ -79,7 +79,7 @@ regenerate:                             true
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['jf_gallery'] = (function (j1, window) {
+j1.adapter['justifiedGallery'] = (function (j1, window) {
 
   {% comment %} Global variables
   ------------------------------------------------------------------------------ {% endcomment %}
@@ -105,8 +105,8 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
-      _this = j1.adapter.jf_gallery;
-      logger = log4javascript.getLogger('j1.adapter.jf_gallery');
+      _this = j1.adapter.justifiedGallery;
+      logger = log4javascript.getLogger('j1.adapter.justifiedGallery');
 
       // initialize state flag
       _this.setState('started');
@@ -117,7 +117,7 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
       // Default module settings
       // -----------------------------------------------------------------------
       var settings = $.extend({
-        module_name: 'j1.adapter.jf_gallery',
+        module_name: 'j1.adapter.justifiedGallery',
         generated:   '{{site.time}}'
       }, options);
 
@@ -144,7 +144,7 @@ j1.adapter['jf_gallery'] = (function (j1, window) {
     // Load AJAX data and initialize the jg gallery
     // -----------------------------------------------------------------------
     initialize: function (options) {
-      logger = log4javascript.getLogger('j1.adapter.jf_gallery.init');
+      logger = log4javascript.getLogger('j1.adapter.justifiedGallery');
 
       _this.setState('running');
       logger.info('state: ' + _this.getState());

data/assets/themes/j1/adapter/js/{gallery_customizer.js → justifiedGalleryCustomizer.js}

@@ -6,7 +6,7 @@ regenerate:                             true
 
 {% comment %}
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/gallery_customizer.js
+ # ~/assets/themes/j1/adapter/js/justifiedGalleryCustomizer.js
  # Liquid template to adapt Gallery Customizer JS functions
  #
  # Product/Info:
@@ -55,10 +55,10 @@ regenerate:                             true
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign jf_gallery_defaults         = apps.defaults.justified_gallery.defaults %}
-{% assign jf_gallery_settings         = apps.justified_gallery.settings %}
-{% assign gallery_customizer_defaults = site.data.apps.defaults.gallery_customizer.defaults %}
-{% assign gallery_customizer_settings = site.data.apps.gallery_customizer.settings %}
+{% assign jf_gallery_defaults         = apps.defaults.justifiedGallery.defaults %}
+{% assign jf_gallery_settings         = apps.justifiedGallery.settings %}
+{% assign gallery_customizer_defaults = site.data.apps.defaults.justifiedGalleryCustomizer.defaults %}
+{% assign gallery_customizer_settings = site.data.apps.justifiedGalleryCustomizer.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -77,7 +77,7 @@ regenerate:                             true
 
 /*
  # -----------------------------------------------------------------------------
- # ~/assets/themes/j1/adapter/js/gallery_customizer.js
+ # ~/assets/themes/j1/adapter/js/justifiedGalleryCustomizer.js
  # J1 Adapter for Gallery Customizer
  #
  # Product/Info:
@@ -101,7 +101,7 @@ regenerate:                             true
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-j1.adapter['gallery_customizer'] = (function (j1, window) {
+j1.adapter['justifiedGalleryCustomizer'] = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
@@ -125,8 +125,8 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
       // -----------------------------------------------------------------------
       // globals
       // -----------------------------------------------------------------------
-      _this   = j1.adapter.gallery_customizer;
-      logger  = log4javascript.getLogger('j1.adapter.gallery_customizer');
+      _this   = j1.adapter.justifiedGalleryCustomizer;
+      logger  = log4javascript.getLogger('j1.adapter.justifiedGalleryCustomizer');
 
       // initialize state flag
       _this.setState('started');
@@ -137,7 +137,7 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
       // Default module settings
       // -----------------------------------------------------------------------
       var settings = $.extend({
-        module_name: 'j1.adapter.gallery_customizer',
+        module_name: 'j1.adapter.justifiedGalleryCustomizer',
         generated:   '{{site.time}}'
       }, options);
 
@@ -152,8 +152,9 @@ j1.adapter['gallery_customizer'] = (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'
       );
@@ -174,7 +175,7 @@ j1.adapter['gallery_customizer'] = (function (j1, window) {
 
           // -------------------------------------------------------------------
           // load gallery data
-          j1.adapter.jf_gallery.initialize(galleryOptions);
+          j1.adapter.justifiedGallery.initialize(galleryOptions);
 
           logger.info('initialize customizer ui|forms');
 

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -36,17 +36,21 @@ regenerate:                             false
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.j1_config %}
-{% assign modules           = site.data.modules %}
+{% assign template_config       = site.data.j1_config %}
+{% assign modules               = site.data.modules %}
+{% assign utilities             = site.data.utilities %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign logger_defaults   = modules.defaults.log4javascript.defaults %}
-{% assign logger_settings   = modules.log4javascript.settings %}
+{% assign util_server_defaults  = utilities.defaults.util_srv.defaults %}
+{% assign util_server_settings  = utilities.util_srv.settings %}
+{% assign logger_defaults       = modules.defaults.log4javascript.defaults %}
+{% assign logger_settings       = modules.log4javascript.settings %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign logger_options    = logger_defaults | merge: logger_settings %}
+{% assign logger_options        = logger_defaults | merge: logger_settings %}
+{% assign util_server_options   = util_server_defaults | merge: util_server_settings %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -83,16 +87,16 @@ j1.adapter['logger'] = (function (j1, window) {
   // globals
   // ---------------------------------------------------------------------------
   var environment           = '{{environment}}';
-  var page_id               = j1.generateId(12);
+  var page_id               = j1.generateId(11);
   var cookie_names          = j1.getCookieNames();
   var loggerRequestCallback = false;
   var loggerOptions         = {};
+  var utilServerOptions     = {};
   var ajaxAppenderOptions   = {};
   var user_session;
   var appDetected;
   var _this;
   var logger;
-  var log2disk;
   var ajaxAppender;
   var consoleAppender;
   var jsonLayout;
@@ -107,7 +111,7 @@ j1.adapter['logger'] = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // helper functions
-  // ---------------------------------------------------------------------------
+  //
 
   // ---------------------------------------------------------------------------
   // getCustomData
@@ -162,7 +166,7 @@ j1.adapter['logger'] = (function (j1, window) {
 
   // ---------------------------------------------------------------------------
   // main object
-  // ---------------------------------------------------------------------------
+  //
   return {
 
     // -------------------------------------------------------------------------
@@ -175,15 +179,15 @@ j1.adapter['logger'] = (function (j1, window) {
       // load module DEFAULTS|CONFIG to js object
       /* eslint-disable */
       loggerOptions       = $.extend({}, {{logger_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      utilServerOptions   = $.extend({}, {{util_server_options | replace: '=>', ':' | replace: 'nil', '""'}});
       /* eslint-enable */
       ajaxAppenderOptions = loggerOptions.appenders[1].appender;
 
       // -----------------------------------------------------------------------
       // setup logger instances
-      // -----------------------------------------------------------------------
+      //
       _this       = j1.adapter.logger;
       logger      = log4javascript.getLogger('j1.adapter.logger');
-      log2disk    = log4javascript.getLogger('j1.adapter.log2disk');
 
       // wait until user_session.mode is detected by j1.init()
       //
@@ -200,32 +204,37 @@ j1.adapter['logger'] = (function (j1, window) {
           } else {
             payloadURL = ajaxAppenderOptions.payload_url_web;
           }
+          payloadURL = 'http://localhost:' + utilServerOptions.port + '/log2disk?request=write';
 
           // -------------------------------------------------------------------
           // setup appenders
           // -------------------------------------------------------------------
 
           // consoleAppender (browser console)
+          //
           consoleAppender = new log4javascript.BrowserConsoleAppender();
           consoleAppender.setThreshold(log4javascript.Level.DEBUG);
 
           // ajaxAppender (XHR)
           // HTTP POST log data on the utility server (write log to disk)
+          //
           ajaxAppender = new log4javascript.AjaxAppender(payloadURL);
           ajaxAppender.setThreshold(log4javascript.Level.DEBUG);
           ajaxAppender.setWaitForResponse(true);
           ajaxAppender.setSendAllOnUnload(true);
           ajaxAppender.addHeader('X-Page-ID', page_id);
+          ajaxAppender.addHeader('X-TZ-Offset', loggerOptions.tz_offset);
 
           // success callback for testing (disabled for default)
+          //
           if (loggerRequestCallback) {
             ajaxAppender.setRequestSuccessCallback(requestCallback);
           }
 
-          // -------------------------------------------------------------------
+          // -----------------------------------------------------------------------
           // setup layouts
-          // -------------------------------------------------------------------
-          patternLayout       = new log4javascript.PatternLayout('[%d{HH:mm:ss.SSS}] [%f{4}] [%-5p] [%-40c] [%f{1}:%f{2}] %m%n[%f{3}]');
+          //
+          patternLayout       = new log4javascript.PatternLayout('[%d{HH:mm:ss.SSS}] [%f{4}] [%-5p] [%-60c] [%f{1}:%f{2}] %m%n[%f{3}]');
           httpPostDataLayout  = new log4javascript.HttpPostDataLayout();
           xmlLayout           = new log4javascript.XmlLayout();
           jsonLayout          = new log4javascript.JsonLayout();
@@ -233,6 +242,7 @@ j1.adapter['logger'] = (function (j1, window) {
           simpleLayout        = new log4javascript.SimpleLayout();
 
           // Use the method getLineNumber() as the value for the 0th custom field
+          //
           patternLayout.setCustomField('file',    getCustomData);
           patternLayout.setCustomField('line',    getCustomData);
           patternLayout.setCustomField('path',    getCustomData);
@@ -242,9 +252,9 @@ j1.adapter['logger'] = (function (j1, window) {
           consoleAppender.setLayout(patternLayout);
           ajaxAppender.setLayout(httpPostDataLayout);
 
-          // -------------------------------------------------------------------
+          // -----------------------------------------------------------------------
           // setup log levels
-          // -------------------------------------------------------------------
+          //
           if (environment == 'production') {
             log4javascript.getLogger('j1').setLevel(log4javascript.Level.WARN);
           }
@@ -255,16 +265,19 @@ j1.adapter['logger'] = (function (j1, window) {
             log4javascript.getLogger('j1').setLevel(log4javascript.Level.WARN);
           }
 
-          // -------------------------------------------------------------------
+          // -----------------------------------------------------------------------
           // setup (root) loggers
-          // -------------------------------------------------------------------
+          //
           log4javascript.getRootLogger().addAppender(consoleAppender);
 
+          // to use the ajaxAppender (write logs to disk), the utility server
+          // needs to be enabled (util_srv.yml) as well
+          //
           if (ajaxAppenderOptions.enabled) {
             log4javascript.getRootLogger().addAppender(ajaxAppender);
-            logger.info('ajax appender detected as: enabled');
+            logger.info('ajax appender/util server detected as: enabled');
           } else {
-            logger.info('ajax appender detected as: disabled');
+            logger.info('ajax appender/util server detected as: disabled');
           }
 
           _this.setState('finished');
@@ -274,7 +287,6 @@ j1.adapter['logger'] = (function (j1, window) {
           return true;
         }
       }, 25); // END 'mode detected'
-
     }, // END init
 
     // -------------------------------------------------------------------------
@@ -289,7 +301,7 @@ j1.adapter['logger'] = (function (j1, window) {
 
       // -----------------------------------------------------------------------
       //  process commands|actions
-      // -----------------------------------------------------------------------
+      //
       if (message.type === 'command' && message.action === 'module_initialized') {
         //
         // place handling of command|action here

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'
@@ -863,11 +918,6 @@ j1.adapter['navigator'] = (function (j1, window) {
   }; // END return
 })(j1, window);
 
-{% comment %} process adapter COMPRESSED for production DISABLED
-NOTE: for unknown reason, minifyJS detect JS/ES6 code
-      SyntaxError: Unexpected token: punc ())
---------------------------------------------------------------------------------
-{% assign production = true %}
 {% endcapture %}
 {% if production %}
   {{ cache | minifyJS }}
@@ -875,10 +925,3 @@ NOTE: for unknown reason, minifyJS detect JS/ES6 code
   {{ cache | strip_empty_lines }}
 {% endif %}
 {% assign cache = nil %}
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} process adapter UNCOMPRESSED
--------------------------------------------------------------------------------- {% endcomment %}
-{% endcapture %}
-{{ cache | strip_empty_lines }}
-{% assign cache = nil %}