j1_template 2019.4.8 → 2019.4.10

data/lib/starter_web/assets/data/authclient.html

@@ -234,11 +234,11 @@ regenerate:                             true
 
       <!-- Footer -->
       <div class="modal-footer justify-content-center">
-        <a type="button" id="signInButton" class="btn btn-primary-modal mr-2" data-dismiss="modal">
+        <a type="button" id="signInButton" class="btn btn btn-raised btn-flex btn-md btn-info g-mr-5" data-dismiss="modal">
           <i class="mdi mdi-18px mdi-dark mdi-login"></i>
           Yes, please
         </a>
-        <a type="button" id="exitButton" class="btn btn-outline-modal" data-dismiss="modal">
+        <a type="button" id="exitButton" class="btn btn btn-raised btn-flex btn-md btn-secondary" data-dismiss="modal">
           <i class="mdi mdi-18px mdi-dark mdi-close"></i>
           No, thanks
         </a>
@@ -296,11 +296,11 @@ regenerate:                             true
 
       <!-- Footer -->
       <div class="modal-footer">
-        <a type="button" id="signOutButton" class="btn btn-primary-modal mr-2" data-dismiss="modal">
+        <a type="button" id="signOutButton" class="btn btn btn-raised btn-flex btn-md btn-warning g-mr-5" data-dismiss="modal">
           <i class="mdi mdi-18px mdi-dark mdi-logout"></i>
           Yes, please
         </a>
-        <a type="button" id="exitButton" class="btn btn-outline-modal" data-dismiss="modal">
+        <a type="button" id="exitButton" class="btn btn btn-raised btn-flex btn-md btn-secondary" data-dismiss="modal">
           <i class="mdi mdi-18px mdi-dark mdi-close"></i>
           No, thanks
         </a>
@@ -330,7 +330,7 @@ regenerate:                             true
       </div>
       <!-- Footer -->
       <div class="modal-footer justify-content-center">
-        <a type="button" class="btn btn-outline-modal" data-dismiss="modal">OK</a>
+        <a type="button" class="btn btn btn-raised btn-flex btn-md btn-info" data-dismiss="modal">OK</a>
       </div>
     </div>
     <!-- END Content -->
@@ -349,7 +349,7 @@ regenerate:                             true
       <div class="modal-body">
         <div class="row px-4">
           <p class="pt-1 pr-2">You're already signed in</p>
-          <a type="button" class="btn btn-outline-modal" data-dismiss="modal"OK</a>
+          <a type="button" class="btn btn btn-raised btn-flex btn-md btn-info" data-dismiss="modal"OK</a>
         </div>
       </div>
     </div>

data/lib/starter_web/assets/data/banner.html

@@ -122,97 +122,107 @@ regenerate:                             true
         {% comment %} Collect TEASER banner
         ------------------------------------------------------------------------ {% endcomment %}
         {% when 'teaser' %}
-        {% if debug %}<!-- banner_defaults:  {{banner_config_defaults.teaser}} -->{% endif %}
-        {% if debug %}<!-- banner_settings:  {{banner_settings}} -->{% endif %}
         {% assign banner_options = banner_config_defaults.teaser | merge: banner_settings %}
         {% if debug %}<!-- banner_options:  {{banner_options}} -->{% endif %}
-        <div id="{{banner_settings.id}}">
-          <div class="banner-teaser {{banner_settings.id}}-background">
-            <div class="{{container_class}} j1-banner-block">
-
-                {% assign card_items = cards | size %}
-                {% for card in cards %}
-
-                  {% for items in card %}
-                    {% for item in items[1] %}
-                      {% assign key   = item[0] %}
-                      {% assign value = item[1] %}
-                      {% if key == 'enabled' %}     {% assign card_enabled      = value %}                   {% endif %}
-                      {% if key == 'width' %}       {% assign card_width        = value %}                   {% endif %}
-                      {% if key == 'type' %}        {% assign card_type         = value %}                   {% endif %}
-                      {% if key == 'icon' %}        {% assign icon              = value %}                   {% endif %}
-                      {% if key == 'icon_size' %}   {% assign icon_size         = value %}                   {% endif %}
-                      {% if key == 'icon_color' %}  {% assign icon_color        = value %}                   {% endif %}
-                      {% if key == 'image_path' %}  {% assign card_image_path   = value %}                   {% endif %}
-                      {% if key == 'animate' %}     {% assign card_animate      = value %}                   {% endif %}
-                      {% if key == 'title' %}       {% assign card_title        = value | strip_newlines%}   {% endif %}
-                      {% if key == 'description' %} {% assign card_description  = value | strip_newlines%}   {% endif %}
-                      {% if key == 'tagline' %}     {% assign card_tagline      = value | strip_newlines%}   {% endif %}
-                      {% if key == 'text' %}        {% assign card_text         = value | strip_newlines %}  {% endif %}
-                      {% if key == 'buttons' %}     {% assign card_buttons      = value %}                   {% endif %}
-                    {% endfor %}
-                    {% if card_enabled == false %} {% assign card_items = card_items | minus:1 %} {% endif %}
-                  {% endfor %}
-
-                  {% if card_icon_color %}
-                    {% include {{select_color}} color=card_icon_color fallback="#fff" %}
-                    {% assign card_icon_color = color %}
-                    {% capture card_icon_color %}style="color:{{card_icon_color}}" %}{% endcapture %}
-                  {% else %}
-                    {% assign card_icon_color = '' %}
-                  {% endif %}
+        <section id="{{banner_settings.id}}">
+          <div class="container">
+          {% assign card_items = cards | size %}
+          {% for card in cards %}
 
-                  {% include {{select_icon_size}} family=icon_family size=icon_size %}
-                  {% assign icon_size = size %}
+            {% for items in card %}
+              {% for item in items[1] %}
+                {% assign key   = item[0] %}
+                {% assign value = item[1] %}
+                {% if key == 'enabled' %}     {% assign card_enabled      = value %}                   {% endif %}
+                {% if key == 'width' %}       {% assign card_width        = value %}                   {% endif %}
+                {% if key == 'type' %}        {% assign card_type         = value %}                   {% endif %}
+                {% if key == 'icon' %}        {% assign icon              = value %}                   {% endif %}
+                {% if key == 'icon_size' %}   {% assign icon_size         = value %}                   {% endif %}
+                {% if key == 'icon_color' %}  {% assign icon_color        = value %}                   {% endif %}
+                {% if key == 'image_path' %}  {% assign card_image_path   = value %}                   {% endif %}
+                {% if key == 'animate' %}     {% assign card_animate      = value %}                   {% endif %}
+                {% if key == 'title' %}       {% assign card_title        = value | strip_newlines%}   {% endif %}
+                {% if key == 'description' %} {% assign card_description  = value | strip_newlines%}   {% endif %}
+                {% if key == 'tagline' %}     {% assign card_tagline      = value | strip_newlines%}   {% endif %}
+                {% if key == 'text' %}        {% assign card_text         = value | strip_newlines %}  {% endif %}
+                {% if key == 'buttons' %}     {% assign card_buttons      = value %}                   {% endif %}
+              {% endfor %}
+              {% if card_enabled == false %} {% assign card_items = card_items | minus:1 %} {% endif %}
+            {% endfor %}
 
-                  {% if card_width %}
-                    {% assign card_enabled = true %}
-                    {% assign card_width_md = card_width %}
-                  {% else %}
-                    {% assign card_width_md = 12 | divided_by: card_items %}
-                  {% endif %}
+            {% if card_icon_color %}
+              {% include {{select_color}} color=card_icon_color fallback="#fff" %}
+              {% assign card_icon_color = color %}
+              {% capture card_icon_color %}style="color:{{card_icon_color}}" %}{% endcapture %}
+            {% else %}
+              {% assign card_icon_color = '' %}
+            {% endif %}
 
-                  {% if card_animate %}
-                    {% assign card_animate = card_animate %}
-                  {% else %}
-                    {% assign card_animate = '' %}
-                  {% endif %}
+            {% include {{select_icon_size}} family=icon_family size=icon_size %}
+            {% assign icon_size = size %}
 
-                  {% comment %} TODO: Add payment_url to config
-                  ---------------------------------------------------------------- {% endcomment %}
-                  {% assign patreon_enabled     = true %}
-                  {% assign patreon_home        = 'https://www.patreon.com' %}
-                  {% assign pledge_url          = 'join' %}
-                  {% assign vanity              = 'jekyll_one' %}
-                  {% assign pledge_button_text  = 'Become a Patron' %}
-
-                  {% capture payment_url %}{{patreon_home}}/{{pledge_url}}/{{vanity}}{% endcapture %}
-
-                  {% if card_type == 'text' and card_enabled %}
-                    {% if card_animate %} {% capture animate %}animated {{card_animate}}{% endcapture %} {% endif %}
-                    <div class="row">
-                      <div class="col-md-{{card_width_md}} col-md-offset-1 col-sm-{{card_width_md}} col-sm-offset-1 col-xs-{{card_width_md}} col-xs-offset-1 {{animate}}">
-                        <h3 class="title">{{card_title}}</h3>
-                        <p class="description">{{card_description}}</p>
-                        <p class="tagline mt-4">{{card_tagline}}</p>
-                        <div class="row btn-row mt-4">
-                          <div class="col-md-{{card_width_md}} col-md-offset-1 col-sm-{{card_width_md}} col-sm-offset-1 col-xs-{{card_width_md | plus:2}}">
-                            {% for button_hash in card_buttons %}
-                              {% include {{create_bs_button}} button_data=button_hash button_type="link" %}
-                              {{bs_button_html}}
-                            {% endfor %}
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  {% endif %}
+            {% if card_width %}
+              {% assign card_enabled = true %}
+              {% assign card_width_md = card_width %}
+            {% else %}
+              {% assign card_width_md = 12 | divided_by: card_items %}
+            {% endif %}
 
-              {% endfor %}
-              {% comment %} END cards
-              -------------------------------------------------------------------- {% endcomment %}
+            {% if card_animate %}
+              {% assign card_animate = card_animate %}
+            {% else %}
+              {% assign card_animate = '' %}
+            {% endif %}
+
+            {% comment %} TODO: Add payment_url to config
+            ---------------------------------------------------------------- {% endcomment %}
+            {% assign patreon_enabled     = true %}
+            {% assign patreon_home        = 'https://www.patreon.com' %}
+            {% assign pledge_url          = 'join' %}
+            {% assign vanity              = 'jekyll_one' %}
+            {% assign pledge_button_text  = 'Become a Patron' %}
+
+            {% capture payment_url %}{{patreon_home}}/{{pledge_url}}/{{vanity}}{% endcapture %}
+
+            {% if card_type == 'text' and card_enabled %}
+            {% if card_animate %} {% capture animate %}animated {{card_animate}}{% endcapture %} {% endif %}
+            <!-- Heading -->
+            <div class="row">
+              <div class="col-lg-9">
+                <div class="{{animate}}">
+                  <h1 class="g-font-weight-500 g-mb-0">{{card_title}}</h1>
+                  <p class="tagline">{{card_tagline}}</p>
+                  <div class="d-inline-block g-width-50 g-height-2 g-bg-primary g-mb-5"></div>
+                </div>
+              </div>
             </div>
+            <!-- End Heading -->
+
+            <!-- Card -->
+            <div class="row {{animate}}">
+              <div class="col-lg-9 g-mb-30">
+
+                <p class="lead">{{card_description}}</p>
+                <div class="row btn-row mt-4">
+                  <div class="col-md-{{card_width_md}} col-md-offset-1 col-sm-{{card_width_md}} col-sm-offset-1 col-xs-{{card_width_md | plus:2}}">
+                    {% for button_hash in card_buttons %}
+                      {% include {{create_bs_button}} button_data=button_hash button_type="link" %}
+                      {{bs_button_html}}
+                    {% endfor %}
+                  </div>
+                </div>
+
+              </div>
+            </div>
+            <!-- End Card -->
+            {% endif %}
+
+          {% endfor %}
+          {% comment %} END cards
+          -------------------------------------------------------------------- {% endcomment %}
           </div>
-        </div> <!-- End banner {{ id }} -->
+        </section> <!-- End banner {{ id }} -->
+
         {% comment %} Reset element variables (already processed)
         ------------------------------------------------------------------------ {% endcomment %}
         {% assign banner_settings = nil %}

data/lib/starter_web/assets/data/cookie_consent.html

@@ -51,9 +51,8 @@ regenerate:                             true
 {% comment %} Main
 ================================================================================ {% endcomment %}
 
-{% comment %} Modal topFullCookieConsent
+{% comment %} Modal cookie consent dialog
 -------------------------------------------------------------------------------- {% endcomment %}
-
 <div class="modal fade top" id="topFullCookieConsent" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="false" style="display: none;">
   <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
 
@@ -125,15 +124,15 @@ regenerate:                             true
       <!-- Footer -->
       <div class="modal-footer justify-content-center">
         {% if consent_options.buttons.policy_button %}
-        <a type="button" id="policyButton" class="btn btn-secondary-modal mr-2"> <i class="mdi mdi-18px mdi-dark mdi-read"></i>
+        <a type="button" id="policyButton" class="btn btn-raised btn-flex btn-secondary g-mr-5"> <i class="mdi mdi-18px mdi-dark mdi-read"></i>
           {{consent_options.buttons.policy_button_text}}
         </a>
         {% endif %}
-        <a type="button" id="acceptButton" class="btn btn-primary-modal mr-2" data-dismiss="modal"> <i class="mdi mdi-18px mdi-dark mdi-check"></i>
+        <a type="button" id="acceptButton" class="btn btn-raised btn-flex btn-info g-mr-5" data-dismiss="modal"> <i class="mdi mdi-18px mdi-dark mdi-check"></i>
           {{consent_options.buttons.accept_button_text}}
         </a>
         {% if consent_options.buttons.decline_button %}
-        <a type="button" id="declineButton" class="btn btn-outline-modal mr-2" data-dismiss="modal"> <i class="mdi mdi-18px mdi-dark mdi-close"></i>
+        <a type="button" id="declineButton" class="btn btn-raised btn-flex btn-secondary g-mr-5" data-dismiss="modal"> <i class="mdi mdi-18px mdi-dark mdi-close"></i>
           {{consent_options.buttons.decline_button_text}}
         </a>
         {% endif %}
@@ -156,38 +155,10 @@ regenerate:                             true
     </div> <!-- END Content -->
   </div>
 </div> <!-- END Modal -->
-{% comment %} END Modal topFullCookieConsent
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% comment %} Modal cookieDeclineTopInfo
--------------------------------------------------------------------------------- {% endcomment %}
-<div class="modal fade top" id="cookieDeclineTopInfo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="false">
-  <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
-    <!-- Content -->
-    <div class="modal-content">
-      <!-- Body -->
-      <div class="modal-body">
-        <div class="row px-4">
-          <p class="pt-1 pr-2">
-            You are about to <b>disagree</b> on '<b>cookies</b> used by this site.<br />
-            If you do so, this site is <b>unable</b> to offer you <b>any</b> of
-            our <b>functionalities, services or support</b>.
-          </p>
-        </div>
-        <div class="row px-4">
-          <a type="button" id="revokeCookies" class="btn btn-primary-modal mr-2" data-dismiss="modal">Yes, please revoke cookie consent</a>
-          <a type="button" id="remainCookies" class="btn btn-outline-modal" data-dismiss="modal">No, please do nothing</a>
-        </div>
-      </div>
-    </div>
-    <!-- END Content -->
-  </div>
-</div>
-<!-- END Modal Top Info -->
-{% comment %} END Modal cookieDeclineTopInfo
+{% comment %} END Modal cookie consent dialog
 -------------------------------------------------------------------------------- {% endcomment %}
 
-{% comment %} Modal cookieRevokeCentralDanger
+{% comment %} Modal revoke cookies dialog
 -------------------------------------------------------------------------------- {% endcomment %}
 <div class="modal fade" id="cookieRevokeCentralDanger" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog modal-notify modal-danger" role="document">
@@ -238,20 +209,17 @@ regenerate:                             true
 
       <!-- Footer -->
       <div class="modal-footer justify-content-center">
-        <a type="button" id="revokeCookies" class="btn btn-primary-modal mr-2" data-dismiss="modal">Yes, please revoke cookie consent</a>
-        <a type="button" id="remainCookies" class="btn btn-outline-modal" data-dismiss="modal">No, please do nothing</a>
-        <!-- <a type="button" class="btn btn-primary-modal mr-2">Yes, please revoke cookie consent</a>
-        <a type="button" class="btn btn-outline-secondary-modal" data-dismiss="modal">No, please do nothing</a> -->
-      </div> <!-- END Footer -->
+        <a type="button" id="revokeCookies" class="btn btn-raised btn-flex btn-md btn-red g-mr-5" data-dismiss="modal">Yes, please revoke cookie consent</a>
+        <a type="button" id="remainCookies" class="btn btn-raised btn-flex btn-md btn-secondary" data-dismiss="modal">No, please do nothing</a>
+      </div>
     </div> <!-- END Footer -->
 
   </div> <!-- END Content -->
 </div> <!-- END Modal -->
-{% comment %} END Modal cookieRevokeCentralDanger
+{% comment %} END Modal revoke cookies dialog
 -------------------------------------------------------------------------------- {% endcomment %}
 
 {% endcapture %}
 
 {{ cache | pretty_print | remove:'<html><body>' | remove:'</body></html>' | strip_empty_lines }}
-{% assign cache = nil %}
-
+{% assign cache = nil %}

data/lib/starter_web/assets/data/footer.html

@@ -1,5 +1,5 @@
 ---
-regenerate:                             true
+regenerate:                             true 
 ---
 {% capture cache %}
 
@@ -29,12 +29,13 @@ regenerate:                             true
 -------------------------------------------------------------------------------- {% 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 %}
-{% capture about_box          %}themes/{{site.template.name}}/modules/footers/boxes/about_box.proc{% endcapture %}
-{% capture news_box           %}themes/{{site.template.name}}/modules/footers/boxes/news_box.proc{% endcapture %}
-{% capture links_box          %}themes/{{site.template.name}}/modules/footers/boxes/links_box.proc{% endcapture %}
-{% capture contacts_box       %}themes/{{site.template.name}}/modules/footers/boxes/contacts_box.proc{% endcapture %}
-{% capture legal_statements   %}themes/{{site.template.name}}/modules/footers/boxes/legal_statements.proc{% endcapture %}
-{% capture social_media_icons %}themes/{{site.template.name}}/modules/footers/boxes/social_media_icons.proc{% endcapture %}
+{% capture about_box          %}themes/{{site.template.name}}/blocks/footer/boxes/about_box.proc{% endcapture %}
+{% capture news_box           %}themes/{{site.template.name}}/blocks/footer/boxes/news_box.proc{% endcapture %}
+{% capture links_box          %}themes/{{site.template.name}}/blocks/footer/boxes/links_box.proc{% endcapture %}
+{% capture contacts_box       %}themes/{{site.template.name}}/blocks/footer/boxes/contacts_box.proc{% endcapture %}
+{% capture legal_statements   %}themes/{{site.template.name}}/blocks/footer/boxes/legal_statements.proc{% endcapture %}
+{% capture issue              %}themes/{{site.template.name}}/blocks/footer/boxes/issue.proc{% endcapture %}
+{% capture social_media_icons %}themes/{{site.template.name}}/blocks/footer/boxes/social_media_icons.proc{% endcapture %}
 
 
 {% comment %} Process YML config data
@@ -101,7 +102,8 @@ regenerate:                             true
         {% assign footer_box_width_md = 12 | divided_by:enabled_boxes %}
         <!-- [INFO   ] [j1.assets.data.footer              ] [Set footer box column width to: {{ footer_box_width_md }}] -->
 
-        <div id="{{footer_config_defaults.container-id}}" class="{{footer_options.theme}}">
+        <!-- div id="{{footer_config_defaults.container-id}}" class="{{footer_options.theme}}" -->
+        <div id="{{footer_config_defaults.container-id}}">
           <div class="footer">
 
             <div class="container">
@@ -119,7 +121,7 @@ regenerate:                             true
                 ---------------------------------------------------------------- {% endcomment %}
                 {% when 'about' %}
                   {% if box.enabled %}
-                    {% include {{about_box}} title=box.title text=box.text justify=box.justify %}
+                    {% include {{about_box}} title=box.title tagline=box.tagline text=box.text justify=box.justify %}
                   {% endif %}
 
                   {% comment %} Reset element variable
@@ -130,7 +132,7 @@ regenerate:                             true
                 ---------------------------------------------------------------- {% endcomment %}
                 {% when 'news' %}
                   {% if box.enabled %}
-                    {% include {{news_box}} title=box.title category=box.category max_posts=box.max_posts posts=site.posts %}
+                    {% include {{news_box}} title=box.title tagline=box.tagline category=box.category max_posts=box.max_posts posts=site.posts %}
                   {% endif %}
 
                   {% comment %} Reset element variable
@@ -141,7 +143,7 @@ regenerate:                             true
                 --------------------------------------------------------------- {% endcomment %}
                 {% when 'references' %}
                   {% if box.enabled %}
-                    {% include {{links_box}} title=box.title links=box.links %}
+                    {% include {{links_box}} title=box.title tagline=box.tagline links=box.links %}
                   {% endif %}
 
                   {% comment %} Reset element variable
@@ -209,6 +211,9 @@ regenerate:                             true
                 <div class="col-md-10" id="inline">
                 {% include {{legal_statements}} legals=footer_options.legals %}
                 </div>
+                <div class="col-md-10" id="inline">
+                {% include {{issue}} %}
+                </div>
                 <div class="col-md-2">
                 {% include {{social_media_icons}} icons=footer_options.icons %}
                 </div>

data/lib/starter_web/assets/data/menu.html

@@ -17,7 +17,6 @@ regenerate:                             true
  #
  # J1 Template is licensed under the MIT License.
  # See: https://github.com/jekyll-one-org/j1_template/blob/master/LICENSE
- #
  # -----------------------------------------------------------------------------
  # Test data:
  #    {{ variable | debug }}
@@ -35,31 +34,31 @@ regenerate:                             true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign site_config       = site %}
-{% assign template_config   = site.data.template_settings %}
-{% assign modules           = site.data.modules %}
+{% assign site_config           = site %}
+{% assign template_config       = site.data.template_settings %}
+{% assign modules               = site.data.modules %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign navigator_settings        = modules.navigator.settings %}
-{% assign navigator_defaults        = modules.defaults.navigator.defaults %}
-{% assign navigator_menu_config     = modules.navigator_menu %}
+{% assign navigator_settings    = modules.navigator.settings %}
+{% assign navigator_defaults    = modules.defaults.navigator.defaults %}
+{% assign navigator_menu_config = modules.navigator_menu %}
 
-{% assign switcher_defaults         = modules.defaults.theme_switcher.defaults %}
-{% assign switcher_settings         = modules.theme_switcher.settings %}
+{% assign themer_defaults       = modules.defaults.themer.defaults %}
+{% assign themer_settings       = modules.themer.settings %}
 
-{% assign nav_bar_defaults          = navigator_defaults.nav_bar %}
-{% assign nav_bar_settings          = navigator_settings.nav_bar %}
-{% assign nav_menu_defaults         = navigator_defaults.nav_menu %}
-{% assign nav_menu_settings         = navigator_settings.nav_menu %}
+{% assign nav_bar_defaults      = navigator_defaults.nav_bar %}
+{% assign nav_bar_settings      = navigator_settings.nav_bar %}
+{% assign nav_menu_defaults     = navigator_defaults.nav_menu %}
+{% assign nav_menu_settings     = navigator_settings.nav_menu %}
 
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign switcher_options          = switcher_defaults | merge: switcher_settings %}
-{% assign nav_bar_options           = nav_bar_defaults  | merge: nav_bar_settings %}
-{% assign nav_menu_options          = nav_menu_defaults | merge: nav_menu_settings %}
-{% assign theme_preview             = switcher_options.preview_page %}
-{% assign nav_menu_id               = nav_menu_options.id %}
+{% assign themer_options        = themer_defaults | merge: themer_settings %}
+{% assign nav_bar_options       = nav_bar_defaults  | merge: nav_bar_settings %}
+{% assign nav_menu_options      = nav_menu_defaults | merge: nav_menu_settings %}
+{% assign theme_preview         = themer_options.preview_page %}
+{% assign nav_menu_id           = nav_menu_options.id %}
 
 {% assign ext = '' %}
 {% if site.permalink == 'none' %}
@@ -77,8 +76,8 @@ regenerate:                             true
 {% elsif bs_type == 'bs4' %}
   {% assign dropdown_collapse = 'fake-class collapse'  %}
 {% endif %}
-<!-- [DEBUG  ] [j1.modules.navigator.menu.html  ] [bs type detected: {{bs_type}}] -->
 
+<!-- [DEBUG  ] [j1.modules.navigator.menu.html  ] [bs type detected: {{bs_type}}] -->
 
 {% comment %} Set navBarOptions
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -397,7 +396,7 @@ regenerate:                             true
           {% comment %} Collect items having a THEMES menu
           ---------------------------------------------------------------------- {% endcomment %}
           {% when 'theme_select' %}
-          {% if switcher_options.enabled %}
+          {% if themer_options.enabled %}
             <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [found menu-type: theme_select] -->
             <li class="dropdown nav-item">
               <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">{{menu.item}} </a>