j1_template 2019.4.8 → 2019.4.10

data/lib/starter_web/assets/themes/j1/adapter/js/stickybits.js

@@ -73,12 +73,11 @@ regenerate:                             false
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
-j1.Stickybits = (function (j1, window) {
+j1.adapter['stickybits'] = (function () {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}'; // Set environment
-  var state         = 'not_started';
   var moduleOptions = {};
   var _this;
   var logger;
@@ -94,23 +93,26 @@ j1.Stickybits = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function () {
+      // initialize state flag
+      j1.adapter.stickybits.state = 'pending';
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
       _this   = j1.adapter.stickybits;
       logger  = log4javascript.getLogger('j1.adapter.stickybits');
 
-      state = 'started';
-      logger.info('state: ' + state);
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
+      logger.info('Module is being initialized');
 
       stickybitsInstance = stickybits('{{stickybits_options.selector}}', {
         useStickyClasses:       {{site.data.modules.j1_stickybits.default.useStickyClasses}},
         stickyBitStickyOffset:  "{{site.data.modules.j1_stickybits.default.offset}}px"
       });
 
-      state = 'finished';
-      logger.info('state: ' + state);
-      logger.info('Module is being initialized');
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
+      logger.info('module initializing finished');
 
       return true;
     }, // END init
@@ -119,9 +121,9 @@ j1.Stickybits = (function (j1, window) {
     // messageHandler: MessageHandler for J1 CookieConsent module
     // Manage messages send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function ( sender, message ) {  
-      var json_message = JSON.stringify(message, undefined, 2);  
-  
+    messageHandler: function ( sender, message ) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.info(logText);
 
@@ -129,7 +131,9 @@ j1.Stickybits = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
 
@@ -141,17 +145,19 @@ j1.Stickybits = (function (j1, window) {
     }, // END messageHandler
 
     // -------------------------------------------------------------------------
-    //  Set the current (processing) state of the module
+    // setState
+    // Set the current (processing) state of the module
     // -------------------------------------------------------------------------
     setState: function ( stat ) {
-      state = stat;
+      j1.adapter.stickybits.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
-    //  Returns the current (processing) state of the module
+    // getState
+    // Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.stickybits.state;
     } // END state
 
   }; // END return

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

@@ -0,0 +1,350 @@
+---
+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 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               = 4;
+  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 () {
+      // initialize state flag
+      j1.adapter.themer.state = 'started';
+
+      _this     = j1.adapter.themer;
+      logger    = log4javascript.getLogger('j1.adapter.themer');
+
+      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('theme loaded: ' + themeName);
+          logger.info('theme file: ' + theme);
+          _this.setState('finished');
+          logger.info('state: ' + _this.getState());
+          logger.info('module initialized successfully');
+          var dependencies_colors_loaded = setInterval (function() {
+            if (typeof j1.colors !== 'undefined') {
+              // set general|global theme colors
+              _this.setCss();
+              clearInterval(dependencies_colors_loaded);
+            }
+          }, 25); // END 'dependencies_colors_loaded'
+        });
+      {% 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_active    = j1.setColorData('md_blue');         // j1.getStyleValue('btn-info', 'background-color');
+      var tabs_pills_link_color_hover     = j1.setColorData('md_gray_300');     // j1.getStyleValue('btn-secondary', '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_active+ ' !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
+        //
+        logger.info(message.text);
+      }
+        //
+        // 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 %}

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

@@ -1,7 +1,7 @@
 ---
 regenerate:                             false
 ---
- 
+
 {% capture j1_cache %}
 
 {% comment %}
@@ -20,7 +20,7 @@ regenerate:                             false
  # Tocbot is licensed under under the MIT License.
  # For details, see https://tscanlin.github.io/tocbot
  # -----------------------------------------------------------------------------
- # TODO: 
+ # TODO:
  # 2019-03-10:  Old BS Affix code is to be removed
  # -----------------------------------------------------------------------------
 {% endcomment %}
@@ -54,13 +54,6 @@ regenerate:                             false
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign toccer_options    = toccer_defaults | merge: toccer_settings %}
 
-{% assign active_link_color_fallback  = '#204A87' %}
-{% if toccer_options.activeLinkColor %}
-  {% assign active_link_color   = toccer_options.activeLinkColor %}
-{% else %}
-  {% assign active_link_color   = active_link_color_fallback %}
-{% endif %}
-
 
 /*
  # -----------------------------------------------------------------------------
@@ -90,7 +83,6 @@ j1.adapter['toccer'] = (function () {
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
   var environment   = '{{environment}}'; // Set environment
-  var state         = 'not_started';
   var moduleOptions = {};
   var _this;
   var logger;
@@ -108,15 +100,17 @@ j1.adapter['toccer'] = (function () {
     // -------------------------------------------------------------------------
     // Initializer
     // -------------------------------------------------------------------------
-    init: function ( options ) {
+    init: function (options) {
+      // initialize state flag
+      j1.adapter.toccer.state = 'pending';
 
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
       _this   = j1.adapter.toccer;
       logger  = log4javascript.getLogger('j1.adapter.toccer');
 
-      state = 'started';
-      logger.info('state: ' + state);
+      _this.setState('started');
+      logger.info('state: ' + _this.getState());
       logger.info('Module is being initialized');
 
       if ( options  !== undefined ) {
@@ -129,54 +123,53 @@ j1.adapter['toccer'] = (function () {
       var  isToc = (options.toc === 'true');
       var  isComments = (options.comments === 'true');
 
-      if ( settings.collapseDepth === undefined ) {
+      if (settings.collapseDepth === undefined) {
         settings.collapseDepth = {{toccer_options.collapseDepth}};
       }
 
-      if ( settings.headingsOffset === undefined ) {
+      if (settings.headingsOffset === undefined) {
         settings.scrollOffset = {{toccer_options.smoothScrollOffset}};
       } else {
         settings.scrollOffset = settings.headingsOffset
       }
 
-      if ( settings.enabled === undefined ) {
+      if (settings.enabled === undefined) {
         settings.enabled = true;
       }
 
-      if ( isToc ) {
-        this.initToccerCore( settings );
-        this.setCss();
+      if (isToc) {
+        _this.initToccerCore(settings);
+        _this.setCss();
 
         /* jadams, 2011-03-11: For now, no need to adjust the top sticky position */
         /* leave the code in for future use if needed */
-        /* this.setTop(); */
+        /* _this.setTop(); */
 
         // if comments enabled
-        if ( isToc && isComments ) {            
-          logText = 'Connector Disqus successfully initialized';
+        if (isToc && isComments) {
+          logText = 'connector for disqus successfully initialized';
           logger.info(logText);
 
-          /* NOTE: BS or Tocbot Affix is not used anymore. Replaced by CSS style "sticky" */
-          /* j1.adapter.toccer.initAffix(); */
+          // NOTE: BS or Tocbot Affix is not used anymore.
+          // Replaced by CSS style "sticky"
+          // j1.adapter.toccer.initAffix();
+          // state = 'finished';
+          // logger.info('state: ' + state); // Set|Log status
+          // logger.info('module initialized successfully');
 
-          logText = 'Toccer Affix initialized successfully';
-          logger.info(logText);
-          state = 'finished';
-          logger.info('Toccer initialized successfully');
-          logger.info('state: ' + state); // Set|Log status
         } else {
           // if toc enabled only
           if ( isToc ) {
-            state = 'finished';
-            logger.info('state: ' + state); // Set|Log status
-            logger.info('Toccer initialized successfully');
+            // state = 'finished';
+            // logger.info('state: ' + state); // Set|Log status
+            // logger.info('module initialized successfully');
           }
-        } // ENDIF isComments (Disqus enabled)
-      } // ENDIF isToc
+        } // END if isComments (Disqus enabled)
+      } // END if isToc
 
-      state = 'finished';
-      logger.info('state: ' + state); // Set|Log status
-      logger.info('Toccer initialized successfully');
+      _this.setState('finished');
+      logger.info('state: ' + _this.getState());
+      logger.info('module initialized successfully');
 
       return true;
     }, // END init
@@ -186,17 +179,21 @@ j1.adapter['toccer'] = (function () {
     // ---------------------------------------------------------------------
     initToccerCore: function ( options ) {
 
-      if ( options  !== undefined ) {
+      if (options  !== undefined) {
         var settings = $.extend({}, options);
       } else {
         var settings = false;
       }
 
-      state = 'running';
-      logger.info('state: ' + state); // Set|Log status
+      _this.setState('running');
+      logger.info('state: ' + _this.getState());
+
+
+      var bg_primary = j1.getStyleValue('bg-primary', 'background-color');
 
       tocbot.init({
         log:                    {{ toccer_options.log | json }},
+        activeLinkColor:        {{ toccer_options.activeLinkColor | json }},
         tocSelector:            {{ toccer_options.tocSelector | json }},
         headingSelector:        {{ toccer_options.headingSelector | json }},
         ignoreSelector:         {{ toccer_options.ignoreSelector | json }},
@@ -215,7 +212,7 @@ j1.adapter['toccer'] = (function () {
         positionFixedSelector:  '',
         positionFixedClass:     'is-position-fixed',
         fixedSidebarOffset:     'auto',
-        smoothScroll:           {{ toccer_options.smoothScrollEnabled | json }},            
+        smoothScroll:           {{ toccer_options.smoothScrollEnabled | json }},
         smoothScrollOffset:     {{ toccer_options.smoothScrollOffset | json }},
         smoothScrollDuration:   {{ toccer_options.smoothScrollDuration | json }},
         headingsOffset:         {{ toccer_options.headingsOffset | json }},
@@ -232,13 +229,13 @@ j1.adapter['toccer'] = (function () {
 
     // ---------------------------------------------------------------------
     // Calculate|Set Affix offset Top|Bottom of the Toccer menu
-    // depending on the size of the page header (masthead)
+    // depending on the size of the page header (attic)
     // ---------------------------------------------------------------------
     initAffix: function () {
       var nav_bar         = $('nav.navbar');
       var side_bar        = $('#j1-sidebar');
-      var header          = $('.j1-masthead');
-      //var disqus_id       = $('#disqus');
+      var header          = $('.attic');
+//    var disqus_id       = $('#disqus');
       var disqus_id       = $('.bmd-layout-content');
       var disqus_thread   = $('#disqus_thread');
       var adblock         = $('#adblock');
@@ -254,14 +251,14 @@ j1.adapter['toccer'] = (function () {
             var e = $(nav_bar).height();
             var h = $(header).height();
             var z = c - e;
-            return this.top = z - a;
+            return _this.top = z - a;
           },
           bottom: function () {
             /*  space below the affixed element */
             if (disqus_id.length) {
-              return ( this.bottom = $(disqus_id).outerHeight(true) + $(footer_id).outerHeight(true) + footer_offset )
+              return ( _this.bottom = $(disqus_id).outerHeight(true) + $(footer_id).outerHeight(true) + footer_offset )
             } else {
-              return ( this.bottom = $(footer_id).outerHeight(true) + footer_offset );
+              return ( _this.bottom = $(footer_id).outerHeight(true) + footer_offset );
             }
           }
         }
@@ -272,13 +269,13 @@ j1.adapter['toccer'] = (function () {
 
     // ---------------------------------------------------------------------
     // Calculate|Set Top position of the Toccer menu
-    // depending on the size of the page header (masthead)
+    // depending on the size of the page header (attic)
     // ---------------------------------------------------------------------
-    setTop: function ( options) {
+    setTop: function (options) {
       $(window).scroll(function(event){
         var navbar    = $('nav.navbar.navigator');
         var adblock   = $('#adblock');
-        var pagehead  = $('.j1-masthead');
+        var pagehead  = $('.attic');
         var offset    = 0;
         var m         = parseInt(pagehead.css('margin-bottom'), 10);
         var n         = navbar.outerHeight();
@@ -300,7 +297,9 @@ j1.adapter['toccer'] = (function () {
     // Set dynamic styles
     // ---------------------------------------------------------------------
     setCss: function () {
-      $('head').append('<style>.is-active-link::before { font-weight: 700; background-color: {{ active_link_color }}; }</style>');
+
+      var bg_primary  = j1.getStyleValue('bg-primary', 'background-color');
+      $('head').append('<style>.is-active-link::before { background-color: ' +bg_primary+ ' !important; }</style>');
 
       return true;
     }, // END setCss
@@ -309,9 +308,9 @@ j1.adapter['toccer'] = (function () {
     // messageHandler: MessageHandler for J1 NAV module
     // Manage messages (paylods) send from other J1 modules
     // -------------------------------------------------------------------------
-    messageHandler: function ( sender, message ) {  
-      var json_message = JSON.stringify(message, undefined, 2);  
-  
+    messageHandler: function (sender, message) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
       logText = 'Received message from ' + sender + ': ' + json_message;
       logger.debug(logText);
 
@@ -319,7 +318,9 @@ j1.adapter['toccer'] = (function () {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        //
+        // Place handling of command|action here
+        //
         logger.info(message.text);
       }
 
@@ -333,15 +334,15 @@ j1.adapter['toccer'] = (function () {
     // -------------------------------------------------------------------------
     //  Set the current (processing) state of the module
     // -------------------------------------------------------------------------
-    setState: function ( stat ) {
-      state = stat;
+    setState: function (stat) {
+      j1.adapter.toccer.state = stat;
     }, // END setState
 
     // -------------------------------------------------------------------------
     //  Returns the current (processing) state of the module
     // -------------------------------------------------------------------------
     getState: function () {
-      return state;
+      return j1.adapter.toccer.state;
     } // END state
 
   }; // END return