Ticket #2833

inc/classes/BxDolMenu.php

@@ -81,6 +81,7 @@ class BxDolMenu extends BxDolFactory implements iBxDolFactoryObject, iBxDolRepla
     protected static $SEL_NAME = '';
 
     protected $_bDynamicMode;
+    protected $_bAddNoFollow;
 
     protected $_sSelModule;
     protected $_sSelName;
@@ -100,6 +101,7 @@ class BxDolMenu extends BxDolFactory implements iBxDolFactoryObject, iBxDolRepla
         parent::__construct();
 
         $this->_bDynamicMode = false;
+        $this->_bAddNoFollow = getParam('sys_add_nofollow') == 'on';
 
         $this->_sObject = isset($aObject['object']) ? $aObject['object'] : 'bx-menu-obj-' . time() . rand(0, PHP_INT_MAX);
         $this->_aObject = $aObject;

modules/base/profile/template/menu_main_submenu.html

@@ -1,6 +1,6 @@
 <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
-        <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">__title__</a>__popup__</li>
+        <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a>__popup__</li>
     </bx_repeat:menu_items>
 </ul>
 __js_code__

modules/boonex/decorous/data/template/system/menu_toolbar.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-toolbar bx-menu-object-__object__">
     <bx_repeat:menu_items>
         <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ bx-def-padding-thd-leftright __class_add__">
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" class="bx-def-font-contrasted __class_add_a__"><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright">__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon></a>
+            <a href="__link__" onclick="__onclick__" class="bx-def-font-contrasted __class_add_a__"__attrs__><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright">__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon></a>
         </li>
     </bx_repeat:menu_items>
 </ul>

modules/boonex/developer/template/menu_main.html

@@ -3,7 +3,7 @@
         <ul class="bx-menu-ver">        
             <bx_repeat:menu_items>
                 <li class="bx-def-round-corners bx-def-margin-sec-bottom __class_add__">
-                    <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title__">
+                    <a href="__link__" onclick="__onclick__" title="__title__"__attrs__>
                         <div class="bx-dev-mm-item">
                             <bx_if:icon>
                             	<img src="<bx_icon_url:mi-empty.png />" />

modules/boonex/lucid/data/template/bx_events/menu_main_submenu.html

@@ -2,7 +2,7 @@
     <div class="bx-menu-main-submenu-group">
         <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ bx-clearfix">
             <bx_repeat:menu_items>
-                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
+                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
             </bx_repeat:menu_items>
         </ul>
         <div class="bx-menu-main-submenu-hr"></div>

modules/boonex/lucid/data/template/bx_groups/menu_main_submenu.html

@@ -2,7 +2,7 @@
     <div class="bx-menu-main-submenu-group">
         <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ bx-clearfix">
             <bx_repeat:menu_items>
-                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
+                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
             </bx_repeat:menu_items>
         </ul>
         <div class="bx-menu-main-submenu-hr"></div>

modules/boonex/lucid/data/template/bx_organizations/menu_main_submenu.html

@@ -2,7 +2,7 @@
     <div class="bx-menu-main-submenu-group">
         <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ bx-clearfix">
             <bx_repeat:menu_items>
-                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
+                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
             </bx_repeat:menu_items>
         </ul>
         <div class="bx-menu-main-submenu-hr"></div>

modules/boonex/lucid/data/template/bx_persons/menu_main_submenu.html

@@ -2,7 +2,7 @@
     <div class="bx-menu-main-submenu-group">
         <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ bx-clearfix">
             <bx_repeat:menu_items>
-                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
+                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
             </bx_repeat:menu_items>
         </ul>
         <div class="bx-menu-main-submenu-hr"></div>

modules/boonex/lucid/data/template/bx_spaces/menu_main_submenu.html

@@ -2,7 +2,7 @@
     <div class="bx-menu-main-submenu-group">
         <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ bx-clearfix">
             <bx_repeat:menu_items>
-                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
+                <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-leftright bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a><div class="bx-mms-item-hr"></div>__popup__</li>
             </bx_repeat:menu_items>
         </ul>
         <div class="bx-menu-main-submenu-hr"></div>

modules/boonex/lucid/data/template/system/menu_dropdown.html

@@ -16,7 +16,7 @@
 	            <ul class="cd-secondary-dropdown is-hidden">
                         <li class="go-back"><a href="#0">Menu</a></li>
                         <bx_repeat:profile_submenu_items>
-	                    <li><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">__title__</a></li>
+	                    <li><a href="__link__" onclick="__onclick__"__attrs__>__title__</a></li>
 	                </bx_repeat:profile_submenu_items>
                     </ul>
 	        </li>

modules/boonex/lucid/data/template/system/menu_dropdown_site.html

@@ -1,6 +1,6 @@
 <bx_repeat:menu_items>
     <li class="__class_add__">
-        <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+        <a href="__link__" onclick="__onclick__"__attrs__>
             <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
             <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
             <span>__title__</span>
@@ -9,7 +9,7 @@
             <ul class="cd-secondary-dropdown is-hidden">
                 <li class="go-back"><a href="javascript:void(0)">Menu</a></li>
                 <bx_repeat:submenu_items>
-                    <li><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">__title__</a></li>
+                    <li><a href="__link__" onclick="__onclick__"__attrs__>__title__</a></li>
                 </bx_repeat:submenu_items>
             </ul>
         </bx_if:show_submenu>

modules/boonex/lucid/data/template/system/menu_floating_blocks_big.html

@@ -1,7 +1,7 @@
 
 <ul class="bx-menu-floating-blocks-big bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items><li class="bx-def-box-sizing __class_add__">
-        <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+        <a href="__link__" onclick="__onclick__"__attrs__>
             <div class="bx-menu-floating-blocks-icon">
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>

modules/boonex/lucid/data/template/system/menu_main_submenu.html

@@ -2,7 +2,7 @@
 	<div class="bx-menu-main-submenu-group">
 		<ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ bx-clearfix">
 		    <bx_repeat:menu_items>
-		        <li class="bx-def-padding-sec-right bx-def-padding-sec-left __class_add__"><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__"><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img src="__icon_url__" /></bx_if:image><span>__title__</span></a><div class="bx-mms-item-hr"></div></li>
+		        <li class="bx-def-padding-sec-right bx-def-padding-sec-left __class_add__"><a href="__link__" onclick="__onclick__"__attrs__><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img src="__icon_url__" /></bx_if:image><span>__title__</span></a><div class="bx-mms-item-hr"></div></li>
 		    </bx_repeat:menu_items>
 		</ul>
 		<div class="bx-menu-main-submenu-hr"></div>

modules/boonex/lucid/data/template/system/menu_toolbar.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-toolbar bx-menu-object-__object__">
     <bx_repeat:menu_items>
         <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ bx-def-padding-sec __class_add__">
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" class="bx-def-font-contrasted __class_add_a__"><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-left-auto">__title__</span></bx_if:title></a>
+            <a href="__link__" onclick="__onclick__" class="bx-def-font-contrasted __class_add_a__"__attrs__><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-left-auto">__title__</span></bx_if:title></a>
         </li>
     </bx_repeat:menu_items>
 </ul>

modules/boonex/notifications/template/menu_preview_item.html

@@ -1,5 +1,5 @@
 <span class="bx-ntfs-preview-item bx-def-margin-sec-topbottom">
-    <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+    <a href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
         <bx_if:title>__title__</bx_if:title>
     </a>
 </span>

modules/boonex/protean/data/template/system/menu_toolbar.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-toolbar bx-menu-object-__object__">
     <bx_repeat:menu_items>
         <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ bx-def-padding-thd-leftright __class_add__">
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" class="bx-def-font-contrasted"><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright">__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon></a>
+            <a href="__link__" onclick="__onclick__" class="bx-def-font-contrasted"__attrs__><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright">__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon></a>
         </li>
     </bx_repeat:menu_items>
 </ul>

modules/boonex/timeline/template/menu_custom_item_hor.html

@@ -1,4 +1,4 @@
 <span class="__class_wrp__ bx-def-margin-thd-topbottom">
-    <a class="__class_link__" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__"><span class="bx-def-valign-center"><bx_if:icon><span class="bx-menu-item-icon bx-def-align-center"><i class="sys-icon __icon__"></i></span></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image><bx_if:title><span class="bx-menu-item-title bx-def-margin-sec-left-auto">__title__</span></bx_if:title></span></a>
+    <a class="__class_link__" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__><span class="bx-def-valign-center"><bx_if:icon><span class="bx-menu-item-icon bx-def-align-center"><i class="sys-icon __icon__"></i></span></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image><bx_if:title><span class="bx-menu-item-title bx-def-margin-sec-left-auto">__title__</span></bx_if:title></span></a>
     <bx_if:addon>__addon__</bx_if:addon>
 </span>

studio/template/menu_floating_blocks.html

@@ -1,6 +1,6 @@
 <ul class="bx-menu-floating-blocks bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items><li id="bx-menu-item-__name__" class="bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__">
-        <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+        <a href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
             <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
             <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
         </a>

studio/template/menu_side.html

@@ -1,6 +1,6 @@
 <bx_repeat:menu_items>
     <div id="bx-std-pmi-__name__" class="bx-std-pmen-item __class_add__">
-        <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+        <a href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
             <div class="bx-std-pmen-item-cnt">
                 <bx_if:icon>
                     <div class="bx-std-pmen-item-bg"></div>

studio/template/menu_top_toolbar.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-toolbar">
     <bx_repeat:menu_items>
         <li class="bx-menu-tab-__name__  __class_add__">
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" class="bx-def-margin-sec-left bx-def-font-contrasted" title="__title__"><bx_if:icon><i class="sys-icon __icon__ bx-def-round-corners bx-def-font-contrasted"></i></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image></a>
+            <a href="__link__" onclick="__onclick__" class="bx-def-margin-sec-left bx-def-font-contrasted" title="__title__"__attrs__><bx_if:icon><i class="sys-icon __icon__ bx-def-round-corners bx-def-font-contrasted"></i></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image></a>
         </li>
     </bx_repeat:menu_items>
 </ul>

template/menu_account_notifications.html

@@ -3,7 +3,7 @@
         <li class="bx-menu-item-__name__ bx-def-border-bottom bx-def-padding-sec-top bx-def-padding-sec-bottom __class_add__">
             <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
             <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__"><span>__title__</span></a>
+            <a href="__link__" onclick="__onclick__"__attrs__><span>__title__</span></a>
             <bx_if:addon>__addonf__</bx_if:addon>
         </li>
     </bx_repeat:menu_items>

template/menu_buttons_hor.html

@@ -1,5 +1,5 @@
 <ul class="bx-menu-btns-hor bx-menu-object-__object__ bx-clearfix">
-    <bx_repeat:menu_items><li class="bx-menu-item __name__ bx-def-margin-thd-topbottom __class_add__"><a class="bx-btn __name__ bx-def-margin-right" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+    <bx_repeat:menu_items><li class="bx-menu-item __name__ bx-def-margin-thd-topbottom __class_add__"><a class="bx-btn __name__ bx-def-margin-right" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
         <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
         <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
         <bx_if:title><u>__title__</u></bx_if:title>

template/menu_buttons_hor_item.html

@@ -1,4 +1,4 @@
-<a class="bx-btn bx-def-margin-right" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+<a class="bx-btn bx-def-margin-right" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
     <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
     <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
 </a>

template/menu_buttons_icon_hor.html

@@ -1,5 +1,5 @@
 <ul class="bx-menu-btns-icon-hor bx-menu-object-__object__ bx-clearfix">
-    <bx_repeat:menu_items><li class="bx-menu-item __name__ bx-def-margin-thd-topbottom __class_add__"><a class="bx-btn __name__ bx-def-margin-right" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+    <bx_repeat:menu_items><li class="bx-menu-item __name__ bx-def-margin-thd-topbottom __class_add__"><a class="bx-btn __name__ bx-def-margin-right" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
         <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
         <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
     </a></li></bx_repeat:menu_items>

template/menu_buttons_icon_hor_item.html

@@ -1,4 +1,4 @@
-<a class="bx-btn bx-def-margin-right" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+<a class="bx-btn bx-def-margin-right" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
     <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
     <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
     <bx_if:title><u>__title__</u></bx_if:title>

template/menu_buttons_ver.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-btns-ver bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
         <li class="bx-def-margin-thd-topbottom __class_add__">
-            <a class="bx-btn bx-def-margin-right" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+            <a class="bx-btn bx-def-margin-right" href="__link__" onclick="__onclick__"__attrs__>
                 <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <u>__title__</u>

template/menu_custom_item.html

@@ -1,4 +1,4 @@
 <span class="__class_wrp__ bx-def-margin-thd-topbottom">
-    <a class="__class_link__" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__"><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image><bx_if:title><span class="bx-def-margin-sec-left-auto">__title__</span></bx_if:title></a>
+    <a class="__class_link__" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image><bx_if:title><span class="bx-def-margin-sec-left-auto">__title__</span></bx_if:title></a>
     <bx_if:addon>__addon__</bx_if:addon>
 </span>

template/menu_floating_blocks.html

@@ -1,7 +1,7 @@
 
 <ul class="bx-menu-floating-blocks bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items><li class="bx-def-round-corners bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__">
-        <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+        <a href="__link__" onclick="__onclick__"__attrs__>
             <div class="bx-menu-floating-blocks-icon">
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>

template/menu_floating_blocks_big.html

@@ -1,7 +1,7 @@
 
 <ul class="bx-menu-floating-blocks-big bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items><li class="bx-def-round-corners bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__">
-        <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+        <a href="__link__" onclick="__onclick__"__attrs__>
             <div class="bx-menu-floating-blocks-icon">
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>

template/menu_floating_blocks_dash.html

@@ -2,7 +2,7 @@
     <bx_repeat:menu_items>
         <li class=" bx-def-margin-bottom">
             <div class="bx-menu-floating-blocks-dash-item bx-def-padding-sec bx-def-margin-sec-leftright bx-def-round-corners bx-def-color-bg-hl-hover bx-def-box bx-def-box-sizing __class_add__">
-                <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+                <a href="__link__" onclick="__onclick__"__attrs__>
                     <div class="bx-menu-floating-blocks-icon bx-def-margin-sec-right">
                             <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                             <bx_if:image><img style="background-image:url(__icon_url__)" src="><bx_icon_url:spacer.gif />" /></bx_if:image>

template/menu_floating_blocks_wide.html

@@ -1,7 +1,7 @@
 
 <ul class="bx-menu-floating-blocks-wide bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ bx-def-round-corners bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__">
-        <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+        <a href="__link__" onclick="__onclick__"__attrs__>
             <div class="bx-menu-floating-blocks-icon">
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>

template/menu_footer.html

@@ -1,7 +1,7 @@
 <ul id="bx-menu-footer" class="bx-menu-hor bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
         <li class="bx-def-margin-right-auto __class_add__">
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+            <a href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
                 <bx_if:image><img title="__title_attr__" src="__icon_url__" /></bx_if:image>
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <bx_if:title>__title__</bx_if:title>

template/menu_horizontal.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-hor bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
         <li class="bx-def-margin-right-auto __class_add__">
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__"><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image><bx_if:title><span>__title__</span></bx_if:title></a>
+            <a href="__link__" onclick="__onclick__"__attrs__><bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image><bx_if:title><span>__title__</span></bx_if:title></a>
         </li>
     </bx_repeat:menu_items>
 </ul>

template/menu_inline.html

@@ -1,7 +1,7 @@
 <ul id="bx-menu-inline" class="bx-menu-hor bx-menu-hor-inline bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
         <li class="bx-def-margin-left-auto __class_add__">
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title__">
+            <a href="__link__" onclick="__onclick__" title="__title__"__attrs__>
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
             </a>

template/menu_inline_sbtn.html

@@ -1,7 +1,7 @@
 <ul id="bx-menu-inline" class="bx-menu-hor bx-menu-hor-inline-sbtn bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
         <li class="bx-def-margin-thd-left-auto __class_add__">
-            <a class="bx-def-padding-sec-leftright" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title__">
+            <a class="bx-def-padding-sec-leftright" href="__link__" onclick="__onclick__" title="__title__"__attrs__>
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
             </a>

template/menu_interactive.html

@@ -7,7 +7,7 @@
             <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom __class__" title="__title_attr__">__title__</div>
         </li>
         <li id="__id__-pas" class="bx-menu-inter-pas bx-def-round-corners bx-def-color-bg-hl-hover __class_wrp_pas__">
-            <a id="__id__" class="__class__" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+            <a id="__id__" class="__class__" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
                 <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom">__title__</div>
             </a>
         </li>

template/menu_interactive_vertical.html

@@ -4,7 +4,7 @@
             <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom __class__" title="__title_attr__">__title__</div>
         </li>
         <li id="__name__-pas" class="bx-menu-inter-pas bx-def-round-corners bx-def-color-bg-hl-hover __class_wrp_pas__">
-            <a id="__name__" class="__class__" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__" title="__title_attr__">
+            <a id="__name__" class="__class__" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
                 <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom">__title__</div>
             </a>
         </li>

template/menu_main_submenu.html

@@ -1,5 +1,5 @@
 <ul id="bx-menu-main-submenu" class="bx-menu-main-submenu bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
-        <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover __class_add__"><a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">__title__</a></li>
+        <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover __class_add__"><a href="__link__" onclick="__onclick__"__attrs__>__title__</a></li>
     </bx_repeat:menu_items>
 </ul>

template/menu_profile_stats.html

@@ -2,7 +2,7 @@
     <bx_repeat:menu_items>
         <li class="bx-menu-item-__name__ bx-def-round-corners bx-def-hr bx-def-color-bg-hl-hover __class_add__">
             <div class="bx-menu-item-cnt bx-def-padding-thd-topbottom bx-def-padding-sec-leftright">
-                <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+                <a href="__link__" onclick="__onclick__"__attrs__>
                     <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                     <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
                     <span class="bx-def-margin-sec-left-auto">__title__</span>

template/menu_toolbar.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-toolbar bx-menu-object-__object__">
     <bx_repeat:menu_items>
         <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ bx-def-padding-thd-leftright bx-def-color-bg-hl-hover __class_add__">
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__"><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright bx-def-font-contrasted">__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon></a>
+            <a href="__link__" onclick="__onclick__"__attrs__><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright bx-def-font-contrasted">__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon><bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a><bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image><bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon></a>
         </li>
     </bx_repeat:menu_items>
 </ul>

template/menu_vertical.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-ver bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
         <li class="bx-menu-item __name__ bx-def-round-corners bx-def-color-bg-hl-hover __class_add__">
-            <a class="__name__" href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+            <a class="__name__" href="__link__" onclick="__onclick__"__attrs__>
                 <div class="bx-def-padding-sec">
                     <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon><bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image><span>__title__</span>
                 </div>

template/menu_vertical_lite.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-verlit bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
         <li class="bx-def-margin-sec-top __class_add__">
-            <a href="__link__"<bx_if:show_target> target="__target__"</bx_if:show_target> onclick="__onclick__">
+            <a href="__link__" onclick="__onclick__"__attrs__>
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
                 <bx_if:image><img class="bx-def-margin-sec-right" style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
                 __title__

template/scripts/BxBaseMenu.php

@@ -175,12 +175,7 @@ class BxBaseMenu extends BxDolMenu
         $a['link'] = isset($a['link']) ? $this->_oPermalinks->permalink($a['link']) : 'javascript:void(0);';
         $a['title_attr'] = bx_html_attribute(strip_tags($a['title']));
 
-        $bTmplVarsTarget = !empty($a['target']);
-        $aTmplVarsTarget = $bTmplVarsTarget ? array('target' => $a['target']) : array();
-        $a['bx_if:show_target'] = array(
-            'condition' => $bTmplVarsTarget,
-            'content' => $aTmplVarsTarget,
-        );
+        $a['attrs'] = $this->_getMenuAttrs($a);
 
         $a['bx_if:image'] = array (
             'condition' => (bool)$sIconUrl,
@@ -245,6 +240,18 @@ class BxBaseMenu extends BxDolMenu
 
         return BxDolService::callSerialized($aMenuItem['addon'], $this->_aMarkers);
     }
+    
+    protected function _getMenuAttrs ($aMenuItem)
+    {
+        $sAttrs = '';
+        if(!empty($aMenuItem['target']))
+            $sAttrs .= ' target="' . $aMenuItem['target'] . '"';
+
+        if($this->_bAddNoFollow && !empty($aMenuItem['link']) && preg_match('@^https?://@', $aMenuItem['link']) && strncmp($aMenuItem['link'], BX_DOL_URL_ROOT, strlen(BX_DOL_URL_ROOT)) !== 0)
+            $sAttrs .= ' rel="noreferrer"';
+
+        return $sAttrs;
+    }
 
     /**
      * Add css/js files which are needed for menu display and functionality.

template/scripts/BxBaseMenuInteractive.php

@@ -79,12 +79,7 @@ class BxBaseMenuInteractive extends BxTemplMenu
             $a['title'] = _t($a['title']);
             $a['title_attr'] = isset($a['title_attr']) ? bx_html_attribute($a['title_attr']) : '';
 
-            $bTmplVarsTarget = !empty($a['target']);
-            $aTmplVarsTarget = $bTmplVarsTarget ? array('target' => $a['target']) : array();
-            $a['bx_if:show_target'] = array(
-                'condition' => $bTmplVarsTarget,
-                'content' => $aTmplVarsTarget,
-            );
+            $a['attrs'] = $this->_getMenuAttrs($a);
 
             $a['bx_if:show_divider'] = array (
             	'condition' => $this->_bShowDivider,