j1_template_mde 2018.4.31 → 2018.4.32

data/lib/starter_web/assets/themes/j1/core/js/adapter/scroller.js

@@ -67,7 +67,7 @@ j1.Scroller = (function (j1, window) {
     // Initialize
     init: function () {
       // Setup logger
-      logger = log4javascript.getLogger("j1.Scroller");
+      logger = log4javascript.getLogger("j1.Scroller.adapter");
       state = 'started';
       logger.info('state: ' + state); // Set|Log status
       logger.info("SmoothScroll being initialized");

data/lib/starter_web/assets/themes/j1/core/js/adapter/searcher.js

@@ -69,7 +69,7 @@ regenerate:                         true
       // Initialize
       init: function () {
         // Setup logger
-        logger = log4javascript.getLogger("j1.QuickSearch");
+        logger = log4javascript.getLogger("j1.QuickSearch.adapter");
         logger.info("Jekyll Search is being initialized");
         state = 'started';
         logger.info('state: ' + state); // Set|Log status

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

@@ -65,7 +65,7 @@ j1.Stickybits = (function (j1, window) {
     // Initialize
     init: function () {
       // Setup logger
-      logger = log4javascript.getLogger("j1.Stickybits");
+      logger = log4javascript.getLogger("j1.Stickybits.adapter");
       state = 'started';
       logger.info('state: ' + state);
 

data/lib/starter_web/assets/themes/j1/core/js/adapter/switcher.js

@@ -58,7 +58,7 @@ j1.Switcher = (function (j1, window) {
     // Initialize
     init: function () {
       // Setup logger
-      logger = log4javascript.getLogger("ThemeSwitcher");
+      logger = log4javascript.getLogger("ThemeSwitcher.adapter");
       state = 'started';
       logger.info('state: ' + state); // Set|Log status
       logger.info("ThemeSwitcher being initialized");

data/lib/starter_web/assets/themes/j1/core/js/adapter/template.js

@@ -54,6 +54,7 @@ regenerate:                             true
 {% endif %}
 
 {% assign environment         = site.environment %}
+{% assign template_version    = site.version %}
 {% assign hideOnReload        = site.data.modules.j1_theme_switcher.hideOnReload %}
 {% assign flickerTimeout      = site.data.modules.j1_theme_switcher.flicker_timeout %}
 
@@ -74,37 +75,55 @@ regenerate:                             true
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 var j1 = function () {
-  var environment         = '{{environment}}'; // Set environment
-  var cookieUserState     = 'j1.user.state';
-  var state               = 'unknown';
-  var app_detected        = false;
+
+//var environment         = '{{environment}}'; // Set environment
+//var cookieUserState     = 'j1.user.state';
+//
+
+  // Status information
+  var state = 'not_started';
+  var app_detected;
+  var user_state_detected;
+  
+  // Theme information
+  var themeName;
+  var themeCss;
+  var themeExtensionCss;
+
   // J1 data files
   var j1_colors           = {};
   var colors_data_path    = "/assets/data/colors.json";
-  // J1 UserState Cookie
+  
+// Logger
+  var logger;
+  var logText;
+
+  // J1 UserState Cookie (initial values)
   var j1_user_state = {
-    'authenticated' : 'false',
-    'cookies_accepted' : '',
     'theme_css' : '/assets/themes/j1/core/css/uno.css',
     'theme_extension_css' : '/assets/themes/j1/core/css/theme_extensions.css',
     'theme_name' : 'Uno',
-    'last_page' : 'unknown',
+    'theme_author' : 'J1 Team',
+    'theme_link' : 'https://support.jekyll-one.com/',
+    'previous_page' : 'unknown',
     'current_page' : 'unknown',
-    'last_provider' : 'unknown',
-    'last_signin' : 'unknown',
-    'provider' : 'unknown',
-    'user_name' : 'unknown',
-    'user_id' : 'unknown'
+    'provider' : 'j1',
+    'provider_membership' : 'guest',
+    "provider_permissions" : "public",
+    "provider_url" : "https:/jekyll.one", 
+    'status' : 'pending',
+    'user_name' : 'visitor',
+    'language' : 'unknown',
+    'cookies_accepted' : "pending",
+    'writer' : 'web'
   };
-  // Logger
-  var logger;
-  var logText;
 
   return {
+
     // Initialize
     init: function ( options ) {
 
-      var logger = log4javascript.getLogger('j1.Template');
+      var logger = log4javascript.getLogger('j1.Template.adapter');
       state = 'started';
       logger.info('state: ' + state); // Set|Log status
 
@@ -118,30 +137,60 @@ var j1 = function () {
         $( 'body' ).addClass( 'hide-scrollbar' )
       }
 
+      // Detect|Set J1 AppSession
+      app_detected = j1.existsCookie ( 'j1.web.session' );
+
+
+      // Detect|Set J1 UserState
+      user_state_detected = j1.existsCookie ( 'j1.user.state' );
+      if ( user_state_detected ) {
+        logger.info('Read UserState cookie');
+        j1_user_state     = j1.getUserStateCookie();
+        themeName         = j1_user_state.theme_name;
+        themeCss          = j1_user_state.theme_css;
+        themeExtensionCss = j1_user_state.theme_extension_css;
+      } else {
+        logger.warn('UserState cookie NOT found'); 
+      }
+
+      // Hide signin/signout button if cookies are DECLINED
+      // if ( app_detected && j1_user_state.cookies_accepted == 'declined') {
+      //   $('#quickLinksSignInOutButton').css('display', 'none');
+      // } 
+
       {% comment %} Deferred data load
       -------------------------------------------------------------------------- {% endcomment %}
       // Load banner and panel HTML data asychronously
       // See: https://stackoverflow.com/questions/3709597/wait-until-all-jquery-ajax-requests-are-done
       $.when( j1.initBanner(settings), j1.initPanel(settings), j1.initFooter( settings ) ).done (
         function(initBanner_response, initPanel_response) {
+          var logger = log4javascript.getLogger('j1.Template.adapter');
+
           state = 'running';
-          logger.info('state: ' + state);
+          logger.info('initBanner: state: ' + state);
+
+          j1_user_state.language = j1.getLanguage();
+          j1.setUserStateCookie( j1_user_state );
           // jadams, 2019-01-20: enabled only drawer, switch and ripples,
           // initialize BMD JS components
           j1.initMDB(settings);
           j1.initClipboard(settings);
           j1.displayPage(settings);
       });
-    }, // end init
+    }, // END init
 
     // -------------------------------------------------------------------------
     // AJAX loader to load and place all banner used for a page
     // -------------------------------------------------------------------------
     // ToDo:
     initBanner: function ( options ) {
-      var banner = [];
+
+      var logger        = log4javascript.getLogger('j1.Template.adapter');
+      var banner        = [];
       var bannerOptions = [];
-      logger = log4javascript.getLogger('j1.initBanner');
+
+      var logText = 'initBanner: Start initialization';
+      logger.info(logText);
 
       {% comment %} helper functions for (AJAX) data load
       -------------------------------------------------------------------------- {% endcomment %}
@@ -166,11 +215,11 @@ var j1 = function () {
       var cb_load_closure = function(panel_id) {
         return function ( responseTxt, statusTxt, xhr ) {
           if ( statusTxt ==  'success' ) {
-            logText = 'Banner on ID ' +panel_id+ ' loaded successfully';
+            logText = 'initBanner: Banner on ID ' +panel_id+ ' loaded successfully';
             logger.info(logText);
           }
           if ( statusTxt == 'error' ) {
-            logText = 'Panel on ID ' +panel_id+ ' loading failed. Error: ' + xhr.status + ': ' + xhr.statusText;
+            logText = 'initBanner: Banner on ID ' +panel_id+ ' loading failed. Error: ' + xhr.status + ': ' + xhr.statusText;
             logger.error(logText);
             // Set|Log status
             state = 'failed';
@@ -232,7 +281,7 @@ var j1 = function () {
       {% endfor %}
 
       if ( banner.length ) {
-        logText = 'banner are being loaded deferred (if any)';
+        logText = 'initBanner Banner are being loaded deferred (if any)';
         logger.info(logText);
       }
 
@@ -244,15 +293,18 @@ var j1 = function () {
           selector.load( banner_data_path, cb_load_closure( id ) );
         }
       }
-    }, // end initBanner
+    }, // END initBanner
 
     // -------------------------------------------------------------------------
     // AJAX loader for panel used with J1 Template fo all pages
     // -------------------------------------------------------------------------
     // ToDo:
     initPanel: function ( options ) {
-      var panel = [];
-      logger = log4javascript.getLogger('j1.initPanel'); // setup logger
+      var logger = log4javascript.getLogger('j1.Template.adapter');
+      var panel  = [];
+
+      var logText = 'initPanel: Start initialization';
+      logger.info(logText);
 
       // closure to pass additional data (e.g. div #id)
       // to AJAX load callback (panel_id)
@@ -260,11 +312,11 @@ var j1 = function () {
       var cb_load_closure = function(panel_id) {
         return function ( responseTxt, statusTxt, xhr ) {
           if ( statusTxt == 'success' ) {
-            logText = 'Panel on ID ' +panel_id+ ' loaded successfully';
+            logText = 'initPanel: Panel on ID ' +panel_id+ ' loaded successfully';
             logger.info(logText);
           }
           if ( statusTxt == 'error' ) {
-            logText = 'Panel on ID ' +panel_id+ ' loading failed. Error: ' + xhr.status + ': ' + xhr.statusText;
+            logText = 'initPanel: Panel on ID ' +panel_id+ ' loading failed. Error: ' + xhr.status + ': ' + xhr.statusText;
             logger.error(logText);
             // Set|Log status
             state = 'Error';
@@ -288,7 +340,7 @@ var j1 = function () {
       {% endfor %}
 
       if ( panel.length ) {
-        logText = 'Panel are being loaded deferred (if any)';
+        logText = 'initPanel: Panel are being loaded deferred (if any)';
         logger.info(logText);
       }
 
@@ -297,30 +349,33 @@ var j1 = function () {
         var selector = $(id);
         if ( selector.length ) {
           // Set the return URL (user by news pager) for the News Banner
-          // Cookies.set(cookieUserState, '{{page_url}}#news_panel', { expires: 3650 });
-          // j1_user_state.last_page = "{{page_url}}"
+          // Cookies.set(cookieUserState, '{{page_url}}#news_panel', { expires: 365 });
+          // j1_user_state.previous_page = "{{page_url}}"
           // j1.setUserStateCookie( j1_user_state );
           var panel_data_path = '{{panel_data_path}} ' + id + ' > *';
           selector.load( panel_data_path, cb_load_closure( id ) );
         }
       }
-    }, // end initPanel
+    }, // END initPanel
 
     // -------------------------------------------------------------------------
     // AJAX loader for page footer used with J1 Template fo all pages
     // -------------------------------------------------------------------------
     // ToDo:
     initFooter: function ( options ) {
-      logger = log4javascript.getLogger('j1.initFooter'); // setup logger
+      var logger  = log4javascript.getLogger('j1.Template.adapter');
+
+      var logText = 'initFooter: Start initialization';
+      logger.info(logText);
 
       var cb_load_closure = function(footer_id) {
         return function ( responseTxt, statusTxt, xhr ) {
           if ( statusTxt ==  'success' ) {
-            logText = 'Footer on ID ' +footer_id+ ' loaded successfully';
+            logText = 'initFooter: Footer on ID ' +footer_id+ ' loaded successfully';
             logger.info(logText);
           }
           if ( statusTxt == 'error' ) {
-            logText = 'Panel on ID ' +footer_id+ ' loading failed. Error: ' + xhr.status + ': ' + xhr.statusText;
+            logText = 'initFooter: Footer on ID ' +footer_id+ ' loading failed. Error: ' + xhr.status + ': ' + xhr.statusText;
             logger.error(logText);
             // Set|Log status
             state = 'failed';
@@ -335,20 +390,20 @@ var j1 = function () {
         var footer_data_path = '{{footer_data_path}}';
         selector.load( footer_data_path, cb_load_closure( id ) );
       }
-
-    }, // end initFooter
+    }, // END initFooter
 
     // -------------------------------------------------------------------------
     // Create copy-to-clipboard for all pages
     // -------------------------------------------------------------------------
     // ToDo:
     initClipboard: function ( options ) {
+      var logger  = log4javascript.getLogger('j1.Template.adapter');
 
-      /*
-         insert copy to clipboard button before all elements having a
-         class of ".highlight" assigned to (e.g. Asciidoc source blocks)
-      */
+      var logText = 'initClipboard: Start initialization';
+      logger.info(logText);
 
+      // insert copy to clipboard button before all elements having a
+      // class of ".highlight" assigned to (e.g. Asciidoc source blocks)
       $('.highlight').each(function () {
         // Check if no clipboard should be applied
         var isNoClip = $(this).closest('.noclip');
@@ -359,17 +414,17 @@ var j1 = function () {
           $('.btn-clipboard').tooltip();
         }
       });
-
       var clipboard = new Clipboard( '.btn-clipboard', {
         target: function target(trigger) {
           return trigger.parentNode.nextElementSibling;
         }
       });
 
+      // Manage clipboard events
       clipboard.on('success', function (e) {
         $(e.trigger).attr('title', 'Copied!').tooltip('_fixTitle').tooltip('show').attr('title', 'Copy to clipboard').tooltip('_fixTitle');
-        var logger = log4javascript.getLogger('j1.Clipboard');
-        var logText = 'Copy-To-Clipboard sucessfull';
+        var logger = log4javascript.getLogger('j1.Template.adapterrr');
+        var logText = 'initClipboard: Copy-To-Clipboard sucessfull';
         logger.info(logText);
         /* Cleanup clipped data for trailing numbers */
         var splitted = e.text.split('\n');
@@ -380,22 +435,25 @@ var j1 = function () {
         }
         e.clearSelection();
       });
-
       clipboard.on('error', function (e) {
         var fallbackMsg = /Mac/i.test(navigator.userAgent) ? 'Press \u2318 to copy' : 'Press Ctrl-C to copy';
-        logger = log4javascript.getLogger('j1.Clipboard');
-        logText = 'Copy-To-Clipboard failed. Use fallback.';
+        logger = log4javascript.getLogger('j1.Template.adapterrr');
+        logText = 'initClipboard: Copy-To-Clipboard failed. Use fallback.';
         logger.warn(logText);
         $(e.trigger).attr('title', fallbackMsg).tooltip('_fixTitle').tooltip('show').attr('title', 'Copy to clipboard').tooltip('_fixTitle');
       });
-
-    }, // end initClipboard
+      return;
+    }, // END initClipboard
 
     // -------------------------------------------------------------------------
     // Show the page after timeout of {{hideOnReload}}
     // -------------------------------------------------------------------------
     displayPage: function ( options ) {
-      logger = log4javascript.getLogger('j1.Template');
+      var logger  = log4javascript.getLogger('j1.Template.adapter');
+
+      var logText = 'Start initialization';
+      logger.info(logText);
+
       // Display the page if the (text) header is signaled as 'initialized' AND the menubar is signaled as 'finished'
       var headerLoaded = setInterval(function() {
         if ( j1.MastHead.state() === 'initialized' && j1.Navigator.state() === 'finished' ) {
@@ -404,7 +462,7 @@ var j1 = function () {
             $('#no_flicker').css('display', 'block'); // display current page
             j1.scrollTo(); // scroll to an anchor element this page (if any)
 
-            // Set|Detect J1 App status
+            // Detect|Set J1 App status
             app_detected = j1.existsCookie ( 'j1.web.session' );
             if ( app_detected ) {
               var document_title = document.title;
@@ -413,62 +471,71 @@ var j1 = function () {
                       for development mode
               */
               /* document.title = document_title + ' (App)'; */
-              logger.info('Site detected in state: app');
-              logger.info('Read cookie: WebSession');
+              logger.info('displayPage: Site detected in state: app');
+              logger.info('displayPage: Read cookie: WebSession');
               var j1_web_session = j1.getWebSessionCookie();
-              logger.info('Read cookie: UserState');
+              logger.info('displayPage: Read cookie: UserState');
               j1_user_state = j1.getUserStateCookie();
-              logger.info( 'WebSessionCookie written by: ' + j1_web_session.writer );
+              logger.info( 'displayPage: WebSessionCookie written by: ' + j1_web_session.writer );
               j1_user_state.authenticated   = j1_web_session.authenticated;
-              j1_user_state.last_page       = j1_user_state.current_page;
+              j1_user_state.previous_page   = j1_user_state.current_page;
               j1_user_state.current_page    = window.location.pathname;
               j1_user_state.provider        = j1_web_session.provider;
               j1_user_state.user_name       = j1_web_session.user_name;
               j1_user_state.user_id         = j1_web_session.user_id;
-              logger.info('Write cookie: UserState');
+              logger.info('displayPage: Write cookie: UserState');
               j1.setUserStateCookie( j1_user_state );
               j1_web_session.requested_page = window.location.pathname;
-              logger.info('Write cookie: WebSession');
+              logger.info('displayPage:Write cookie: WebSession');
               j1.setWebSessionCookie( j1_web_session );
-              logger.info( 'Last page:    ' + j1_user_state.last_page );
-              logger.info( 'Current page: ' + j1_user_state.current_page );
+              logger.info( 'displayPage: Last page:    ' + j1_user_state.previous_page );
+              logger.info( 'displayPage: Current page: ' + j1_user_state.current_page );
             } else {
-              logger.info('Site detected in state: web');
+              logger.info('displayPage: Site detected in state: web');
               var user_state_detected = j1.existsCookie ( 'j1.user.state' );
               if ( user_state_detected ) {
-                logger.info('Read cookie: UserState');
+                logger.info('displayPage: Read cookie: UserState');
                 j1_user_state = j1.getUserStateCookie();
-                logger.info('Write cookie: UserState');
+                logger.info('displayPage: Write cookie: UserState');
               } else {
-                logger.warn('Read cookie: UserState not found');
-                logger.info('Create and update user state');
-                logger.info('Write cookie: UserState');
+                logger.warn('displayPage: Read cookie: UserState not found');
+                logger.info('displayPage: Create and update user state');
+                logger.info('displayPage: Write cookie: UserState');
               }
-              j1_user_state.last_page       = j1_user_state.current_page;
+              j1_user_state.previous_page   = j1_user_state.current_page;
               j1_user_state.current_page    = window.location.pathname;
               j1.setUserStateCookie( j1_user_state );
             }
             // Set|Log status
             state = 'finished';
             logger.info('state: ' + state);
-            logText = "J1 Template successfully initialized";
+            logText = "displayPage: J1 Template successfully initialized";
             logger.info(logText);
           }, {{flickerTimeout}} );
           // clear interval checking
           clearInterval(headerLoaded);
         }
-      }, 50); // end setInterval
-
-    }, // end displayPage
+      }, 50); // END setInterval
+      return;
+    }, // END displayPage
 
     // -------------------------------------------------------------------------
     // Initialize BS Material Design
     // -------------------------------------------------------------------------
     // ToDo:
     initMDB: function ( options ) {
+
+      var logger  = log4javascript.getLogger('j1.Template.adapter');
+      var logText = 'initMDB: Start initMDB';
+      logger.info(logText);
+
       $('body').bootstrapMaterialDesign();
       //new WOW().init();
-    }, // end initMDB
+
+      var logText = 'initMDB Finished initMDB';
+      logger.info(logText);
+
+    }, // END initMDB
 
     // -------------------------------------------------------------------------
     // Helper functions
@@ -487,7 +554,7 @@ var j1 = function () {
         }
       }
       return o;
-    },  // end mergeData
+    },  // END mergeData
 
     // -------------------------------------------------------------------------
     //  returns the current (processing) state of the module
@@ -524,7 +591,7 @@ var j1 = function () {
           end = dc.indexOf(";", begin);
         }
         return decodeURI(dc.substring(begin + prefix.length, end) ).replace(/"/g, '');
-    }, // end getCookie
+    }, // END getCookie
 
     // -------------------------------------------------------------------------
     //  Returns the current user state collected from /status endpoint
@@ -548,9 +615,9 @@ var j1 = function () {
             }
           });
         } else {
-          return { authenticated : false }
+          return { authenticated : false };
         }
-    }, // end getUserState
+    }, // END getUserState
 
     // -------------------------------------------------------------------------
     //  Returns the content of J1 user state cookie (j1.user.state) as
@@ -565,9 +632,9 @@ var j1 = function () {
         user_state      = JSON.parse(user_state_json);
         return user_state;
       } else {
-        return null
+        return null;
       }
-    }, // end getUserStateCookie
+    }, // END getUserStateCookie
 
     // -------------------------------------------------------------------------
     //  Set|Update the content of J1 user state cookie (j1.user.state) if
@@ -580,17 +647,19 @@ var j1 = function () {
         var state_from_cookie_json  = window.atob(Cookies.get('j1.user.state'));
         var state_from_cookie       = JSON.parse(state_from_cookie_json);
         var user_state              = j1.mergeData( state_from_cookie, state );
+        state.writer                = 'web';
         var user_state_json         = JSON.stringify( user_state );
         var user_state_encoded      = window.btoa(user_state_json);
-        Cookies.set( 'j1.user.state', user_state_encoded, { expires: 3650 } );
+        Cookies.set( 'j1.user.state', user_state_encoded, { expires: 365 } );
       } else {
         // create|initialize cookie
         var user_state              = j1.mergeData( j1_user_state, state );
         var user_state_json         = JSON.stringify(user_state);
         var user_state_encoded      = window.btoa(user_state_json);
-        Cookies.set( 'j1.user.state', user_state_encoded, { expires: 3650 } );
+        Cookies.set( 'j1.user.state', user_state_encoded, { expires: 365 } );
       }
-    }, // end setUserStateCookie
+      return;
+    }, // END setUserStateCookie
 
     // -------------------------------------------------------------------------
     //  Returns the content of J1 web session cookie (j1.web.session) as
@@ -604,9 +673,9 @@ var j1 = function () {
         session_data = JSON.parse(session_json);
         return session_data;
       } else {
-        return null
+        return null;
       }
-    }, // end getWebSessionCookie
+    }, // END getWebSessionCookie
 
     // -------------------------------------------------------------------------
     //  Set the content of J1 session cookie (j1.user.state). If successful,
@@ -619,11 +688,11 @@ var j1 = function () {
         var session_json = JSON.stringify(session_data);
         var session_encoded = window.btoa(session_json);
         Cookies.set('j1.web.session', session_encoded );
-        return true
+        return true;
       } else {
-        return false
+        return false;
       }
-    }, // end setWebSessionCookie
+    }, // END setWebSessionCookie
 
     // -------------------------------------------------------------------------
     //  returns true if a given cookie exists
@@ -632,12 +701,30 @@ var j1 = function () {
       var myCookie = j1.getCookie( name );
 
       if (myCookie == null) {
-        return false
+        return false;
       }
       else {
-        return true
+        return true;
       }
-    }, // end existsCookie
+    }, // END existsCookie
+
+    // -------------------------------------------------------------------------
+    //  returns the preferred language taken form window.navigator
+    //  See:
+    //  https://stackoverflow.com/questions/1043339/javascript-for-detecting-browser-language-preference
+    // -------------------------------------------------------------------------
+    getLanguage: function () {
+      //var language = window.navigator.userLanguage || window.navigator.language;
+      var language = navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage);
+      return language;
+    }, // END getLanguage
+
+    // -------------------------------------------------------------------------
+    //  returns the template version taken from site config ( _config.yml)
+    // -------------------------------------------------------------------------
+    getTemplateVersion: function () {
+      return '{{template_version}}';
+    }, // END getTemplateVersion
 
     // -------------------------------------------------------------------------
     // Scrolls smooth to any anchor referenced by an page URL
@@ -646,8 +733,8 @@ var j1 = function () {
     scrollTo: function () {
       // Unclear why a correction is needed sometimes. Disable for now.
       //var offset_correction = 75;
-      var offset_correction = 0;
-      var offset            = {{toccer_config.defaults.smoothScrollOffset}} + offset_correction;
+      var offset_correction = 25;
+      var offset            = {{toccer_config.defaults.smoothScrollOffset}};
       var anchor_id         = window.location.href.split("#")[1];
 
       if (anchor_id) {
@@ -656,7 +743,7 @@ var j1 = function () {
         // scroll only, if an anchor is given with URL
         if (selector.length) {
           var delay     = {{toccer_config.defaults.smoothScrollDuration}};
-          var scroll_to = selector.offset().top - offset;
+          var scroll_to = parseInt( selector.offset().top - offset - offset_correction );
           //var scroll_to = selector.offset().top;
           $('html,body').animate({scrollTop: scroll_to}, delay,
             function () {
@@ -666,7 +753,7 @@ var j1 = function () {
               $(window).scrollTop($(window).scrollTop()-1);
           });
         } else {
-          // TODO: to be checked if this elese is needed
+          // TODO: to be checked if this else is needed
           // scroll the page one pixel back and forth
           // to get the right position for the NAV Module (Tocbot)
           $(window).scrollTop($(window).scrollTop()+1);
@@ -677,10 +764,258 @@ var j1 = function () {
         // to get the right position for the NAV Module (Tocbot)
         $(window).scrollTop($(window).scrollTop()+1);
         $(window).scrollTop($(window).scrollTop()-1);
-      } // selector.length// end if anchor_id
-    } // end scrollTo
+      } // END if anchor_id
+      return;
+    }, // END scrollTo
+
+    // -------------------------------------------------------------------------
+    // Replace MACROs
+    //
+    // See: 
+    //  https://stackoverflow.com/questions/5376431/wildcards-in-jquery-selectors
+    //  https://stackoverflow.com/questions/16400072/jquery-each-only-affects-last-element
+    //  https://dzone.com/articles/why-does-javascript-loop-only-use-last-value
+    //  https://stackoverflow.com/questions/179713/how-to-change-the-href-for-a-hyperlink-using-jquery
+    // -------------------------------------------------------------------------
+    resolveMacros: function ( data ) {
+      var logger;
+      var logText;
+      var user_state   = data;
+      var app_detected = j1.existsCookie ( 'j1.web.session' );
+
+      // Set default settings
+      user_state.user_info_url        = '{{site.data.j1_config.user_info_url}}'
+      user_state.theme_author_url     = '{{site.data.j1_config.theme_author_url}}'
+      user_state.theme_version        = j1.getTemplateVersion();
+      // user_state.provider_permissions = user_state.provider_permissions;
+
+      // Resolve all macros
+      $('[id^=macro-]').each(function() {
+
+        $('#macro-provider-name').each(function() {
+          var $this = $(this);
+          var $html = $this.html();
+          $this.html($html.replace('??provider-name', user_state.provider));
+          // jadams, 2019-04-15: unclear why 'href' by base URL
+          this.href = this.href.replace(/.*\/??provider-url/, user_state.provider_url);
+        });
+        $('#macro-user-name').each(function() {
+          var $this = $(this);
+          var $html = $this.html();
+          $this.html($html.replace('??user-name', user_state.user_name));
+          this.href = this.href.replace(/.*\/??user-info-url/, user_state.user_info_url);
+        });
+        // Replace sidebar|State (currently disabled)
+        // $('#macro-user-state').each(function() {
+        //   var $this = $(this);
+        //   var $html = $this.html();
+        //   $this.html($html.replace('??user-state', user_state.status));
+        //   this.href = this.href.replace(/.*\/??user-info-url/, user_state.user_info_url);
+        // });
+        $('#macro-provider-permissions').each(function() {
+          var $this = $(this);
+          var $html = $this.html();                    
+          $this.html($html.replace('??provider-permissions', user_state.provider_permissions));
+          //jadams, 2019-04-16: Workaround for already set permissins ("all")
+          //$this.html($html.replace(/all|public|protected|private/, user_state.provider_permissions));
+          this.href = this.href.replace(/.*\/??user-info-url/, user_state.user_info_url);
+        });
+        $('#macro-provider-membership').each(function() {
+          var $this = $(this);
+          var $html = $this.html();
+          $this.html($html.replace('??provider-membership', user_state.provider_membership));
+          this.href = this.href.replace(/.*\/??user-info-url/, user_state.user_info_url);
+        });
+        $('#macro-cookie-state').each(function() {
+          var $this = $(this);
+          var $html = $this.html();
+          $this.html($html.replace('??cookie-state', user_state.cookies_accepted));
+          this.href = this.href.replace(/.*\/??user-info-url/, user_state.user_info_url);
+        });
+        $('#macro-theme-name').each(function() {
+          var $this = $(this);
+          var $html = $this.html();
+          $this.html($html.replace('??theme-name', user_state.theme_name));
+        });
+        $('#macro-theme-author').each(function() {
+          var $this = $(this);
+          var $html = $this.html();
+          $this.html($html.replace('??theme-author', user_state.theme_author));
+          this.href = this.href.replace(/.*\/??theme-author-url/, user_state.theme_author_url);
+        });
+        $('#macro-theme-version').each(function() {
+          var $this = $(this);
+          var $html = $this.html();
+          $this.html($html.replace('??theme-version', user_state.theme_version));
+        });
+
+      }); // END Replace macros
+      return;
+    }, // END resolveMacros
+
+    // -------------------------------------------------------------------------
+    // Update MACROs
+    //
+    // Note:
+    // To manage chaching situations with severals browsers (e.g. Chrome),
+    // some of the "values" set ealier by j1.resolveMacros needs to be
+    // updated
+    // -------------------------------------------------------------------------
+    updateMacros: function ( data ) {
+      var user_state = data;
+      var logger;
+      var logText;
+
+      // Replace Macros
+      $('[id^=macro-]').each(function() {
+        //  Update sidebar|Cookies
+        $('#macro-cookie-state').each(function() {
+          var $this = $(this);
+          var $html = $this.html();
+          $this.html($html.replace(/accepted|declined|pending/, user_state.cookies_accepted));
+        });
+        // Update sidebar|State (currently disabled)
+        // $('#macro-user-state').each(function() {
+        //   var $this = $(this);
+        //   var $html = $this.html();
+        //   $this.html($html.replace(/active|blocked|pending/, user_state.status));
+        // });
+        $('#macro-provider-permissions').each(function() {
+          var $this = $(this);
+          var $html = $this.html();                    
+          //$this.html($html.replace(/all|public|protected|private/g, user_state.provider_permissions));
+          //$this.html($html.replace(/.*/, 'Permissions: ' + user_state.provider_permissions));
+          $this.html($html.replace(/public.*|protected.*|private.*/, user_state.provider_permissions));
+        });
+        $('#macro-provider-membership').each(function() {
+          var $this = $(this);
+          var $html = $this.html();
+          $this.html($html.replace(/guest|member/, user_state.provider_membership));
+        });
+      });
+      return;
+    }, // END updateMacros
+
+    // -------------------------------------------------------------------------
+    // Detect if a page has changed
+    //
+    // Note:
+    // Returns true on a change. Otherwise false
+    // some of the "values" set ealier by j1.resolveMacros needs to be
+    // updated
+    // -------------------------------------------------------------------------
+    hasPageChanged: function ( data ) {
+      var user_state = data;
+      var logger;
+      var logText;
+
+      if (user_state.previous_page == user_state.current_page ) {
+        return false;
+      } else {
+        return true;
+      }      
+    }, // END j1.hasPageChanged
+
+    // -------------------------------------------------------------------------
+    // updateCookies:
+    //
+    // -------------------------------------------------------------------------
+    updateCookies: function ( data ) {
+      var user_state        = data;
+      var appDetected       = j1.Navigator.appDetected();
+      var authClientEnabled = j1.Navigator.authClientEnabled();
+      var userAuthenticated;
+      var web_session_state;
+      var json_data;
+      var logger;
+      var logText;
+
+      logger = log4javascript.getLogger('j1.updateCookies');
+
+      // Update cookies
+      if ( appDetected ) {
+        web_session_state = j1.getWebSessionCookie();
+        userAuthenticated = web_session_state.authenticated === 'true' ? true : false;
+
+        // Overload middleware settings
+        // if ( authClientEnabled && web_session_state.authenticated === 'false' ) {
+        //   web_session_state.provider_permissions = user_state.provider_permissions;
+        //   web_session_state.provider_membership  = user_state.provider_membership;
+        // }
+        // if ( authClientEnabled && web_session_state.authenticated === 'true' ) {
+        //   user_state.provider_permissions = web_session_state.provider_permissions;
+        //   user_state.provider_membership  = web_session_state.provider_membership;
+        // }  
+
+        if ( authClientEnabled ) {
+
+          user_state.authenticated = userAuthenticated;
+
+          if ( userAuthenticated ) { 
+            user_state.provider             = web_session_state.provider;
+            user_state.user_name            = web_session_state.user_name;
+            user_state.provider_membership  = web_session_state.provider_membership;
+            user_state.provider_permissions = web_session_state.provider_permissions;
+          } else {
+            // Set default credentials if soignet out
+            user_state.provider             = 'j1'
+            user_state.user_name            = 'vistor';
+            user_state.status               = 'active';
+            user_state.provider_membership  = 'guest';
+            user_state.provider_permissions = 'public'
+          }
+        }
+
+        web_session_state.writer           = 'web';
+        web_session_state.requested_page   = window.location.pathname;
+        web_session_state.cookies_accepted = user_state.cookies_accepted; 
+        j1.setWebSessionCookie( web_session_state );
+      }
+
+      j1.setUserStateCookie( user_state );
+
+      json_data = JSON.stringify( user_state, undefined, 2); // JSON pretty print
+      logText = 'User State data: ' + json_data;
+      logger.info(logText);
+      
+      json_data = JSON.stringify( web_session_state, null, 2 ); // JSON pretty print
+      logText = 'Web Session data: ' + json_data;
+      logger.info(logText);
+
+      return;
+     
+    }, // END j1.updateCookies
+
+    // -------------------------------------------------------------------------
+    // updateSidebar
+    //
+    // Note:
+    // -------------------------------------------------------------------------
+    updateSidebar: function ( data ) {
+      var user_state = data;
+      var json_data;
+      var logger;
+      var logText;
+
+      logger = log4javascript.getLogger('j1.updateSidebar');
+
+        var pageLoaded = setInterval(function() {
+          if ( j1.state() === 'finished' ) {
+          //if ( j1.cookieConsent.state() === 'finished' ) {
+            // Replace Macro placeholders to values
+            j1.resolveMacros( user_state );
+            // Replace Macro values only
+            j1.updateMacros( user_state );
+
+            // clear interval checking
+            clearInterval(pageLoaded);
+          } // END Replace Macro placeholders
+        }, 50); // END setInterval
+
+      return;
+    } // END updateSidebar
 
-  } // end j1 (return)
+  } // END j1 (return)
 }();
 
 {% endcapture %}