j1_template 2019.4.8 → 2019.4.10

data/lib/starter_web/assets/themes/j1/adapter/js/{octokit.app_only.js → _unused/octokit.app_only.js}

@@ -118,7 +118,7 @@ j1.adapter['octokit'] = (function (j1, window) {
           logger.info('Module is being initialized');
 
           // Load webhook modals
-          $.when( j1.xhrLoadData('j1.adapter.octokit', moduleOptions))
+          $.when( j1.xhrDATA('j1.adapter.octokit', moduleOptions))
           .then (function (success) {
             if (success) {
               {% comment %} Run initializers if webhook modals LOADED

data/lib/starter_web/assets/themes/j1/adapter/js/_unused/octokit.old.js

@@ -92,7 +92,7 @@ j1.octokit = (function (j1, window) {
               state = 'initialize';
               logger.info('state: ' + state);
 
-              $.when( j1.xhrLoadData( 'j1.octokit', moduleOptions ) )
+              $.when( j1.xhrDATA( 'j1.octokit', moduleOptions ) )
                 .done ( function ( success ) {
                   // Loading data started successfully
                   if (success) {

data/lib/starter_web/assets/themes/j1/adapter/js/{switcher.js → _unused/switcher.js}

@@ -49,6 +49,16 @@ regenerate:                         false
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign switcher_options  = switcher_defaults | merge: switcher_settings %}
+{% assign default_theme     = template_config.bootstrap.default_theme %}
+{% assign vendor_css        = "vendor" %}
+{% assign theme_base        = "core/css" %}
+{% assign theme_ext         = "css" %}
+
+{% if environment == "development" or environment == "test" %}
+  {% assign theme_ext       = "css" %}
+{% else %}
+  {% assign theme_ext       = "min.css" %}
+{% endif %}
 
 /*
  # -----------------------------------------------------------------------------
@@ -84,6 +94,24 @@ j1.adapter['switcher'] = (function (j1, window) {
   var logger;
   var logText;
 
+
+
+  var cookie_names            = j1.getCookieNames();
+  var user_state_cookie_name  = cookie_names.user_session;
+  var user_state_detected     = false;
+
+  var id                      = 'default';
+  var cssFile                 = '{{switcher_options.defaultCssFile}}';
+  var themeName;
+  var themeCss;
+  var themeCssHtml;
+  var themeExtensionCss;
+  var themeExtensionCssHtml;
+
+  var user_state = {};
+  var user_state_json;
+  var user_state_cookie;
+
   // ---------------------------------------------------------------------------
   // Main object
   // ---------------------------------------------------------------------------
@@ -98,6 +126,33 @@ j1.adapter['switcher'] = (function (j1, window) {
       state = 'started';
       logger.info('state: ' + state); // Set|Log status
 
+      // Detect|Set J1 UserState
+      user_state_detected = j1.existsCookie(user_state_cookie_name);
+      if ( user_state_detected ) {
+        user_state                = j1.readCookie(user_state_cookie_name);
+        themeName                 = user_state.theme_name;
+        themeCss                  = user_state.theme_css;
+        themeExtensionCss         = user_state.theme_extension_css;      
+      }
+      if (themeCss) {      
+        themeCssHtml              = "<link rel='stylesheet' id='" + id + "' href='" + themeCss + "' type='text/css' />";      
+        themeExtensionCssHtml     = "<link rel='stylesheet' id='" + id + "' href='" + themeExtensionCss + "' type='text/css' />";
+      } else {
+        themeCssHtml              = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />';
+        vendorCssHtml             = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{vendor_css}}.{{theme_ext}}" />';
+        $('head').append(vendorCssHtml);
+      }    
+      $('head').append(themeCssHtml);    
+
+      // Append|Remove theme extentions
+      // TODO: Make default theme name 'Uno' configurable
+      if ( themeName === 'Uno'  ) {
+        $('head link[href*="' +themeExtensionCss+ '"]').remove();
+      } else {
+        $('head').append(themeExtensionCssHtml);
+      }
+
+
       {% if switcher_options.enabled %}
         logger.info("ThemeSwitcher being initialized");
 

data/lib/starter_web/assets/themes/j1/adapter/js/_unused/template.new-1.js

@@ -480,7 +480,7 @@ var j1 = function () {
       logger.info(logText);
       
       var headerLoaded = setInterval(function() {
-        if ( j1.MastHead.state() === 'initialized' && j1.Navigator.state() === 'finished' ) {
+        if ( j1.attic.state() === 'initialized' && j1.Navigator.state() === 'finished' ) {
           // pause the display of current page for flicker timeout [ms]
           setTimeout( function() { 
             // display current page

data/lib/starter_web/assets/themes/j1/adapter/js/_unused/template.new.js

@@ -1310,12 +1310,12 @@ var j1 = (function () {
     // }, // END fetchAPI
 
     // -------------------------------------------------------------------------
-    // xhrLoadData:
+    // xhrDATA:
     // Load data asychronously using XHR on a DIV container
     // specified (from options)
     // -------------------------------------------------------------------------
-    xhrLoadData: function ( mod, options, state ) {
-      var logger = log4javascript.getLogger('j1.xhrLoadData');
+    xhrDATA: function ( mod, options, state ) {
+      var logger = log4javascript.getLogger('j1.xhrDATA');
       var state;
       var logText;
 
@@ -1353,7 +1353,7 @@ var j1 = (function () {
         executeFunctionByName(mod + '.setState', window, state)
         return false;
       }
-    }, // END xhrLoadData
+    }, // END xhrDATA
 
     // -------------------------------------------------------------------------
     // getColorData: Returns the j1_colors object

data/lib/starter_web/assets/themes/j1/adapter/js/_unused/template.old.js

@@ -568,7 +568,7 @@ var j1 = function () {
       logger.info(logText);
 
       var headerLoaded = setInterval(function() {
-        if ( j1.MastHead.state() === 'initialized' && j1.Navigator.state() === 'finished' ) {
+        if ( j1.attic.state() === 'initialized' && j1.Navigator.state() === 'finished' ) {
           // pause the display of current page for flicker timeout [ms]
           setTimeout( function() {
             // display current page
@@ -1300,16 +1300,16 @@ var j1 = function () {
     }, // END fetchAPI
 
     // -------------------------------------------------------------------------
-    // xhrLoadData:
+    // xhrDATA:
     // Load data asychronously using XHR on a DIV container 
     // specified (from options)
     // -------------------------------------------------------------------------
-    xhrLoadData: function ( mod, options ) {
+    xhrDATA: function ( mod, options ) {
       var state;
 
       var cb_load_closure = function( mod, id ) {        
         return function ( responseTxt, statusTxt, xhr ) {
-          var logger = log4javascript.getLogger('j1.xhrLoadData');
+          var logger = log4javascript.getLogger('j1.xhrDATA');
           if ( statusTxt == "success" ) {
             var logText = "Data on ID " +id+ " loaded successfully"
             logger.info(logText);
@@ -1342,7 +1342,7 @@ var j1 = function () {
         executeFunctionByName('j1.' + mod + '.setState', window, state)
         return false;
       }      
-    }, // END xhrLoadData
+    }, // END xhrDATA
 
     // -------------------------------------------------------------------------
     // Send message

data/lib/starter_web/assets/themes/j1/adapter/js/_unused/template.org.js

@@ -486,7 +486,7 @@ var j1 = function () {
       logger.info(logText);
       
       var headerLoaded = setInterval(function() {
-        if ( j1.MastHead.state() === 'initialized' && j1.Navigator.state() === 'finished' ) {
+        if ( j1.attic.state() === 'initialized' && j1.Navigator.state() === 'finished' ) {
           // pause the display of current page for flicker timeout [ms]
           setTimeout( function() { 
             // display current page

data/lib/starter_web/assets/themes/j1/adapter/js/_unused/themer.css_load_check.js

@@ -0,0 +1,360 @@
+---
+regenerate:                         false
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/themer.js
+ # Liquid template to adapt theme functions
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2019 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ #
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  {{ config | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign template_version  = site.version %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign site_config       = site %}
+{% assign template_config   = site.data.template_settings %}
+{% assign blocks            = site.data.blocks %}
+{% assign modules           = site.data.modules %}
+
+{% comment %} Set config data
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign themer_defaults   = modules.defaults.themer.defaults %}
+{% assign themer_settings   = modules.themer.settings %}
+
+{% comment %} Set config options
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign themer_options    = themer_defaults | merge: themer_settings %}
+{% assign default_theme     = template_config.bootstrap.default_theme %}
+{% assign vendor_css        = "vendor" %}
+{% assign theme_base        = "core/css" %}
+{% assign theme_ext         = "css" %}
+
+{% if environment == "development" or environment == "test" %}
+  {% assign theme_ext       = "css" %}
+{% else %}
+  {% assign theme_ext       = "min.css" %}
+{% endif %}
+
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/themer.js
+ # JS Adapter for J1 themer (BS Theme themer)
+ #
+ # Product/Info:
+ # https://jekyll.one
+ # https://github.com/jguadagno/bootstrapThemethemer
+ #
+ # Copyright (C) 2019 Juergen Adams
+ # Copyright (C) 2014 Joseph Guadagno
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see https://jekyll.one
+ # BS Theme themer is licensed under the MIT License.
+ # For details, see https://github.com/jguadagno/bootstrapThemethemer/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ #  Setup of theme selectors (ThemeList|ThemeSelect) moved 
+ #  to j1_adapter_navigator.js 
+ # -----------------------------------------------------------------------------
+ # Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+'use strict';
+
+j1.adapter['themer'] = (function (j1, window) {
+
+  // ---------------------------------------------------------------------------
+  // globals
+  // ---------------------------------------------------------------------------
+  var environment             = '{{environment}}';
+  var state                   = 'not_started';
+  var moduleOptions           = {};
+  var user_state              = {};
+  var cookie_names            = j1.getCookieNames();
+  var user_state_cookie_name  = cookie_names.user_session;
+  var user_state_detected     = false;
+  var id                      = 'default';
+  var cssFile                 = '{{themer_options.defaultCssFile}}';
+  var interval_count          = 0;
+  var max_count               = 10;
+  var user_state_json;
+  var user_state_cookie;
+  var _this;
+  var theme;
+  var themeName;
+  var themeCss;
+  var themeCssHtml;
+  var themeExtensionCss;
+  var themeExtensionCssHtml;
+  var logger;
+  var logText;
+    
+  // ---------------------------------------------------------------------------
+  // helper functions
+  // ---------------------------------------------------------------------------
+
+  // See: https://stackoverflow.com/questions/16965515/how-to-get-a-style-attribute-from-a-css-class-by-javascript-jquery
+  // Example: getStyleValueFromStyleSheet('bg-primary', 'background-color', 'vendor');
+  function styleSheetLoaded(styleSheet) {
+    // var styleSheet  = styleSheetName.toLowerCase() + '.css';
+    var sheets      = document.styleSheets, stylesheet = sheets[(sheets.length - 1)];
+
+    // find CSS file 'styleSheetName' in document
+    for(var i in document.styleSheets) {
+      if(sheets[i].href && sheets[i].href.indexOf(styleSheet) > -1) {
+        return true;;
+      }
+    }
+    return false;
+  }
+
+  {% comment %} Unused
+  ------------------------------------------------------------------------------
+  // NOTE: Does not work anymore because of CORS check violation
+  // See: https://stackoverflow.com/questions/16965515/how-to-get-a-style-attribute-from-a-css-class-by-javascript-jquery
+  // Example: getStyleValueFromStyleSheet('bg-primary', 'background-color', 'vendor');
+  function getStyleValueFromStyleSheet(className, style, styleSheetName) {
+    var sheets = document.styleSheets, stylesheet = sheets[(sheets.length - 1)];
+    var style;
+
+    // find CSS file 'styleSheetName' in document
+    for( var i in document.styleSheets ){
+      if( sheets[i].href && sheets[i].href.indexOf(styleSheetName + ".css") > -1 ) {
+        stylesheet = sheets[i];
+        break;
+      }
+      if (typeof(stylesheet) === 'undefined') return null;
+    }
+
+    // find CSS style 'style' in styleSheetName
+    for (var j=0, k=stylesheet.cssRules.length; j < k; j++) {
+      var rule = stylesheet.cssRules[j];
+      if (rule.selectorText && rule.selectorText.split(',').indexOf('.' +className) !== -1) {
+        style = rule.style[style];
+        return style;
+      }
+    }
+
+    return null;
+  }
+  ------------------------------------------------------------------------------ {% endcomment %}
+
+
+  // ---------------------------------------------------------------------------
+  // Main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // initializer
+    // -------------------------------------------------------------------------
+    init: function () {
+      _this     = j1.adapter.themer;
+      logger    = log4javascript.getLogger('j1.adapter.themer');
+
+      j1.adapter.themer.state = 'started';
+
+      logger.info('state: ' + _this.getState());
+
+      // Detect|Set J1 UserState
+      user_state_detected = j1.existsCookie(user_state_cookie_name);
+      if ( user_state_detected ) {
+        user_state                = j1.readCookie(user_state_cookie_name);
+        themeName                 = user_state.theme_name;
+        themeCss                  = user_state.theme_css;
+        themeExtensionCss         = user_state.theme_extension_css;      
+      }
+      if (themeCss) {      
+        themeCssHtml              = "<link rel='stylesheet' id='" + id + "' href='" + themeCss + "' type='text/css' />";      
+        themeExtensionCssHtml     = "<link rel='stylesheet' id='" + id + "' href='" + themeExtensionCss + "' type='text/css' />";
+      } else {
+        themeCssHtml              = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />';
+        vendorCssHtml             = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{vendor_css}}.{{theme_ext}}" />';
+        $('head').append(vendorCssHtml);
+      }    
+      $('head').append(themeCssHtml);    
+
+      // Append|Remove theme extentions
+      // TODO: Make default theme name 'Uno' configurable
+      if ( themeName === 'Uno'  ) {
+        $('head link[href*="' +themeExtensionCss+ '"]').remove();
+      } else {
+        $('head').append(themeExtensionCssHtml);
+      }
+
+      {% if themer_options.enabled %}
+        logger.info('themes detected as: enabled');
+        logger.info('theme is being initialized: ' + themeName);
+
+      $.when(
+        $('#ThemeList').bootstrapThemeSwitcher.defaults = {
+          debug:                    {{ themer_options.debug | json }},
+          saveToCookie:             {{ themer_options.saveToCookie | json }},
+          cssThemeLink:             {{ themer_options.cssThemeLink | json }},          
+          cookieThemeName:          {{ themer_options.cookieThemeName | json }},
+          cookieDefaultThemeName:   {{ themer_options.cookieDefaultThemeName | json }},
+          cookieThemeCss:           {{ themer_options.cookieThemeCss | json }},
+          cookieThemeExtensionCss:  {{ themer_options.cookieThemeExtensionCss | json }},
+          cookieExpiration:         {{ themer_options.cookieExpiration | json }},
+          cookiePath:               {{ themer_options.cookiePath | json }},
+          defaultCssFile:           {{ themer_options.defaultCssFile | json }},
+          bootswatchApiUrl:         {{ themer_options.bootswatchApiUrl | json }},
+          bootswatchApiVersion:     {{ themer_options.bootswatchApiVersion | json }},
+          loadFromBootswatch:       {{ themer_options.loadFromBootswatch | json }},
+          localFeed:                {{ themer_options.localFeed | json }},
+          excludeBootswatch:        {{ themer_options.excludeBootswatch | json }},
+          includeBootswatch:        {{ themer_options.includeBootswatch | json }},
+          skipIncludeBootswatch:    {{ themer_options.skipIncludeBootswatch | json }}
+        })
+        .then (function() {
+          if (themeName === 'Uno' || themeName === 'Bootstrap') {
+            theme = environment === 'production' 
+              ? themeName.toLowerCase() + '.min.css' 
+              : themeName.toLowerCase() + '.css';
+          } else {
+            theme = 'bootstrap.css';  // fallback
+          }
+
+          logger.info('wait until theme loaded: ' + themeName);
+          var dependency_met_theme_css_loaded = setInterval(function() {
+            interval_count += 1;
+            if (styleSheetLoaded(theme) === true) {              
+              logger.info('theme loaded: ' + themeName);
+              _this.setState('finished');
+              logger.info('state: ' + state);
+              logger.info('module initialized successfully:' + themeName);
+
+              // set general|global theme colors
+              _this.setCss();
+
+              clearInterval(dependency_met_theme_css_loaded);
+              return true;
+            }
+            if (interval_count > max_count) {
+              clearInterval(dependency_met_theme_css_loaded);
+              _this.setCss();
+              _this.setState('finished');
+              logger.info('state: ' + _this.getState());
+              logger.warn('failed to detected css file loaded for theme: ' + themeName);
+              return false;
+            }
+          }, 25);
+        });
+      {% else %}
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+          logger.info('module detected as: disabled');
+          return true;
+      {% endif %}
+    }, // END init
+
+    // -------------------------------------------------------------------------
+    // setCss
+    // Set dynamic styles
+    // -------------------------------------------------------------------------
+    setCss: function () {
+      var bg_primary                      = j1.getStyleValue('bg-primary', 'background-color');
+      // var admonitionblock_note_color      = j1.getStyleValue('icon-note', 'color');
+      // var admonitionblock_tip_color       = j1.getStyleValue('icon-tip', 'color');
+      // var admonitionblock_important_color = j1.getStyleValue('icon-important', 'color');
+      // var admonitionblock_warning_color   = j1.getStyleValue('icon-warning', 'color');
+      // var admonitionblock_caution_color   = j1.getStyleValue('icon-caution', 'color');
+
+      var admonitionblock_note_color      = j1.getStyleValue('btn-info', 'background-color');
+      var admonitionblock_tip_color       = j1.getStyleValue('btn-success', 'background-color');
+      var admonitionblock_important_color = j1.getStyleValue('btn-warning', 'background-color');
+      var admonitionblock_warning_color   = j1.getStyleValue('icon-warning', 'color');
+      var admonitionblock_caution_color   = j1.getStyleValue('btn-danger', 'background-color');
+
+      var tabs_pills_link_color_hover     = j1.getStyleValue('btn-info', 'background-color');
+
+      $('head').append('<style>.g-bg-primary { background-color: ' +bg_primary+ ' !important; }</style>');
+      $('head').append('<style>.mdi-md-bg-primary { color: ' +bg_primary+ '; }</style>');
+
+      $('head').append('<style>.nav-link:hover { background-color: ' +tabs_pills_link_color_hover+ ' !important; }</style>');
+      $('head').append('<style>.nav-link.active { background-color: ' +tabs_pills_link_color_hover+ ' !important; }</style>');
+
+      $('head').append('<style>.icon-note { color: ' +admonitionblock_note_color+ ' !important; }</style>');
+      $('head').append('<style>.icon-tip { color: ' +admonitionblock_tip_color+ ' !important; }</style>');
+      $('head').append('<style>.icon-important { color: ' +admonitionblock_important_color+ ' !important; }</style>');
+      $('head').append('<style>.icon-warning { color: ' +admonitionblock_warning_color+ ' !important; }</style>');
+      $('head').append('<style>.icon-caution { color: ' +admonitionblock_caution_color+ ' !important; }</style>');
+
+
+      return true;
+    }, // END setCss
+
+    // -------------------------------------------------------------------------
+    // messageHandler
+    // Manage messages send from other J1 modules
+    // -------------------------------------------------------------------------
+    messageHandler: function ( sender, message ) {  
+      var json_message = JSON.stringify(message, undefined, 2);  
+  
+      logText = 'Received message from ' + sender + ': ' + json_message;
+      logger.info(logText);
+
+      // -----------------------------------------------------------------------
+      //  Process commands|actions
+      // -----------------------------------------------------------------------
+      if ( message.type === 'command' && message.action === 'module_initialized' ) {
+        //
+        // Place handling of command|action here
+        //
+      }
+        //
+        // Place handling of other command|action here
+        //
+
+      return true;
+    }, // END messageHandler
+
+    // -------------------------------------------------------------------------
+    // setState
+    // Set the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    setState: function ( stat ) {
+      j1.adapter.themer.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: function () {
+      return j1.adapter.themer.state;
+    } // END state
+
+  }; // END return
+})(j1, window);
+
+{% endcapture %}
+
+{{ cache | strip_empty_lines }}
+{% assign cache = nil %}