j1-template 2023.3.0 → 2023.3.2

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

@@ -52,18 +52,21 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign themer_options    = themer_defaults| merge: themer_settings %}
 {% assign footer_options    = footer_defaults | merge: footer_settings %}
+{% assign footer            = 'active_footer' %}
 {% assign footer_id         = footer_options.active_footer %}
 {% assign default_theme     = template_config.theme %}
 {% assign theme_base        = "core/css/themes" %}
 
+
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
+
 {% if environment == "development" or environment == "test" %}
   {% assign theme_ext       = "css" %}
 {% else %}
   {% assign theme_ext       = "min.css" %}
 {% endif %}
 
-{% comment %} Detect prod mode
--------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
@@ -108,6 +111,7 @@ j1.adapter.themer = (function (j1, window) {
   // globals
   // ---------------------------------------------------------------------------
   var environment               = '{{environment}}';
+  var development               = (environment.includes('dev') ? true : false);
   var url                       = new liteURL(window.location.href);
   var secure                    = (url.protocol.includes('https')) ? true : false;
   var user_state                = {};
@@ -116,7 +120,7 @@ j1.adapter.themer = (function (j1, window) {
   var user_state_detected       = false;
   var styleLoaded               = false;
   var id                        = 'default';
-  var cssExtension              = (environment === 'production') ? '.min.css' : '.css';
+  var cssExtension              = (development) ? '.css' : '.min.css';
   var default_theme_name        = '{{default_theme.name}}';
   var default_theme_author      = '{{default_theme.author}}';
   var default_theme_author_url  = '{{default_theme.author_url}}';
@@ -204,11 +208,13 @@ j1.adapter.themer = (function (j1, window) {
       baseUrl     = url.origin;
       error_page  = url.origin + '/204.html';
       j1Cookies   = j1.findCookie('j1');
-      gaCookies   = j1.findCookie('_ga');
+      gaCookies   = j1.findCookie('__g');
 
       // initialize state flag
       _this.state = 'started';
-      logger.debug('\n' + 'state: ' + _this.getState());
+      if (development) {
+        logger.debug('\n' + 'state: ' + _this.getState());
+      }
 
       // hide page until 'theme' is loaded
       $('#no_flicker').hide();
@@ -217,7 +223,7 @@ j1.adapter.themer = (function (j1, window) {
       // Find conterpart (show) in the j1.adapter
       // hide content|footer until 'page' is loaded
       $('#content').hide();
-      $('{{footer_id}}').hide();
+      $('.{{footer}}').hide();
 
       // jadams, 2021-07-25: problem seems NOT an timing issue on the iPad
       // platform. (General) Dependency should be REMOVED!!!
@@ -235,7 +241,9 @@ j1.adapter.themer = (function (j1, window) {
            user_state   = j1.readCookie(cookie_names.user_state);
            user_consent = j1.readCookie(cookie_names.user_consent);
 
-           logger.debug('\n' + 'cookie ' +  cookie_names.user_state + ' successfully loaded after: ' + interval_count * 25 + ' ms');
+           if (development) {
+             logger.debug('\n' + 'cookie ' +  cookie_names.user_state + ' successfully loaded after: ' + interval_count * 25 + ' ms');
+           }
 
            // initial theme data
            if (user_state.theme_css === '') {
@@ -252,7 +260,9 @@ j1.adapter.themer = (function (j1, window) {
              });
 
              if (!cookie_written) {
-               logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+               if (development) {
+                 logger.error('\n' + 'failed to write cookie: ' + cookie_names.user_consent);
+               }
              }
            }
 
@@ -260,8 +270,10 @@ j1.adapter.themer = (function (j1, window) {
            user_state.theme_switcher = themerOptions.enabled;
            if (themerOptions.enabled) {
              // enable BS ThemeSwitcher
-             logger.info('\n' + 'themes detected as: ' + themerOptions.enabled);
-             logger.info('\n' + 'remote themes are being initialized');
+             if (development) {
+               logger.info('\n' + 'themes detected as: ' + themerOptions.enabled);
+               logger.info('\n' + 'remote themes are being initialized');
+             }
 
              /* eslint-disable */
              // load list of remote themes
@@ -286,8 +298,10 @@ j1.adapter.themer = (function (j1, window) {
              };
              /* eslint-enable */
            } else {
-             logger.warn('\n' + 'themes detected as: disabled');
-             logger.warn('\n' + 'no remote themes are available');
+             if (development) {
+               logger.warn('\n' + 'themes detected as: disabled');
+               logger.warn('\n' + 'no remote themes are available');
+             }
           }
 
           // validate theme to be loaded
@@ -304,10 +318,17 @@ j1.adapter.themer = (function (j1, window) {
                }, 10); // END dependencies_met_theme_loaded
              } else {
                // invalid theme, fallback on default
-               logger.warn('\n' + 'themes CSS invalid: ' + user_state.theme_css);
+               if (development) {
+                 logger.warn('\n' + 'themes CSS invalid: ' + user_state.theme_css);
+               }
+
                theme_css_html = '<link rel="stylesheet" id="' + id + '" href="' + default_theme_css + '" type="text/css" />';
-               logger.warn('\n' + 'set default theme :' + default_theme_name);
-               logger.debug('\n' + 'theme CSS loaded: ' + default_theme_css);
+
+               if (development) {
+                 logger.warn('\n' + 'set default theme :' + default_theme_name);
+                 logger.debug('\n' + 'theme CSS loaded: ' + default_theme_css);
+               }
+
                $('head').append(theme_css_html);
 
                // write theme defaults to cookie
@@ -344,11 +365,17 @@ j1.adapter.themer = (function (j1, window) {
           // show page (theme is loaded)
           $('#no_flicker').show();
 
-          logger.info('\n' + 'theme loaded successfully: ' + user_state.theme_name);
-          logger.debug('\n' + 'theme CSS loaded: ' + user_state.theme_css);
+          if (development) {
+            logger.info('\n' + 'theme loaded successfully: ' + user_state.theme_name);
+            logger.debug('\n' + 'theme CSS loaded: ' + user_state.theme_css);
+          }
+
           _this.setState('finished');
-          logger.debug('\n' + 'state: ' + _this.getState());
-          logger.info('\n' + 'module initialized successfully');
+
+          if (development) {
+            logger.debug('\n' + 'state: ' + _this.getState());
+            logger.info('\n' + 'module initialized successfully');
+          }
 
           clearInterval(dependencies_met_theme_applied);
         }
@@ -365,13 +392,20 @@ j1.adapter.themer = (function (j1, window) {
       var json_message = JSON.stringify(message, undefined, 2);
 
       logText = '\n' + 'received message from ' + sender + ': ' + json_message;
-      logger.info(logText);
+
+      if (development) {
+        logger.info(logText);
+      }
 
       // -----------------------------------------------------------------------
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if (message.type === 'command' && message.action === 'module_initialized') {
-        logger.info('\n' + message.text);
+
+        if (development) {
+          logger.info('\n' + message.text);
+        }
+
         //
         // Place handling of other command|action here
         //

data/assets/themes/j1/core/css/icon-fonts/mdi.css

@@ -1,6 +1,6 @@
 /*
  # -----------------------------------------------------------------------------
- # ~/packages/100_theme_css/material_design_icons.scss
+ # ~/packages/100_theme_css/material_design_icons_regular.scss
  # CSS index file for Material Design Icons v5.9.55
  #
  # Product/Info:
@@ -65,15 +65,11 @@
  # -----------------------------------------------------------------------------
 */
 @font-face {
-  src: url("/assets/themes/j1/core/fonts/material_design_icons/fonts/materialdesignicons-webfont.woff") format("woff");
   src: url("/assets/themes/j1/core/fonts/material_design_icons/fonts/materialdesignicons-webfont.woff2") format("woff2");
-  src: url("/assets/themes/j1/core/fonts/material_design_icons/fonts/eot/materialdesignicons-webfont.eot?v=6.9.96");
-  src: url("/assets/themes/j1/core/fonts/material_design_icons/fonts/eot/materialdesignicons-webfont.eot?#iefix&v=6.9.96") format("embedded-opentype");
-  src: url("/assets/themes/j1/core/fonts/material_design_icons/fonts/svg/materialdesignicons-webfont.svg?v=6.9.96#materialdesigniconsregular") format("svg");
-  src: url("/assets/themes/j1/core/fonts/material_design_icons/fonts/ttf/materialdesignicons-webfont.ttf?v=6.9.96") format("truetype");
   font-family: "Material Design Icons";
   font-weight: normal;
-  font-style: normal; }
+  font-style: normal;
+  font-display: block; }
 
 /*
  # -----------------------------------------------------------------------------