j1-template 2021.0.12 → 2021.1.0

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);
 
@@ -174,7 +174,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

@@ -311,10 +311,15 @@ j1.adapter['mmenu'] = (function (j1, window) {
 
             // jadams, 2020-09-30: loading the menues (themes) if enabled
             if (themerEnabled) {
-              // from Bootswatch API (set localFeed EMPTY)
-              $('#remote_themes_mmenu').bootstrapThemeSwitcher({localFeed: ''});
-              // load (local) J1 themes (default settings) from JSON data
-              $('#local_themes_mmenu').bootstrapThemeSwitcher();
+              // load REMOTE themes from Bootswatch API (localFeed EMPTY!)
+              $('#remote_themes_mmenu').bootstrapThemeSwitcher({
+                localFeed: '',
+                bootswatchApiVersion: themerOptions.bootswatchApiVersion
+              });
+              // load LOCAL themes from JSON data
+              $('#local_themes_mmenu').bootstrapThemeSwitcher({
+                localFeed: themerOptions.localThemes
+              });
             }
 
             $('#{{item.menu.content.id}}').show();

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

@@ -347,14 +347,21 @@ j1.adapter['navigator'] = (function (j1, window) {
                 logText = 'theme switcher detect: enabled';
                 logger.info(logText);
 
-                // load remote themes (Bootswatch API)
-                logText = 'load remote themes (Bootswatch API)';
+                logText = 'load themes';
                 logger.info(logText);
-                $('#remote_themes').bootstrapThemeSwitcher({localFeed: ''});
-                // load local themes (json file)
+
+                // 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});
+                $('#local_themes').bootstrapThemeSwitcher({
+                  localFeed: themerOptions.localThemes
+                });
                 clearInterval(dependencies_met_page_finished);
               }
               _this.setState('initialized');
@@ -697,7 +704,8 @@ j1.adapter['navigator'] = (function (j1, window) {
       $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator ul.nav.navbar-right .dropdown-menu .dropdown-menu { left: -' +navMenuOptions.dropdown_item_min_width+ 'rem !important; } }</style>');
 
       // Limit last (2nd) dropdown in height (nav.navbar.navigator li.dropdown ul.dropdown-menu ul.dropdown-menu)
-      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu ul.dropdown-menu  { top: -' +navMenuOptions.dropdown_border_top+ 'px !important; max-height: ' +navMenuOptions.dropdown_menu_max_height+ 'em !important; } }</style>');
+      // !important
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu ul.dropdown-menu  { top: -' +navMenuOptions.dropdown_border_top+ 'px !important; max-height: ' +navMenuOptions.dropdown_menu_max_height+ 'em; } }</style>');
 
       //  Set dropdown item colors
       $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator ul.nav > li > a { color: ' +navMenuOptions.menu_item_color+ ' !important; } }</style>');
@@ -855,11 +863,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 }}
@@ -867,10 +870,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 %}

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

@@ -207,38 +207,43 @@ j1.adapter['themer'] = (function (j1, window) {
             // load list of remote themes
             //
             if ( $('#remote_themes').length ) {
+              var themes_count;
               var interval_count = 0;
-              var max_count      = themerOptions.retries;                          
+              var max_count      = themerOptions.retries;
+
+              /* 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 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 {
+                themes_count = document.getElementById("remote_themes").getElementsByTagName("li").length;
+                if ( themes_count > 0  ) {
                   logger.info('remote themes loaded: successfully');
-                  logger.debug('remote themes loaded: successfully after: ' + interval_count * 25 + ' ms');
+                  logger.info('remote themes loaded: successfully after: ' + interval_count * 25 + ' ms');
+
                   clearInterval(dependencies_met_remote_themes_loaded);
+                } else {
+                    logger.debug('wait for theme to be loaded: ' + user_state.theme_name);
                 }
                 if (interval_count > max_count) {
                   logger.warn('remote themes loading: failed');
@@ -252,7 +257,7 @@ j1.adapter['themer'] = (function (j1, window) {
               _this.setState('finished');
               logger.info('state: ' + _this.getState());
               logger.info('module initialized successfully');
-              logger.info('met dependencies for: navigator');
+              logger.info('met dependencies for: j1.adapter');
             }
           } else {
             _this.setState('finished');