j1-template 2020.0.21 → 2020.0.22

data/assets/data/quicklinks.html

@@ -33,7 +33,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_settings       = site.data.template_settings %}
+{% assign j1_config       = site.data.j1_config %}
 {% assign authentication_defaults = modules.defaults.authentication.defaults %}
 {% assign authentication_settings = modules.authentication.settings %}
 {% assign navigator_defaults      = modules.defaults.navigator.defaults %}
@@ -125,7 +125,7 @@ regenerate:                             true
 
 {% comment %} Show|Hide Translator icon
 -------------------------------------------------------------------------------- {% endcomment %}
-{% if template_settings.translation.enabled %}
+{% if j1_config.translation.enabled %}
   {% assign show_translator_icon = true  %}
 {% else %}
   {% assign show_translator_icon = false %}

data/assets/data/search.json

@@ -59,7 +59,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config         = site.data.template_settings %}
+{% assign template_config         = site.data.j1_config %}
 {% assign blocks                  = site.data.blocks %}
 {% assign modules                 = site.data.modules %}
 

data/assets/data/ssm.html

@@ -36,7 +36,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config = site.data.template_settings %}
+{% assign template_config = site.data.j1_config %}
 {% assign modules         = site.data.modules %}
 
 {% comment %} Set config data

data/assets/data/themes.json

@@ -32,8 +32,8 @@ regenerate:                             true
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment         = site.environment %}
-{% assign asset_path          = site.data.template_settings.asset_path %}
-{% assign custom_theme_config = site.data.template_settings.custom_theme %}
+{% assign asset_path          = site.data.j1_config.asset_path %}
+{% assign custom_theme_config = site.data.j1_config.custom_theme %}
 {% assign custom_scss         = custom_theme_config.custom_scss %}
 
 {% capture theme_path %}{{asset_path}}/modules/bs_theme_switcher/themes{% endcapture %}
@@ -47,18 +47,18 @@ regenerate:                             true
 {
   "themes":
   [
-    {"name": "Uno",             "css": "{{asset_path}}/core/css/uno.css"},
-    {"name": "Uno dark",        "css": "{{asset_path}}/core/css/uno-dark.css"},
-    {"name": "Bootstrap",       "css": "{{asset_path}}/core/css/bootstrap.css"}
+    {"name": "Uno (light)",             "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.css"},
+    {"name": "Uno (dark)",              "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.css"},
+    {"name": "Bootstrap",               "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.css"}
   ]
 }
 {% else %}
 {
   "themes":
   [
-    {"name": "Uno",             "css": "{{asset_path}}/core/css/uno.min.css"},
-    {"name": "Uno dark",        "css": "{{asset_path}}/core/css/uno-dark.min.css"},
-    {"name": "Bootstrap",       "css": "{{asset_path}}/core/css/bootstrap.min.css"}
+    {"name": "Uno (light)",             "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.min.css"},
+    {"name": "Uno (dark)",              "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.min.css"},
+    {"name": "Bootstrap",               "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.min.css"}
   ]
 }
 {% endif %}

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

@@ -35,7 +35,7 @@ regenerate:                             false
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 

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

@@ -36,7 +36,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config       = site.data.template_settings %}
+{% assign template_config       = site.data.j1_config %}
 {% assign blocks                = site.data.blocks %}
 {% assign modules               = site.data.modules %}
 

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate:                             false
 ---
 
 {% capture cache %}
@@ -37,7 +37,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 

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

@@ -42,7 +42,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config     = site.data.template_settings %}
+{% assign template_config     = site.data.j1_config %}
 {% assign apps                = site.data.apps %}
 
 {% comment %} Set config data

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

@@ -43,12 +43,12 @@ regenerate:                             false
  # JS Adapter for Clipboard
  #
  # Product/Info:
- # {{site.data.template_settings.theme_author_url}}
+ # {{site.data.j1_config.theme_author_url}}
  #
  # Copyright (C) 2020 Juergen Adams
  #
  # J1 Template is licensed under the MIT License.
- # For details, see {{site.data.template_settings.theme_author_url}}
+ # For details, see {{site.data.j1_config.theme_author_url}}
  # -----------------------------------------------------------------------------
  # NOTE:
  # -----------------------------------------------------------------------------

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

@@ -32,7 +32,7 @@ regenerate:                             false
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 

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

@@ -49,7 +49,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config             = site.data.template_settings %}
+{% assign template_config             = site.data.j1_config %}
 {% assign blocks                      = site.data.blocks %}
 {% assign modules                     = site.data.modules %}
 

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

@@ -41,7 +41,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config         = site.data.template_settings %}
+{% assign template_config         = site.data.j1_config %}
 {% assign blocks                  = site.data.blocks %}
 {% assign modules                 = site.data.modules %}
 
@@ -137,7 +137,7 @@ var j1 = (function () {
   // Theme information
   var themeName;
   var themeCss;
-  var themeExtensionCss = environment === 'production' ? '/assets/themes/j1/core/css/theme-extensions.min.css' : '/assets/themes/j1/core/css/theme-extensions.css';
+  var themeExtensionCss = environment === 'production' ? '/assets/themes/j1/core/css/themes/theme-extensions.min.css' : '/assets/themes/j1/core/css/themes/theme-extensions.css';
 
   // Pathes of J1 data files
   var colors_data_path          = '{{template_config.colors_data_path}}';
@@ -156,12 +156,12 @@ var j1 = (function () {
   var baseUrl;
   var referrer;
 
-  var default_theme_css           = environment === 'production' ? '/assets/themes/j1/core/css/uno.min.css' : '/assets/themes/j1/core/css/uno.css';
-  // TODO: check what property is used default_theme|default_theme_name ?
-  var default_theme               = 'Uno';
-  var default_theme_name          = 'Uno';
-  var default_theme_author        = 'J1 Team';
-  var default_theme_link          = 'https://jekyll.one/';
+  // var default_theme_css           = environment === 'production' ? '/assets/themes/j1/core/css/themes/uno-light/bootstrap.min.css' : '/assets/themes/j1/core/css/themes/uno-light/bootstrap.css';
+  // // TODO: check what property is used default_theme|default_theme_name ?
+  // var default_theme_display_name  = 'Uno (light)';
+  // var default_theme_name          = 'uno-light';
+  // var default_theme_author        = 'J1 Team';
+  // var default_theme_link          = 'https://jekyll.one/';
   var default_white_listed_pages  = [];
 
   var cookie_names = {
@@ -190,12 +190,9 @@ var j1 = (function () {
 
   // user STATE cookie (initial values)
   var user_state = {
-    'theme_css':            default_theme_css,
-    'theme_extension_css':  themeExtensionCss,
-    'theme_name':           default_theme_name,
-    'theme_author':         default_theme_author,
-    'theme_author_url':     '{{template_config.theme_author_url}}',
-    'theme_link':           default_theme_link,
+    'theme_css':            "",
+    'theme_name':           "",
+    'theme_author':         "",
     'theme_version':        '{{site.version}}',
     'cookies_accepted':     'pending',
     'whitelistedPages':     default_white_listed_pages,
@@ -905,6 +902,7 @@ var j1 = (function () {
 
           // display page
           $('#no_flicker').css('display', 'block');
+
           logger.info('mode detected: web');
           logger.info('hide signin icon');
           $('#quickLinksSignInOutButton').css('display', 'none');
@@ -1620,13 +1618,15 @@ var j1 = (function () {
       $('head').append('<style>.icon-warning { color: ' +admonitionblock_warning_color+ ' !important; }</style>');
       $('head').append('<style>.icon-caution { color: ' +admonitionblock_caution_color+ ' !important; }</style>');
 
-      // bs base styles
+      // bs base styles (2020-09-20: diabled. Taken for BS CSS code)
       // -----------------------------------------------------------------------
-      $('head').append('<style>code { color: ' +bg_secondary+ ' !important; }</style>');
+      // $('head').append('<style>code { color: ' +bg_secondary+ ' !important; }</style>');
 
       // bs tool tips
       // -----------------------------------------------------------------------
       $('head').append('<style>.tooltip-inner { background-color: ' +bg_primary+ ' !important; }</style>');
+//    $('head').append('<style>.tooltip-arrow { background-color: ' +bg_primary+ ' !important; }</style>');
+      $('head').append('<style>.bs-tooltip-auto[x-placement^=bottom] .arrow::before, .bs-tooltip-bottom .arrow::before { border-bottom-color: ' +bg_primary+ ' !important; }</style>');
 
       // asciidoc results viewer
       // -----------------------------------------------------------------------

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

@@ -32,7 +32,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config       = site.data.template_settings %}
+{% assign template_config       = site.data.j1_config %}
 {% assign apps                  = site.data.apps %}
 
 {% comment %} Set config data

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate:                             false
 ---
 
 {% capture cache %}
@@ -35,7 +35,7 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign apps              = site.data.apps %}
 
 {% comment %} Set config data

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

@@ -36,7 +36,7 @@ regenerate:                             false
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign modules           = site.data.modules %}
 
 {% comment %} Set config data

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

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -107,11 +107,13 @@ j1.adapter['mmenu'] = (function (j1, window) {
   // ---------------------------------------------------------------------------
   // globals
   // ---------------------------------------------------------------------------
-  var environment   = '{{environment}}';
-  var dclFinished   = false;
-  var moduleOptions = {};
-  var themerOptions = {};
-  var cookie_names  = j1.getCookieNames();
+  var environment     = '{{environment}}';
+  var dclFinished     = false;
+  var moduleOptions   = {};
+  var navMenuOptions  = {};
+  var themerOptions   = {};
+  var cookie_names    = j1.getCookieNames();
+  var themerEnabled   = {{themer_options.enabled}};
   var user_state;
   var user_session;
   var user_data;
@@ -156,12 +158,12 @@ j1.adapter['mmenu'] = (function (j1, window) {
       // options loader
       // -----------------------------------------------------------------------
       /* eslint-disable */
-      var navMenuOptions = $.extend({}, {{nav_mmenu_options | replace: '=>', ':' }});
+      navMenuOptions = $.extend({}, {{nav_mmenu_options | replace: '=>', ':' }});
+      themerOptions  = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
       /* eslint-enable */
       var xhr_data_path;
       var menu_id;
 
-      themerOptions = $.extend({}, {{themer_options | replace: '=>', ':' }});
       // save config settings into the mmenu object for global access
       //
       _this['navMenuOptions'] = navMenuOptions;
@@ -316,10 +318,14 @@ j1.adapter['mmenu'] = (function (j1, window) {
               });
             });
 
-            // remotely loaded (BootSwatch) themes (from API)
+            // jadams, 2020-09-30: loading the menues (themes)
+            // from Bootswatch API (set localFeed EMPTY)
             $('#remote_themes_mmenu').bootstrapThemeSwitcher({localFeed: ''});
-            // locally loaded themes (from json file)
-            $('#local_themes_mmenu').bootstrapThemeSwitcher({localFeed: themerOptions.localThemes});
+            // load (local) J1 themes (default settings) from JSON data
+            $('#local_themes_mmenu').bootstrapThemeSwitcher();
+
+            $('#{{item.menu.content.id}}').show();
+            logger.info('initializing mmenu finished on id: #{{menu_id}}');
             logger.info('met dependencies for: {{menu_id}} loaded');
             clearInterval(dependencies_met_{{menu_id}}_loaded);
             $('#{{item.menu.content.id}}').show();

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

@@ -53,10 +53,11 @@ regenerate:                             true
 {% comment %} Process YML config data
 ================================================================================ {% endcomment %}
 
+
 {% comment %} Set config files
 {% assign auth_manager_config           = site.j1_auth %}
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config               = site.data.template_settings %}
+{% assign template_config               = site.data.j1_config %}
 {% assign blocks                        = site.data.blocks %}
 {% assign modules                       = site.data.modules %}
 
@@ -246,7 +247,7 @@ j1.adapter['navigator'] = (function (j1, window) {
       navAuthMAnagerConfig                          = $.extend({}, {{authentication_options | replace: '=>', ':' }});
       authClientEnabled                             = navAuthMAnagerConfig.enabled;
 
-      themerOptions                                 = $.extend({}, {{themer_options | replace: '=>', ':' }});
+      themerOptions                                 = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
 
       // Merge|Overload module CONFIG by DEFAULTS
       //
@@ -331,13 +332,17 @@ j1.adapter['navigator'] = (function (j1, window) {
             _this.navMenuOptions
           );
 
+          // _this.delayShowMenu( 200 );
+
           // cast text-based booleans
           // themerEnabled = ({{themer_options.enabled }} === 'true');
 
-          // load themes (to menu) if page is finished
-          var dependencies_met_page_finished = setInterval(function() {
-            if (j1.getState() == 'finished') {
-              if ({{themer_options.enabled }}) {
+          // load themes (to menu) if themer is enabled|finished
+          if (themerEnabled) {
+            var dependencies_met_page_finished = setInterval(function() {
+              // jadams, 2020-10-03: NOT needed to wait for j1 finished
+//            if (j1.getState() == 'finished') {
+              if (j1.adapter.themer.getState() == 'finished') {
                 // initialize theme switcher menus
                 logText = 'theme switcher detect: enabled';
                 logger.info(logText);
@@ -350,20 +355,20 @@ j1.adapter['navigator'] = (function (j1, window) {
                 logText = 'load local themes (json file)';
                 logger.info(logText);
                 $('#local_themes').bootstrapThemeSwitcher({localFeed: themerOptions.localThemes});
-              } else {
-                logText = 'theme switcher detect: disabled';
-                logger.info(logText);
+                clearInterval(dependencies_met_page_finished);
               }
-              clearInterval(dependencies_met_page_finished);
-            }
-            _this.setState('initialized');
-          }, 25); // END 'dependencies_met_page_finished'
+              _this.setState('initialized');
+            }, 25); // END 'dependencies_met_page_finished'
+          } else {
+            logText = 'theme switcher detected as: disabled';
+            logger.info(logText);
+          }
 
           // -----------------------------------------------------------------
           // event handler|css styles
           // -----------------------------------------------------------------
           // continue if Theme CSS is applied
-          var dependencies_met_adapter_finished = setInterval(function() {
+          var dependencies_met_themer_finished = setInterval(function() {
             if (themerEnabled) {
               if (j1.adapter.themer.getState() === 'finished') {
                 _this.setState('processing');
@@ -391,7 +396,7 @@ j1.adapter['navigator'] = (function (j1, window) {
                 logger.info('state: ' + _this.getState());
                 logger.info('module initialized successfully');
                 logger.info('met dependencies for: j1');
-                clearInterval(dependencies_met_adapter_finished);
+                clearInterval(dependencies_met_themer_finished);
               }
             } else {
               _this.setState('processing');
@@ -411,9 +416,9 @@ j1.adapter['navigator'] = (function (j1, window) {
               _this.setState('finished');
               logger.info('state: ' + _this.getState());
               logger.info('met dependencies for: themer');
-              clearInterval(dependencies_met_adapter_finished);
+              clearInterval(dependencies_met_themer_finished);
             }
-          }, 25); // END 'dependencies_met_adapter_finished'
+          }, 25); // END 'dependencies_met_themer_finished'
           logger.info('met dependencies for: themer');
           clearInterval(dependencies_met_load_menu_finished);
         }
@@ -755,49 +760,50 @@ j1.adapter['navigator'] = (function (j1, window) {
     //  delay all dropdown menu to open for "delay" time
     //  See: http://jsfiddle.net/AndreasPizsa/NzvKC/
     // -------------------------------------------------------------------------
-    delayShowMenu: function () {
+    delayShowMenu: function ( menuOpenDelay ) {
       var logger      = log4javascript.getLogger('j1.adapter.navigator.delayShowMenu');
-      var theTimer    = 0;
-      var theElement  = null;
+      var theTimer = 0;
+      var theElement = null;
+      var theLastPosition = {x:0,y:0};
 
       logText ='entered delayShowMenu';
       logger.info(logText);
 
-      $('#navigator_nav_menu')
-        .find('li.dropdown.nav-item')
-        .on('mouseenter', function (inEvent) {
-          theElement = $(this);
-          if (theElement) theElement.removeClass('open');
-          //if (theElement) theElement.css("display", "none");
-          //window.clearTimeout(theTimer);
-
-          //theTimer = window.setTimeout (function () {
-           setTimeout (function () {
-            theElement.addClass('open');
-            //theElement.css("display", "block");
-            //window.clearTimeout(theTimer);
-          }, {{menuOpenDelay}});
-        })
-        .on('mousemove', function (inEvent) {
-          if (theElement.hasClass('open')) return true;
-          //window.clearTimeout(theTimer);
-          //theTimer = window.setTimeout (function () {
-           setTimeout (function () {
-            theElement.addClass('open');
-            //window.clearTimeout(theTimer);
-          }, {{menuOpenDelay}});
-        })
-        .on('mouseleave', function (inEvent) {
-          //window.clearTimeout(theTimer);
-          theElement = $(this);
-          //theTimer = window.setTimeout (function () {
-           setTimeout (function () {
-            theElement.removeClass('open');
-            //window.clearTimeout(theTimer);
-          }, {{menuOpenDelay}});
-        });
-
-        return true;
+      // $('#navigator_nav_menu')
+      //   .find('li.dropdown.nav-item')
+
+      $('[data-toggle]').closest('li')
+      .on('mouseenter', function (inEvent) {
+        if (theElement) theElement.removeClass('open');
+        window.clearTimeout(theTimer);
+        theElement = $(this);
+
+        theTimer = window.setTimeout(function () {
+          theElement.addClass('open');
+        }, menuOpenDelay);
+      })
+      .on('mousemove', function (inEvent) {
+        if(Math.abs(theLastPosition.x - inEvent.ScreenX) > 4 ||
+           Math.abs(theLastPosition.y - inEvent.ScreenY) > 4) {
+          theLastPosition.x = inEvent.ScreenX;
+          theLastPosition.y = inEvent.ScreenY;
+          return;
+        }
+        if (theElement.hasClass('open')) return;
+        window.clearTimeout(theTimer);
+        theTimer = window.setTimeout(function () {
+          theElement.addClass('open');
+        }, menuOpenDelay);
+      })
+      .on('mouseleave', function (inEvent) {
+        window.clearTimeout(theTimer);
+        theElement = $(this);
+        theTimer = window.setTimeout(function () {
+          theElement.removeClass('open');
+        }, menuOpenDelay);
+      });
+
+      return true;
     }, // END delayShowMenu
 
     // -------------------------------------------------------------------------