j1-template 2021.3.2 → 2022.0.3

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

@@ -294,21 +294,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
 
               $this.on('click', function(e){
                 const button_{{menu_id}} = this;
-
-                // TODO: Animated toggle button
-                //
-                // $('{{item.menu.content.toggler}}').toggleClass('fadeIn');
-                // $('{{item.menu.content.toggler}}').toggleClass('rotateIn')
-
-                // $('.mdi', this).toggleClass('mdi-menu');
-                // $('.mdi', this).toggleClass('mdi-close');
-
                 e.preventDefault();
-
-                // (toggler_{{menu_id}}.t = !toggler_{{menu_id}}.t)
-                //   ? drawer_{{menu_id}}.open()
-                //   : drawer_{{menu_id}}.close();
-
                 drawer_{{menu_id}}.open();
               });
             });
@@ -361,14 +347,30 @@ j1.adapter['mmenu'] = (function (j1, window) {
               });
 
               const drawer_{{menu_id}} = mmenu_{{menu_id}}.offcanvas ({
-                // drawer options
                 position: '{{item.menu.drawer.position}}'
               });
 
+              // set an id on the drawer wrapper div for later use
+              //
+              drawer_{{menu_id}}.wrapper.id = 'drawer_{{menu_id}}';
+
+              // monitor for state changes on the drawer
+              //
+              $('#drawer_{{menu_id}}').attrchange({
+                trackValues: true,
+                callback: function (event) {
+                  logger.debug('\n' + 'drawer changed state: ' + event.newValue);
+                  logger.debug('\n' + 'hide|show the main nav menu');
+                  // switch off|on the (main) nav menu
+                  $('#' + navMenuOptions.nav_main_menu).toggle();
+                  $('#' + navMenuOptions.nav_quicklinks).toggle();                  
+                }
+              });
+
               // button for the MMenu tocbar to open|close the toc drawer
+              //
               $('{{item.menu.content.button}}').each(function(e) {
                 var $this = $(this);
-
                 $this.on('click', function(e) {
                   var button_{{menu_id}} = this;
                   var hasClass;
@@ -382,15 +384,7 @@ j1.adapter['mmenu'] = (function (j1, window) {
                     hasClass = true;
                   }
                   if (hasClass) {
-                    // Toggle button animation
-                    //$('{{item.menu.content.toggler}}').toggleClass('{{item.menu.content.toggler_animation}}')
-
                     e.preventDefault();
-
-                    // (toggler_{{menu_id}}.t = !toggler_{{menu_id}}.t)
-                    //   ? drawer_{{menu_id}}.open()
-                    //   : drawer_{{menu_id}}.close();
-
                     drawer_{{menu_id}}.open();
                   } // END if hasclass
                 });

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

@@ -499,11 +499,11 @@ j1.adapter['navigator'] = (function (j1, window) {
         // See: https://stackoverflow.com/questions/13524107/how-to-set-data-attributes-in-html-elements
         if (user_session.authenticated === 'true') {
           // Set SignOut
-          $('#navLinkSignInOut').attr('data-target', '#modalOmniSignOut');
+          $('#navLinkSignInOut').attr('data-bs-target', '#modalOmniSignOut');
           $('#iconSignInOut').removeClass('mdi-login').addClass('mdi-logout');
         } else {
           // Set SignIn
-          $('#navLinkSignInOut').attr('data-target', '#modalOmniSignIn');
+          $('#navLinkSignInOut').attr('data-bs-target', '#modalOmniSignIn');
           $('#iconSignInOut').removeClass('mdi-logout').addClass('mdi-login');
         }
       }
@@ -737,8 +737,10 @@ j1.adapter['navigator'] = (function (j1, window) {
       $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator ul.nav > li > a:hover { color: ' +navMenuOptions.menu_item_color_hover+ ' !important; } }</style>');
 
       // Dropdown menu styles
+      // jadams, 2021-11-19: changed color to fixed value of '#616161'
       // jadams, 2017-11-30: removed left padding from dropdown mwenu (for new j1nav style based on Navigator|Slate)
-      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: ' +navMenuOptions.dropdown_animate_duration+ 's !important; color: ' +bg_scrolled+ ' !important; min-width: ' +navMenuOptions.dropdown_item_min_width+ 'rem !important; border-top: solid ' +navMenuOptions.dropdown_border_top+ 'px !important; border-radius: ' +navMenuOptions.dropdown_border_radius+ 'px !important; left: 0; } }</style>');
+      // $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: ' +navMenuOptions.dropdown_animate_duration+ 's !important; color: ' +bg_scrolled+ ' !important; min-width: ' +navMenuOptions.dropdown_item_min_width+ 'rem !important; border-top: solid ' +navMenuOptions.dropdown_border_top+ 'px !important; border-radius: ' +navMenuOptions.dropdown_border_radius+ 'px !important; left: 0; } }</style>');
+      $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: ' +navMenuOptions.dropdown_animate_duration+ 's !important; color: #616161 !important; min-width: ' +navMenuOptions.dropdown_item_min_width+ 'rem !important; border-top: solid ' +navMenuOptions.dropdown_border_top+ 'px !important; border-radius: ' +navMenuOptions.dropdown_border_radius+ 'px !important; left: 0; } }</style>');
 
       {% if dropdown_style == 'raised' %}
       $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu { box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important; } }</style>');
@@ -804,7 +806,7 @@ j1.adapter['navigator'] = (function (j1, window) {
       // $('#navigator_nav_menu')
       //   .find('li.dropdown.nav-item')
 
-      $('[data-toggle]').closest('li')
+      $('[data-bs-toggle]').closest('li')
       .on('mouseenter', function (inEvent) {
         if (theElement) theElement.removeClass('open');
         window.clearTimeout(theTimer);

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

@@ -118,14 +118,12 @@ j1.adapter['themer'] = (function (j1, window) {
   var logText;
   var cookie_written;
 
-  var cssExtension              = (environment === 'production')
-                                  ? '.min.css'
-                                  : '.css';
+  var cssExtension              = (environment === 'production') ? '.min.css' : '.css';
 
   var default_theme_name        = '{{default_theme.name}}';
   var default_theme_author      = '{{default_theme.author}}';
   var default_theme_author_url  = '{{default_theme.author_url}}';
-  var default_theme_css_name    = default_theme_name.toLowerCase().replace(' ', '-');
+  var default_theme_css_name    = default_theme_name.toLowerCase();
   var default_theme_css         = '{{asset_path}}/{{theme_base}}/' + default_theme_css_name + '/bootstrap' + cssExtension;
 
   var interval_count            = 0;
@@ -201,6 +199,17 @@ j1.adapter['themer'] = (function (j1, window) {
              user_state.theme_css        = default_theme_css;
              user_state.theme_author     = default_theme_author;
              user_state.theme_author_url = default_theme_author_url;
+
+             cookie_written = j1.writeCookie({
+               name:     cookie_names.user_state,
+               data:     user_state,
+               samesite: 'Strict',
+               secure:   secure,
+               expires:  365
+             });
+             if (!cookie_written) {
+                 logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+             }
            }
 
            styleLoaded     = styleSheetLoaded(user_state.theme_css);

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

@@ -188,7 +188,7 @@ j1.adapter['toccer'] = (function () {
     // Set Toccer options
     // -------------------------------------------------------------------------
     initToccerCore: function (options) {
-      var scrollOffset;
+      var scrollOffset = j1.getScrollOffset();
 
       if (options  !== undefined) {
         var settings = $.extend({}, options);
@@ -196,28 +196,6 @@ j1.adapter['toccer'] = (function () {
         var settings = false;
       }
 
-      // calculate offset for correct (smooth) scroll position
-      //
-      var $pagehead       = $('.attic');
-      var $navbar         = $('nav.navbar');
-      var $adblock        = $('#adblock');
-
-      var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
-      var fontSize        = $('body').css('font-size').replace('px','');
-      var start           = window.pageYOffset;
-
-      var l               = parseInt(fontSize);
-
-      var h               = $pagehead.length ? $pagehead.height() : 0;
-      var n               = $navbar.length ? $navbar.height() : 0;
-      var a               = $adblock.length ? $adblock.height() : 0;
-
-      scrollOffset        = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
-
-      // static offset, to be checked why this is needed
-      //
-      scrollOffset        = scrollOffset + moduleOptions.scrollSmoothOffset
-
       _this.setState('running');
       logger.info('\n' + 'state: ' + _this.getState());
 
@@ -261,59 +239,42 @@ j1.adapter['toccer'] = (function () {
         } // END AJAX load finished
       }, 25); // END dependencies_met_ajax_load_finished
 
-      $(window).on('resize', function() {
-        var scrollOffset;
-        // re-calculate offset for correct (smooth) scroll position
-        //
-        var $pagehead       = $('.attic');
-        var $navbar         = $('nav.navbar');
-        var $adblock        = $('#adblock');
-
-        var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
-        var fontSize        = $('body').css('font-size').replace('px','');
-        var start           = window.pageYOffset;
-
-        var l               = parseInt(fontSize);
-
-        var h               = $pagehead.length ? $pagehead.height() : 0;
-        var n               = $navbar.length ? $navbar.height() : 0;
-        var a               = $adblock.length ? $adblock.height() : 0;
-
-        scrollOffset        = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
-
-        // static offset, to be checked why this is needed
-        scrollOffset        = scrollOffset + moduleOptions.scrollSmoothOffset
-
-        tocbot.refresh({
-          log:                    moduleOptions.log,
-          activeLinkColor:        moduleOptions.activeLinkColor,
-          tocSelector:            moduleOptions.tocSelector,
-          headingSelector:        moduleOptions.headingSelector,
-          ignoreSelector:         moduleOptions.ignoreSelector,
-          contentSelector:        moduleOptions.contentSelector,
-          collapseDepth:          moduleOptions.collapseDepth,
-          throttleTimeout:        moduleOptions.throttleTimeout,
-          hasInnerContainers:     false,
-          includeHtml:            false,
-          linkClass:              'toc-link',
-          extraLinkClasses:       '',
-          activeLinkClass:        'is-active-link',
-          listClass:              'toc-list',
-          extraListClasses:       '',
-          isCollapsedClass:       'is-collapsed',
-          collapsibleClass:       'is-collapsible',
-          listItemClass:          'toc-list-item',
-          positionFixedSelector:  '',
-          positionFixedClass:     'is-position-fixed',
-          fixedSidebarOffset:     'auto',
-          scrollContainer:        null,
-          scrollSmooth:           moduleOptions.scrollSmooth,
-          scrollSmoothDuration:   moduleOptions.scrollSmoothDuration,
-          scrollSmoothOffset:     scrollOffset,
-          headingsOffset:         1,
-          throttleTimeout:        moduleOptions.throttleTimeout
-        });
-      });
+      // jadams, 2021-11-19: is this really neded?
+      //
+      // $(window).on('resize', function() {
+      //   var scrollOffset = j1.getScrollOffset();
+      //
+      //   tocbot.refresh({
+      //     log:                    moduleOptions.log,
+      //     activeLinkColor:        moduleOptions.activeLinkColor,
+      //     tocSelector:            moduleOptions.tocSelector,
+      //     headingSelector:        moduleOptions.headingSelector,
+      //     ignoreSelector:         moduleOptions.ignoreSelector,
+      //     contentSelector:        moduleOptions.contentSelector,
+      //     collapseDepth:          moduleOptions.collapseDepth,
+      //     throttleTimeout:        moduleOptions.throttleTimeout,
+      //     hasInnerContainers:     false,
+      //     includeHtml:            false,
+      //     linkClass:              'toc-link',
+      //     extraLinkClasses:       '',
+      //     activeLinkClass:        'is-active-link',
+      //     listClass:              'toc-list',
+      //     extraListClasses:       '',
+      //     isCollapsedClass:       'is-collapsed',
+      //     collapsibleClass:       'is-collapsible',
+      //     listItemClass:          'toc-list-item',
+      //     positionFixedSelector:  '',
+      //     positionFixedClass:     'is-position-fixed',
+      //     fixedSidebarOffset:     'auto',
+      //     scrollContainer:        null,
+      //     scrollSmooth:           moduleOptions.scrollSmooth,
+      //     scrollSmoothDuration:   moduleOptions.scrollSmoothDuration,
+      //     scrollSmoothOffset:     scrollOffset,
+      //     headingsOffset:         1,
+      //     throttleTimeout:        moduleOptions.throttleTimeout
+      //   });
+      // });
+
     }, // END initToccerCore
 
     // -------------------------------------------------------------------------

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

@@ -98,7 +98,6 @@ j1.adapter['translator'] = (function (j1, window) {
   var secure;
   var logText;
   var cookie_written;
-  var modal_language;
   var navigator_language;
   var translation_language;
   var ddSourceLanguage;
@@ -171,7 +170,6 @@ j1.adapter['translator'] = (function (j1, window) {
       domain                = hostname.substring(hostname.lastIndexOf('.', hostname.lastIndexOf('.') - 1) + 1);
       cookie_domain         = (domain.includes('.')) ? '.' + domain : domain;
       secure                = (url.protocol.includes('https')) ? true : false;
-      modal_language        = "{{site.language}}";
       navigator_language    = navigator.language || navigator.userLanguage;     // userLanguage for MS IE compatibility
       translation_language  = navigator_language.split('-')[0];
       cookie_names          = j1.getCookieNames();
@@ -270,6 +268,10 @@ j1.adapter['translator'] = (function (j1, window) {
             expires:  365
           });
 
+          if (moduleOptions.dialogLanguage === 'auto') {
+            moduleOptions.dialogLanguage = '{{contentLanguage}}';
+          }
+
           j1.translator = new Translator({
             contentURL:               moduleOptions.contentURL,                 // dialog content (modals) for all supported languages
             cookieName:               moduleOptions.cookieName,                 // the name of the User State Cookie (primary data)
@@ -302,9 +304,15 @@ j1.adapter['translator'] = (function (j1, window) {
             }
           }
 
+          $('#quickLinksTranslateButton').click(function(e) {
+            logger.info('\n' + 'call default action');
+            j1.translator.showDialog();
+          });
+
           _this.setState('finished');
           logger.info('\n' + 'state: ' + _this.getState());
           logger.debug('\n' + 'module initialized successfully');
+
           clearInterval(dependencies_met_page_ready);
         }
       });

data/assets/themes/j1/core/country-flags/css/theme/uno.min.css

@@ -0,0 +1,15 @@
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/core/country-flags/css/theme/uno.min.css
+ # Provides styles for the CSS Flags Previewer
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2021 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+*/
+.country{padding:4px;line-height:1.4;background-color:#fff;border:1px solid #ddd;border-radius:0;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto;margin-bottom:24px;width:100%}.country .name{font-size:1.2em}.country .capital,.country .name{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:normal}.country .capital{font-size:.9em;border-bottom:1px solid #ddd;margin-bottom:4px}.country .country-code{font-size:.7em;color:#999}.country .flag{display:block;max-width:100%;height:auto;border-radius:4px}.country:hover{background-color:#eee}.nav-continents{margin-bottom:24px}.country-list .flag{display:block;max-width:100%;height:auto;max-width:32px;border-radius:2px}