assets/data/mmenu.html in j1-template-2022.5.1.rc0 vs assets/data/mmenu.html in j1-template-2022.5.1.rc1
- old
+ new
@@ -127,81 +127,81 @@
{% when 'sublevel_menu' %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [found menu-type: sub-menue] -->
<!-- [INFO ] [~/assets/data/mmenu.html ] [submenu level 1 detected] -->
<li>
{% if menu.icon == null %}
- <a href="#">{{menu.item}}</a>
+ <span>{{menu.item}}</span>
{% else %}
- <a href="#"> <i class="{{icon_style}} {{icon_family}}-{{menu.icon}} {{icon_size}} {{icon_color}} mr-2"></i>{{menu.item}}</a>
+ <span><i class="{{icon_style}} {{icon_family}}-{{menu.icon}} {{icon_size}} {{icon_color}} mr-2"></i>{{menu.item}}</span>
{% endif %}
<ul>
{% for level_1 in menu.sublevel %}
{% if level_1.dropdown == null %}
{% if level_1.icon == null %}
{% if level_1.target == null %}
- <li><a href="{{level_1.href}}{{ext}}">{{level_1.title}}</a></li>
+ <li><a class="link-no-decoration" href="{{level_1.href}}{{ext}}">{{level_1.title}}</a></li>
{% else %}
- <li><a href="{{level_1.href}}{{ext}}" target="{{level_1.target}}">{{level_1.title}}</a></li>
+ <li><a class="link-no-decoration" href="{{level_1.href}}{{ext}}" target="{{level_1.target}}">{{level_1.title}}</a></li>
{% endif %}
{% else %}
{% if level_1.target == null %}
- <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>
+ <li><a class="link-no-decoration" 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="{{icon_style}} {{icon_family}}-{{level_1.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_1.title}}</a></li>
+ <li><a class="link-no-decoration" 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 %}
{% if level_1.dropdown %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [submenu level 2 (dropdown) detected] -->
<li>
{% if level_1.icon == null %}
- <a href="#">{{level_1.title}}</a>
+ <span>{{level_1.title}}</span>
{% else %}
- <a href="#"><i class="{{icon_style}} {{icon_family}}-{{level_1.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_1.title}}</a>
+ <span><i class="{{icon_style}} {{icon_family}}-{{level_1.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_1.title}}</span>
{% endif %}
<ul>
{% for level_2 in level_1.dropdown %}
{% if level_2.dropdown == null %}
{% if level_2.icon == null %}
{% if level_2.target == null %}
- <li><a href="{{level_2.href}}{{ext}}">{{level_2.title}}</a></li>
+ <li><a class="link-no-decoration" href="{{level_2.href}}{{ext}}">{{level_2.title}}</a></li>
{% else %}
- <li><a href="{{level_2.href}}{{ext}}" target="{{level_2.target}}">{{level_2.title}}</a></li>
+ <li><a class="link-no-decoration" href="{{level_2.href}}{{ext}}" target="{{level_2.target}}">{{level_2.title}}</a></li>
{% endif %}
{% else %}
{% if level_2.target == null %}
- <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>
+ <li><a class="link-no-decoration" 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="{{icon_style}} {{icon_family}}-{{level_2.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_2.title}}</a></li>
+ <li><a class="link-no-decoration" 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 %}
{% if level_2.dropdown %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [submenu level 3 detected (last level supported)] -->
<li>
{% if level_2.icon == null %}
- <a href="#" >{{level_2.title}}</a>
+ <span>{{level_2.title}}</span>
{% else %}
- <a href="#" ><i class="{{icon_style}} {{icon_family}}-{{level_2.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_2.title}}</a>
+ <span><i class="{{icon_style}} {{icon_family}}-{{level_2.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_2.title}}</span>
{% endif %}
<ul>
{% for level_3 in level_2.dropdown %}
{% if level_2.icon == null %}
{% if level_3.target == null %}
- <li><a href="{{level_3.href}}{{ext}}">{{level_3.title}}</a></li>
+ <li><a class="link-no-decoration" href="{{level_3.href}}{{ext}}">{{level_3.title}}</a></li>
{% else %}
- <li><a href="{{level_3.href}}{{ext}}" target="{{level_3.target}}">{{level_3.title}}</a></li>
+ <li><a class="link-no-decoration" href="{{level_3.href}}{{ext}}" target="{{level_3.target}}">{{level_3.title}}</a></li>
{% endif %}
{% else %}
{% if level_3.target == null %}
- <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>
+ <li><a class="link-no-decoration" 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="{{icon_style}} {{icon_family}}-{{level_3.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{level_3.title}}</a></li>
+ <li><a class="link-no-decoration" 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 %}
{% endfor %} <!-- [INFO ] [~/assets/data/mmenu.html ] [end processing: level 3] -->
</ul>
@@ -226,11 +226,11 @@
{% assign columns = menu.megamenu | size %}
{% assign columns_width_md = 12 | divided_by:columns %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [Calculated size of mm_columns: {{columns_width_md}}] -->
<li>
- <a href="#" >{{menu.item}} </a>
+ <a class="link-no-decoration" href="#" >{{menu.item}} </a>
<ul>
<li>
<div class="row">
{% for megabox in menu.megamenu %}
<div class="col-menu col-md-{{columns_width_md}} col-sm-6">
@@ -245,13 +245,13 @@
{% endif %}
<div class="content">
<ul class="menu-col">
{% for links in megabox.column %}
{% if links.icon == null %}
- <li class="dropdown-megamenu-item"><a href="{{links.href}}{{ext}}" target="{{links.target}}">{{links.title}}</a></li>
+ <li class="dropdown-megamenu-item"><a class="link-no-decoration" 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="{{icon_style}} {{icon_family}}-{{links.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{links.title}}</a></li>
+ <li class="dropdown-megamenu-item"><a class="link-no-decoration" 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>
</div>
</div>
@@ -271,20 +271,20 @@
{% when 'top_level_item' %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [found menu-type: menu-top-level-only] -->
{% if menu.icon == null %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [no icon for menu-item found -->
{% if menu.target == null %}
- <li> <a href="{{menu.href}}{{ext}}">{{menu.item}}</a> </li>
+ <li> <a class="link-no-decoration" href="{{menu.href}}{{ext}}">{{menu.item}}</a> </li>
{% else %}
- <li> <a href="{{menu.href}}{{ext}}" target="{{menu.target}}">{{menu.item}}</a> </li>
+ <li> <a class="link-no-decoration" href="{{menu.href}}{{ext}}" target="{{menu.target}}">{{menu.item}}</a> </li>
{% endif %}
{% elsif menu.icon %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [no icon for menu-item found -->
{% if menu.target == null %}
- <li> <a href="{{menu.href}}{{ext}}"><i class="{{icon_style}} {{icon_family}}-{{menu.icon}} {{icon_size}}"></i> {{menu.item}}</a> </li>
+ <li> <a class="link-no-decoration" 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="{{icon_style}} {{icon_family}}-{{menu.icon}} {{icon_size}}"></i> {{menu.item}}</a> </li>
+ <li> <a class="link-no-decoration" 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] -->
{% endif %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [menu-top-level-only: end menu] -->
@@ -295,41 +295,41 @@
{% comment %} Collect items having a LOGIN menu (disabled for now)
------------------------------------------------------------------------ {% endcomment %}
{% when 'auth_client' %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [found menu-type: auth_client] -->
<li id="menuBarSignInOut" class="dropdown nav-item">
- <a href="#">{{menu.item}} </a>
+ <span>{{menu.item}}</span>
<ul>
{% assign item_found = 'false' %}
{% for item in menu.auth_client %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [START: check signin] -->
{% if item.mode == 'signin' %}
<li>
- <a href="#" data-bs-toggle="modal" data-bs-target="#modalOmniSignIn"><i class="{{icon_style}} {{icon_family}}-{{item.icon}} {{icon_size}}"></i>{{item.title}}</a>
+ <a class="link-no-decoration" href="#" data-bs-toggle="modal" data-bs-target="#modalOmniSignIn"><i class="{{icon_style}} {{icon_family}}-{{item.icon}} {{icon_size}}"></i>{{item.title}}</a>
</li>
{% assign item_found = 'true' %}
{% endif %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [END: check signin] -->
<!-- [INFO ] [~/assets/data/mmenu.html ] [START: check signout] -->
{% if item.mode == 'signout' %}
<li>
- <a href="#" data-bs-toggle="modal" data-bs-target="#modalOmniSignOut"><i class="{{icon_style}} {{icon_family}}-{{item.icon}} {{icon_size}}"></i>{{item.title}}</a>
+ <a class="link-no-decoration" href="#" data-bs-toggle="modal" data-bs-target="#modalOmniSignOut"><i class="{{icon_style}} {{icon_family}}-{{item.icon}} {{icon_size}}"></i>{{item.title}}</a>
</li>
{% assign item_found = 'true' %}
{% endif %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [END: check signout] -->
{% if item_found == 'false' %}
<!-- [FATAL ] [~/assets/data/mmenu.html ] [no valid menu item config found] -->
<li>
{% if item.title %}
- <a href="#" >Invalid: {{item.title}}</a>
+ <a class="link-no-decoration" href="#" >Invalid: {{item.title}}</a>
{% else %}
- <a href="#" >Item invalid</a>
+ <a class="link-no-decoration" href="#" >Item invalid</a>
{% endif %}
</li>
{% endif %}
{% endfor %}
@@ -343,11 +343,11 @@
---------------------------------------------------------------------- {% endcomment %}
{% when 'theme_select' %}
{% if themer_options.enabled %}
<!-- [INFO ] [~/assets/data/mmenu.html ] [found menu-type: theme_select] -->
<li>
- <a href="#">{{menu.item}} </a>
+ <span id="themes_mmenu" style="display: block">{{menu.item}}</span>
{% if nav_menu_animation %}
<ul>
<!-- ul class="dropdown-menu data-in="{{nav_menu_animation}}" data-out="{{nav_menu_animation}}" -->
{% else %}
<ul>
@@ -355,35 +355,35 @@
{% assign item_found = 'false' %}
{% for item in menu.theme_select %}
<!-- check for locally loaded J1 Themes -->
{% if item.local_themes and item.local_themes == 'enabled' %}
<li>
- <a href="#"><i class="{{icon_family}} {{icon_family}}-{{item.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{item.title}}</a>
+ <span><i class="{{icon_family}} {{icon_family}}-{{item.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{item.title}}</span>
<ul id="local_themes_mmenu"></ul>
</li>
{% assign item_found = 'true' %}
{% endif %} <!-- end J1 theme selector -->
<!-- check for remotely loaded (BootSwatch) Themes -->
{% if item.bootswatch_themes and item.bootswatch_themes == 'enabled' %}
<li>
- <a href="#"><i class="{{icon_family}} {{icon_family}}-{{item.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{item.title}}</a>
+ <span><i class="{{icon_family}} {{icon_family}}-{{item.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{item.title}}</span>
<ul id="remote_themes_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="{{icon_family}} {{icon_family}}-{{item.icon}} {{icon_size}} {{icon_color}} mr-2"></i> {{item.title}}</a>
+ <a class="link-no-decoration" 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 -->
<!-- fallback if no valid config found -->
{% if item_found == 'false' %}
<li>
{% if item.title %}
- <a href="#" >Invalid: {{item.title}}</a>
+ <span>Invalid: {{item.title}}</span>
{% else %}
- <a href="#" >Item invalid</a>
+ <span>Item invalid</span>
{% endif %}
</li>
{% endif %} <!-- end fallback -->
{% endfor %}
</ul>