j1-template 2023.3.1 → 2023.3.3

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

@@ -164,7 +164,7 @@ var logText;
             //
             if ($('#quickLinksThemeTogglerButton').length) {
               if (user_state.theme_name == dark_theme_name) {
-                $('#quickLinksThemeTogglerButton a i').toggleClass('mdi-lightbulb mdi-lightbulb-outline');
+                $('#quickLinksThemeTogglerButton a i').toggleClass('mdib-lightbulb mdib-lightbulb-outline');
               }
             }
 
@@ -173,11 +173,11 @@ var logText;
               if (user_state.theme_name == light_theme_name) {
                 user_state.theme_name = dark_theme_name;
                 user_state.theme_css  = dark_theme_css;
-                user_state.theme_icon = 'mdi-lightbulb';
+                user_state.theme_icon = 'mdib-lightbulb';
               } else {
                 user_state.theme_name = light_theme_name;
                 user_state.theme_css  = light_theme_css;
-                user_state.theme_icon = 'mdi-lightbulb-outline';
+                user_state.theme_icon = 'mdib-lightbulb-outline';
               }
 
               logger.info('\n' + 'switch theme to: ' + user_state.theme_name);

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 %}
@@ -117,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}}';
@@ -205,7 +208,7 @@ 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';
@@ -220,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!!!

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; }
 
 /*
  # -----------------------------------------------------------------------------