Merge branch 'master' of https://github.com/unacms/una

install/sql/system.sql

@@ -4891,6 +4891,7 @@ CREATE TABLE IF NOT EXISTS `sys_menu_items` (
   `config_api` text NOT NULL,
   `primary` tinyint(4) NOT NULL DEFAULT '0',
   `collapsed` tinyint(4) NOT NULL DEFAULT '0',
+  `persistent` tinyint(4) NOT NULL DEFAULT '0',
   `active` tinyint(4) NOT NULL DEFAULT '1',
   `active_api` tinyint(4) NOT NULL DEFAULT '0',
   `copyable` tinyint(4) NOT NULL DEFAULT '1',

modules/base/profile/classes/BxBaseModProfileMenuViewActionsAll.php

@@ -76,8 +76,10 @@ class BxBaseModProfileMenuViewActionsAll extends BxBaseModGeneralMenuViewActions
                 'iid' => $iInitiatorProfile,
                 'cid' => $iContentProfile,
                 'title' => $sTitle,
-                'primary' => !empty($aItem['primary']),
-            ]
+                'primary' => $aItem['primary'],
+                
+            ],
+            'persistent' => $aItem['persistent']
         ];
     }
 
@@ -243,6 +245,7 @@ class BxBaseModProfileMenuViewActionsAll extends BxBaseModGeneralMenuViewActions
                 'on_callback' => 'redirect'
             ],
             'primary' => $aItem['primary'],
+            'persistent' => $aItem['persistent'],
         ];
     }
 }

modules/boonex/english/data/langs/system/en.xml

@@ -1246,6 +1246,8 @@
 	<string name="_adm_nav_txt_all_modules"><![CDATA[All Modules]]></string>
         <string name="_adm_nav_txt_items_area_label"><![CDATA[Text for 'area-label' attribute]]></string>
         <string name="_adm_nav_txt_items_collapsed"><![CDATA[Collapsed]]></string>
+    <string name="_adm_nav_txt_items_persistent"><![CDATA[Persistant]]></string>
+    
 	<string name="_adm_nav_txt_items_create_popup"><![CDATA[Add New Item]]></string>
 	<string name="_adm_nav_txt_items_edit_popup"><![CDATA[Edit {0} Item]]></string>
 	<string name="_adm_nav_txt_items_gl_icon"><![CDATA[Icon]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -1229,6 +1229,7 @@
 	<string name="_adm_nav_txt_all_modules"><![CDATA[Все модули]]></string>
         <string name="_adm_nav_txt_items_area_label"><![CDATA[Текст для атрибута 'area-label']]></string>
         <string name="_adm_nav_txt_items_collapsed"><![CDATA[Свёрнуто]]></string>
+    <string name="_adm_nav_txt_items_persistent"><![CDATA[Показывать постоянно]]></string>
 	<string name="_adm_nav_txt_items_create_popup"><![CDATA[Добавить новый элемент]]></string>
 	<string name="_adm_nav_txt_items_edit_popup"><![CDATA[Редактировать {0} элемент]]></string>
 	<string name="_adm_nav_txt_items_gl_icon"><![CDATA[Иконка]]></string>

studio/template/scripts/BxBaseStudioNavigationItems.php

@@ -843,6 +843,17 @@ class BxBaseStudioNavigationItems extends BxDolStudioNavigationItems
                         'pass' => 'Int',
                     )
                 ),
+                'persistent' => array(
+                    'type' => 'switcher',
+                    'name' => 'persistent',
+                    'caption' => _t('_adm_nav_txt_items_persistent'),
+                    'info' => '',
+                    'value' => '1',
+                    'checked' => isset($aItem['persistent']) && (int)$aItem['persistent'] == 1,
+                    'db' => array (
+                        'pass' => 'Int',
+                    )
+                ),
                 'active_api' => array(
                     'type' => 'switcher',
                     'name' => 'active_api',

template/scripts/BxBaseMenu.php

@@ -207,6 +207,7 @@ class BxBaseMenu extends BxDolMenu
                 'addon' => $this->_bDisplayAddons ? $this->_getMenuAddon($a) : '',
                 'config' => isset($a['config_api']) ? $a['config_api'] : '',
                 'primary' => isset($a['primary']) ? $a['primary'] : 0,
+                'persistent' => isset($a['persistent']) ? $a['persistent'] : 0,
             ];
 
             if(($aMarkers = $this->_getMenuMarkers($a)) && is_array($aMarkers))