j1-template 2020.0.11 → 2020.0.12

data/assets/data/mmenu.html

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -25,9 +25,6 @@ regenerate:                             true
 
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
-{% capture select_color     %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
-{% capture select_icon_size %}themes/{{site.template.name}}/procedures/global/select_icon_size.proc{% endcapture %}
-
 
 {% comment %} Liquid var initialization
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -40,6 +37,8 @@ regenerate:                             true
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment           = site_config.environment %}
+
 {% assign navigator_settings    = modules.navigator.settings %}
 {% assign navigator_defaults    = modules.defaults.navigator.defaults %}
 {% assign navigator_menu_config = modules.navigator_menu %}
@@ -54,89 +53,41 @@ regenerate:                             true
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign themer_options        = themer_defaults | merge: themer_settings %}
-{% assign nav_bar_options       = nav_bar_defaults  | merge: nav_bar_settings %}
+{% assign navigator_options     = navigator_defaults | merge: navigator_settings %}
 {% assign nav_menu_options      = nav_menu_defaults | merge: nav_menu_settings %}
+{% assign themer_options        = themer_defaults | merge: themer_settings %}
 {% assign theme_preview         = themer_options.preview_page %}
-{% assign nav_menu_id           = nav_menu_options.id %}
+{% assign nav_menu_id           = navigator_options.nav_mmenu.id %}
+
+{% assign production = '' %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
 
 {% assign ext = '' %}
 {% if site.permalink == 'none' %}
   {% assign ext = '.html' %}
 {% endif %}
 
-<!-- [DEBUG  ] [j1.modules.mmenu.html  ] [detect bs type] -->
-{% assign bs_type  = 'bmd4' %}
-{% if navigator_settings.bs_type == 'bs4' %}
-  {% assign bs_type = 'bs4' %}
-{% endif %}
-
-{% if bs_type == 'bmd4' %}
-  {% assign dropdown_collapse = 'collapse'  %}
-{% elsif bs_type == 'bs4' %}
-  {% assign dropdown_collapse = 'fake-class collapse'  %}
-{% endif %}
-
-<!-- [DEBUG  ] [j1.modules.mmenu.html  ] [bs type detected: {{bs_type}}] -->
-
-{% comment %} Set navBarOptions
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign nav_bar_position      = nav_bar_options.position %}
-
-{% comment %} Set navMenuOptions
+{% comment %} Set icons and sizes
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign nav_menu_animation    = nav_menu_options.dropdown_animate %}
-{% if nav_menu_animation %}
-  {% assign animate_in  = nav_menu_options.dropdown_animate_in %}
-  {% assign animate_out = nav_menu_options.dropdown_animate_out %}
-{% endif %}
-
-{% comment %} Set base nav features
--------------------------------------------------------------------------------- {% endcomment %}
-{% capture nav_menu_position %}dropdown-menu-{{nav_bar_position}}{% endcapture %}
-{% unless nav_menu_animation %} {% assign nav_menu_animation  = false %} {% endunless %}
-
-<!-- [DEBUG  ] [j1.modules.mmenu.html  ] [initialize default menu properties] -->
-{% if nav_menu_options.raised_level %}
-  {% assign raised_level = nav_menu_options.raised_level %}
-{% else %}
-  {% assign raised_level = 0 %}
-{% endif %}
-
-{% comment %} Set base icons and sizes
--------------------------------------------------------------------------------- {% endcomment %}
-<!-- [DEBUG  ] [j1.modules.mmenu.html  ] [initialize default menu icon properties] -->
-{% assign nav_menu_icon_family         = nav_menu_options.icon_family %}
-{% assign nav_menu_icon_style          = nav_menu_options.icon_style %}
-{% assign nav_menu_icon_color          = nav_menu_options.icon_color %}
-{% assign nav_menu_icon_size           = nav_menu_options.icon_size %}
-
-{% assign icon_family = nav_menu_icon_family | strip | downcase %}
-
-{% if icon_family == 'fontawesome' or icon_family == 'fontawesome5' %}
-  {% assign nav_menu_icon_family  = 'fa' %}
-  {% assign nav_menu_icon_style   = nav_menu_icon_style %}
-{% elsif icon_family == 'mdi' %}
-  {% assign nav_menu_icon_family  = 'mdi' %}
-  {% assign nav_menu_icon_style   = nav_menu_icon_style %}
+{% if navigator_options.icon_family == 'FA' or navigator_options.icon_family == 'FontAwesome' or navigator_options.icon_family == 'FontAwesome4' or navigator_options.icon_family == 'FontAwesome5' %}
+  {% assign icon_family = 'fa' %}
+{% elsif navigator_options.icon_family == 'MDI' or navigator_options.icon_family == 'Material Design Icons'%}
+  {% assign icon_family = 'mdi' %}
 {% else %}
-  {% assign nav_menu_icon_family  = 'mdi' %}
-  {% assign nav_menu_icon_style   = nav_menu_icon_style %}
+  {% assign icon_family = 'mdi' %}
 {% endif %}
 
-{% include {{select_color}} color=nav_menu_icon_color fallback="#9E9E9E" %}
-{% assign nav_menu_icon_color = color %}
-
-{% include {{select_icon_size}} family=nav_menu_icon_family size=nav_menu_icon_size %}
-{% assign nav_menu_icon_size = size %}
+{% assign icon_style  = navigator_options.icon_style %}
+{% assign icon_size   = navigator_options.icon_size %}
+{% assign icon_color  = navigator_options.icon_color %}
 
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
-<!-- [DEBUG  ] [j1.modules.mmenu.html  ] [collect all nav links for the navigation bar (navbar)] -->
-<!-- div id="{{nav_menu_id}}" class="{{dropdown_collapse}}" -->
-<!-- div class="{{dropdown_collapse}}" -->
+  <!-- [DEBUG  ] [j1.modules.mmenu.html  ] [collect all nav links for the navigation ] -->
   <ul id="menu_mmenu" style="display:none">
 
   {% for menu in navigator_menu_config %}
@@ -171,7 +122,7 @@ regenerate:                             true
         {% if menu.icon == null %}
           <a href="#">{{menu.item}}</a>
         {% else %}
-          <a href="#"> <i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{menu.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i>{{menu.item}}</a>
+          <a href="#"> <i class="{{icon_style}} {{icon_family}}-{{menu.icon}} {{icon_size}} {{icon_color}} mr-2"></i>{{menu.item}}</a>
         {% endif %}
 
         <ul>
@@ -185,9 +136,9 @@ regenerate:                             true
               {% endif %}
             {% else %}
               {% if level_1.target == null %}
-                <li><a href="{{level_1.href}}{{ext}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_1.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{level_1.title}}</a></li>
+                <li><a href="{{level_1.href}}{{ext}}"><i class="{{icon_style}} {{icon_family}}-{{level_1.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_1.title}}</a></li>
               {% else %}
-                <li><a href="{{level_1.href}}{{ext}}" target="{{level_1.target}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_1.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{level_1.title}}</a></li>
+                <li><a href="{{level_1.href}}{{ext}}" target="{{level_1.target}}"><i class="{{icon_style}} {{icon_family}}-{{level_1.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_1.title}}</a></li>
               {% endif %}
             {% endif %}
           {% endif %}
@@ -198,7 +149,7 @@ regenerate:                             true
               {% if level_1.icon == null %}
                 <a href="#">{{level_1.title}}</a>
               {% else %}
-                <a href="#"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_1.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{level_1.title}}</a>
+                <a href="#"><i class="{{icon_style}} {{icon_family}}-{{level_1.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_1.title}}</a>
               {% endif %}
 
               <ul>
@@ -212,9 +163,9 @@ regenerate:                             true
                       {% endif %}
                     {% else %}
                       {% if level_2.target == null %}
-                        <li><a href="{{level_2.href}}{{ext}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_2.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{level_2.title}}</a></li>
+                        <li><a href="{{level_2.href}}{{ext}}"><i class="{{icon_style}} {{icon_family}}-{{level_2.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_2.title}}</a></li>
                       {% else %}
-                        <li><a href="{{level_2.href}}{{ext}}" target="{{level_2.target}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_2.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{level_2.title}}</a></li>
+                        <li><a href="{{level_2.href}}{{ext}}" target="{{level_2.target}}"><i class="{{icon_style}} {{icon_family}}-{{level_2.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_2.title}}</a></li>
                       {% endif %}
                     {% endif %}
                   {% endif %}
@@ -224,7 +175,7 @@ regenerate:                             true
                       {% if level_2.icon == null %}
                         <a href="#" >{{level_2.title}}</a>
                       {% else %}
-                        <a href="#" ><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_2.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{level_2.title}}</a>
+                        <a href="#" ><i class="{{icon_style}} {{icon_family}}-{{level_2.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_2.title}}</a>
                       {% endif %}
 
                       <ul>
@@ -237,9 +188,9 @@ regenerate:                             true
                           {% endif %}
                         {% else %}
                           {% if level_3.target == null %}
-                            <li><a href="{{level_3.href}}{{ext}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_3.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{level_3.title}}</a></li>
+                            <li><a href="{{level_3.href}}{{ext}}"><i class="{{icon_style}} {{icon_family}}-{{level_3.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_3.title}}</a></li>
                           {% else %}
-                            <li><a href="{{level_3.href}}{{ext}}" target="{{level_3.target}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_3.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{level_3.title}}</a></li>
+                            <li><a href="{{level_3.href}}{{ext}}" target="{{level_3.target}}"><i class="{{icon_style}} {{icon_family}}-{{level_3.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_3.title}}</a></li>
                           {% endif %}
                         {% endif %}
                         {% if level_3.divider %} <li class="divider"></li> {% endif %}
@@ -280,7 +231,7 @@ regenerate:                             true
                 </div>
               {% else %}
                 <div class="post-headline mt-2 mb-3">
-                  <h2 class="title" style="font-size:1.25em !important"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{megabox.icon}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{megabox.title}}</h2>
+                  <h2 class="title" style="font-size:1.25em !important"><i class="{{icon_style}} {{icon_family}}-{{megabox.icon}} mr-2"></i> {{megabox.title}}</h2>
                 </div>
               {% endif %}
               <div class="content">
@@ -289,7 +240,7 @@ regenerate:                             true
                   {% if links.icon == null %}
                     <li class="dropdown-megamenu-item"><a href="{{links.href}}{{ext}}" target="{{links.target}}">{{links.title}}</a></li>
                   {% else %}
-                    <li class="dropdown-megamenu-item"><a href="{{links.href}}{{ext}}" target="{{links.target}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{links.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{links.title}}</a></li>
+                    <li class="dropdown-megamenu-item"><a href="{{links.href}}{{ext}}" target="{{links.target}}"><i class="{{icon_style}} {{icon_family}}-{{links.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{links.title}}</a></li>
                   {% endif %}
                 {% endfor %}
                 </ul>
@@ -320,9 +271,9 @@ regenerate:                             true
         {% elsif menu.icon %}
           <!-- [INFO   ] [j1.modules.mmenu.html  ] [no icon for menu-item found -->
           {% if menu.target == null %}
-            <li> <a href="{{menu.href}}{{ext}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{menu.icon}} {{nav_menu_icon_size}}" style="color:{{nav_menu_icon_color}}"></i> {{menu.item}}</a> </li>
+            <li> <a href="{{menu.href}}{{ext}}"><i class="{{icon_style}} {{icon_family}}-{{menu.icon}} {{icon_size}}"></i> {{menu.item}}</a> </li>
           {% else %}
-            <li> <a href="{{menu.href}}{{ext}}" target="{{menu.target}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{menu.icon}} {{nav_menu_icon_size}}" style="color:{{nav_menu_icon_color}}"></i> {{menu.item}}</a> </li>
+            <li> <a href="{{menu.href}}{{ext}}" target="{{menu.target}}"><i class="{{icon_style}} {{icon_family}}-{{menu.icon}} {{icon_size}}"></i> {{menu.item}}</a> </li>
           {% endif %}
         {% else %}
           <!-- [FATAL ] [nav_menu.menu-top-level-only       ] [processing menu item failed] -->
@@ -346,7 +297,7 @@ regenerate:                             true
                 <!-- [INFO   ] [j1.modules.mmenu.html  ] [START: check signin] -->
                 {% if item.mode == 'signin' %}
                   <li>
-                    <a href="#" data-toggle="modal" data-target="#modalOmniSignIn"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{item.icon}} {{nav_menu_icon_size}}" style="color:{{nav_menu_icon_color}}"></i>{{item.title}}</a>
+                    <a href="#" data-toggle="modal" data-target="#modalOmniSignIn"><i class="{{icon_style}} {{icon_family}}-{{item.icon}} {{icon_size}}"></i>{{item.title}}</a>
                   </li>
                   {% assign item_found = 'true' %}
                 {% endif %}
@@ -355,7 +306,7 @@ regenerate:                             true
                 <!-- [INFO   ] [j1.modules.mmenu.html  ] [START: check signout] -->
                 {% if item.mode == 'signout' %}
                   <li>
-                    <a href="#" data-toggle="modal" data-target="#modalOmniSignOut"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{item.icon}} {{nav_menu_icon_size}}" style="color:{{nav_menu_icon_color}}"></i>{{item.title}}</a>
+                    <a href="#" data-toggle="modal" data-target="#modalOmniSignOut"><i class="{{icon_style}} {{icon_family}}-{{item.icon}} {{icon_size}}"></i>{{item.title}}</a>
                   </li>
                   {% assign item_found = 'true' %}
                 {% endif %}
@@ -381,7 +332,7 @@ regenerate:                             true
 
           {% comment %} Collect items having a THEMES menu  (disabled for now)
           ---------------------------------------------------------------------- {% endcomment %}
-          {% when 'ttttttttheme_select' %}
+          {% when 'ttttttttttheme_select' %}
           {% if themer_options.enabled %}
             <!-- [INFO   ] [j1.modules.mmenu.html  ] [found menu-type: theme_select] -->
             <li>
@@ -397,22 +348,22 @@ regenerate:                             true
                   <!-- check for J1 Theme selector -->
                   {% if item.local_themes and item.local_themes == 'enabled' %}
                     <li>
-                      <a href="#"><i class="{{nav_menu_icon_family}} {{nav_menu_icon_family}}-{{item.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{item.title}}</a>
-                      <ul id="ThemeSelect"> </ul>
+                      <a href="#"><i class="{{icon_family}} {{icon_family}}-{{item.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{item.title}}</a>
+                      <ul id="ThemeSelect_MMenu"> </ul>
                     </li>
                     {% assign item_found = 'true' %}
                   {% endif %} <!-- end J1 theme selector -->
                   <!-- check for BootSwatch theme selector -->
                   {% if item.bootswatch_themes and item.bootswatch_themes == 'enabled' %}
                     <li>
-                      <a href="#"><i class="{{nav_menu_icon_family}} {{nav_menu_icon_family}}-{{item.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{item.title}}</a>
-                      <ul id="ThemeList"> </ul>
+                      <a href="#"><i class="{{icon_family}} {{icon_family}}-{{item.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{item.title}}</a>
+                      <ul id="ThemeList_MMenu"> </ul>
                     </li>
                     {% assign item_found = 'true' %}
                   {% endif %} <!-- end BootSwatch theme selector -->
                   {% if item.preview and item.preview == 'enabled' %}
                     <li>
-                      <a href="{{theme_preview}}" ><i class="{{nav_menu_icon_family}} {{nav_menu_icon_family}}-{{item.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{item.title}}</a>
+                      <a href="{{theme_preview}}" ><i class="{{icon_family}} {{icon_family}}-{{item.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{item.title}}</a>
                     </li>
                     {% assign item_found = 'true' %}
                     {% endif %} <!-- end theme preview -->
@@ -450,6 +401,9 @@ regenerate:                             true
 <!-- [INFO   ] [j1.modules.mmenu.html  ] [nav_menu_settings: end processing] -->
 
 {% endcapture %}
-
-{{cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines}}
+{% if production %}
+  {% capture _LINE_FEED %}{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ cache | strip_html_comments }}{% else %}{% capture _content %}{{ cache | strip_html_comments }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ cache | strip_html_comments | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}
+{% else %}
+  {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}

data/assets/data/mmenu_sidebar.html

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate: true
 ---
 
 {% capture cache %}
@@ -25,42 +25,39 @@ regenerate:                             true
 
 {% comment %} Liquid procedures
 -------------------------------------------------------------------------------- {% endcomment %}
-{% capture select_color     %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
-{% capture select_icon_size %}themes/{{site.template.name}}/procedures/global/select_icon_size.proc{% endcapture %}
-
 
 {% comment %} Liquid var initialization
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-
+{% assign site_config                 = site %}
 {% assign navigator_defaults          = site.data.modules.defaults.navigator.defaults %}
 {% assign navigator_settings          = site.data.modules.navigator.settings %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment                 = site_config.environment %}
+
 {% assign nav_mmenu_defaults          = navigator_defaults.nav_mmenu %}
 {% assign nav_mmenu_settings          = navigator_settings.nav_mmenu %}
 
 {% comment %} Set config options
------------------------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign navigator_options           = navigator_defaults | merge: navigator_settings %}
 {% assign nav_mmenu_options           = nav_mmenu_defaults | merge: nav_mmenu_settings %}
 
-{% comment %} Set sidebar properties
------------------------------------------------------------------------------- {% endcomment %}
-{% assign display_user_info           = sidebar_options.display_user_info %}
-{% assign display_theme               = sidebar_options.display_theme %}
-{% assign close_icon                  = sidebar_options.close_icon %}
-
 {% comment %} Set global settings
------------------------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% assign nav_bar_id                  = navigator_defaults.id %}
-{% assign nav_navbar_media_breakpoint = navigator_defaults.nav_bar.media_breakpoint %}
 
+{% assign production = '' %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
 
 {% comment %} Main
------------------------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% for item in nav_mmenu_options.menus %}
 {% if item.menu.xhr_container_id == "navigator_sidebar_mmenu" %}
@@ -69,27 +66,24 @@ regenerate:                             true
 {% endif %}
 {% endfor %}
 
-{% if sidebar_options.icon_family == 'FontAwesome' or sidebar_options.icon_family == 'FontAwesome4' or sidebar_options.icon_family == 'FontAwesome5' %}
+{% comment %} Set icons and sizes
+-------------------------------------------------------------------------------- {% endcomment %}
+{% if navigator_options.icon_family == 'FA' or navigator_options.icon_family == 'FontAwesome' or navigator_options.icon_family == 'FontAwesome4' or navigator_options.icon_family == 'FontAwesome5' %}
   {% assign icon_family = 'fa' %}
-{% elsif sidebar_options.icon_family == 'MDI' or sidebar_options.icon_family == 'Material Design Icons'%}
+{% elsif navigator_options.icon_family == 'MDI' or navigator_options.icon_family == 'Material Design Icons'%}
   {% assign icon_family = 'mdi' %}
 {% else %}
   {% assign icon_family = 'mdi' %}
 {% endif %}
 
-{% include {{select_color}} color=sidebar_options.icon_color fallback="#9E9E9E" %}
-{% capture icon_color %}style="color: {{color}}"{% endcapture %}
-
-{% include {{select_icon_size}} family=icon_family size=sidebar_options.icon_size %}
-{% assign icon_size = size %}
-
+{% assign icon_size   = navigator_options.icon_size %}
+{% assign icon_color  = navigator_options.icon_color %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}
 
 <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [Start processing: sidebar] -->
-<!-- use BS4 class d-block to make sure, the sidebar is VISIBLE on ALL @media -->
-<div id="sidebar_mmenu" class="mm-side" style="display:none">
+<div id="{{sidebar_options.id}}" class="mm-side" style="display:none">
 {% for boxes in sidebar_options.boxes %}
   {% for box in boxes %}
 
@@ -107,10 +101,10 @@ regenerate:                             true
       {% case type %}
 
         {% comment %} Collect USER info
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
         {% when 'user_info' %}
           <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [USER info enabled] -->
-          <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [Write widged placeholder: USER info] -->
+          <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [Write widget placeholder: USER info] -->
           <div id="user-info" class="widget">
             <h4 class="heading">{{title}}</h4>
             <ul id="display_user_details" class="link">
@@ -119,7 +113,7 @@ regenerate:                             true
                 {% if link.icon == null %}
                   {% assign icon = '' %}
                 {% else %}
-                  {% capture icon %}<i class="{{icon_family}} {{icon_family}}-{{link.icon}} {{icon_size}} mr-2" {{icon_color}}></i>{% endcapture %}
+                  {% capture icon %}<i class="{{icon_family}} {{icon_family}}-{{link.icon}} {{icon_size}} {{icon_color}} mr-2"></i>{% endcapture %}
                 {% endif %}
 
                 {% if link.target == nil or link.target == "" or link.target == "none" %}
@@ -140,17 +134,17 @@ regenerate:                             true
                   {% capture link_text %}{{link.title}}: {{link.value}}{% endcapture %}
                 {% endif %}
 
-                <li><a {{macro_id}} href="{{link.href|strip}}" {{target}}>{{icon}} {{link_text}}</a></li>
+                <li><a {{macro_id}} href="{{link.href|strip}}" {{target}} rel="noopener noreferrer">{{icon}} {{link_text}}</a></li>
 
               {% endfor %}
             </ul>
           </div>
 
         {% comment %} END Collect USER info
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
 
         {% comment %} Reset element variables
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
         {% assign enabled = nil %}
         {% assign type    = nil %}
         {% assign title   = nil %}
@@ -158,10 +152,10 @@ regenerate:                             true
         {% assign links   = nil %}
 
         {% comment %} Collect THEME info
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
         {% when 'theme_info' %}
           <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [THEME info detected] -->
-          <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [Write widged placeholder: USER info] -->
+          <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [Write widget placeholder: USER info] -->
           <div id="theme-info" class="widget">
             <h4 class="heading">{{title}}</h4>
             <ul class="link">
@@ -170,7 +164,7 @@ regenerate:                             true
               {% if link.icon == null %}
                 {% assign icon = '' %}
               {% else %}
-                {% capture icon %}<i class="{{icon_family}} {{icon_family}}-{{link.icon}} {{icon_size}} mr-2" {{icon_color}}></i>{% endcapture %}
+                {% capture icon %}<i class="{{icon_family}} {{icon_family}}-{{link.icon}} {{icon_size}} {{icon_color}} mr-2"></i>{% endcapture %}
               {% endif %}
 
               {% if link.target == nil or link.target == "" or link.target == "none" %}
@@ -191,7 +185,7 @@ regenerate:                             true
                 {% capture link_text %}{{link.title}}: {{link.value}}{% endcapture %}
               {% endif %}
 
-              <li><a {{macro_id}} href="{{link.href|strip}}" {{target}}>{{icon}} {{link_text}}</a></li>
+              <li><a {{macro_id}} href="{{link.href|strip}}" {{target}} rel="noopener noreferrer">{{icon}} {{link_text}}</a></li>
 
             {% endfor %}
             </ul>
@@ -199,10 +193,10 @@ regenerate:                             true
           <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [End processing: THEME info] -->
 
         {% comment %} END Collect THEME info
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
 
         {% comment %} Reset element variables
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
         {% assign enabled = nil %}
         {% assign type    = nil %}
         {% assign title   = nil %}
@@ -210,7 +204,7 @@ regenerate:                             true
         {% assign links   = nil %}
 
         {% comment %} Collect SITE info
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
         {% when 'site_info' %}
           <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [Start processing SITE info] -->
 
@@ -221,7 +215,7 @@ regenerate:                             true
                 {% if link.icon == null %}
                   {% assign icon = "" %}
                 {% else %}
-                  {% capture icon %}<i class="{{icon_family}} {{icon_family}}-{{link.icon}} {{icon_size}} mr-2" {{icon_color}}></i>{% endcapture %}
+                  {% capture icon %}<i class="{{icon_family}} {{icon_family}}-{{link.icon}} {{icon_size}} {{icon_color}} mr-2"></i>{% endcapture %}
                 {% endif %}
 
                 {% if link.target == nil or link.target == "" or link.target == "none" %}
@@ -236,17 +230,17 @@ regenerate:                             true
                   {% capture link_text %}"{{link.title}}: {{link.title}}"{% endcapture %}
                 {% endif %}
 
-                <li><a href="{{link.href|strip}}" {{target}}>{{icon}}{{link_text}}</a></li>
+                <li><a href="{{link.href|strip}}" {{target}} rel="noopener noreferrer">{{icon}}{{link_text}}</a></li>
 
               {% endfor %}
             </ul>
           </div>
 
         {% comment %} END Collect SITE info
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
 
         {% comment %} Reset element variables
-        ---------------------------------------------------------------------- {% endcomment %}
+        ------------------------------------------------------------------------ {% endcomment %}
         {% assign enabled = nil %}
         {% assign type    = nil %}
         {% assign title   = nil %}
@@ -262,6 +256,9 @@ regenerate:                             true
 <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [End processing: sidebar] -->
 </div>
 {% endcapture %}
-
-{{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
+{% if production %}
+  {% capture _LINE_FEED %}{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ cache | strip_html_comments }}{% else %}{% capture _content %}{{ cache | strip_html_comments }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ cache | strip_html_comments | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}
+{% else %}
+  {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
+{% endif %}
 {% assign cache = nil %}