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

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

@@ -187,6 +187,8 @@
 
     <string name="_bx_timeline_menu_title_item_actions"><![CDATA[Элемент - Действия]]></string>
     <string name="_bx_timeline_menu_set_title_item_actions"><![CDATA[Элемент - Действия]]></string>
+    <string name="_bx_timeline_menu_title_item_actions_all"><![CDATA[Элемент - Все действия]]></string>
+    <string name="_bx_timeline_menu_set_title_item_actions_all"><![CDATA[Элемент - Все действия]]></string>
     <string name="_bx_timeline_menu_title_item_counters"><![CDATA[Элемент - Счетчики]]></string>
     <string name="_bx_timeline_menu_set_title_item_counters"><![CDATA[Элемент - Счетчики]]></string>
     <string name="_bx_timeline_menu_item_title_system_item_comment"><![CDATA[Комментарий]]></string>

modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -180,6 +180,7 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
             'menu_view' => $this->_sName . '_menu_view',
             'menu_item_manage' => $this->_sName . '_menu_item_manage',
             'menu_item_actions' => $this->_sName . '_menu_item_actions',
+            'menu_item_actions_all' => $this->_sName . '_menu_item_actions_all',
             'menu_item_counters' => $this->_sName . '_menu_item_counters',
             'menu_item_meta' => $this->_sName . '_menu_item_meta',
             'menu_post_attachments' => $this->CNF['OBJECT_MENU_ENTRY_ATTACHMENTS'],

modules/boonex/timeline/classes/BxTimelineMenuItemActions.php

@@ -17,6 +17,7 @@ class BxTimelineMenuItemActions extends BxTemplMenuCustom
     protected static $_sModeActions = 'actions';
     protected static $_sModeCounters = 'counters';
 
+    protected $_sModule;
     protected $_oModule;
 
     protected $_iEvent;
@@ -34,7 +35,8 @@ class BxTimelineMenuItemActions extends BxTemplMenuCustom
 
     public function __construct($aObject, $oTemplate = false)
     {
-        $this->_oModule = BxDolModule::getInstance('bx_timeline');
+        $this->_sModule = 'bx_timeline';
+        $this->_oModule = BxDolModule::getInstance($this->_sModule);
 
         parent::__construct($aObject, $this->_oModule->_oTemplate);
 
@@ -99,6 +101,11 @@ class BxTimelineMenuItemActions extends BxTemplMenuCustom
     	$this->setEvent($aEvent, $aBrowseParams);
     }
 
+    public function setTemplateNameItem($sName)
+    {
+        $this->_sTmplNameItem = $sName;
+    }
+
     protected function _setBrowseParams($aBrowseParams = array())
     {
         $this->_sType = !empty($aBrowseParams['type']) ? $aBrowseParams['type'] : BX_TIMELINE_TYPE_DEFAULT;

modules/boonex/timeline/classes/BxTimelineMenuItemActionsAll.php

@@ -0,0 +1,153 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    Timeline Timeline
+ * @ingroup     UnaModules
+ *
+ * @{
+ */
+
+class BxTimelineMenuItemActionsAll extends BxTimelineMenuItemActions
+{
+    protected $_aBrowseParams;
+    protected $_aSubmenus;
+
+    public function __construct($aObject, $oTemplate = false)
+    {
+        $this->_sModule = 'bx_timeline';
+
+        parent::__construct($aObject, $oTemplate);
+
+        $this->_aBrowseParams = array();
+
+        $this->_aSubmenus = array(
+            'menu_item_actions' => false,
+            'menu_item_manage' => false
+        );
+    }
+
+    public function addMarkersExt($a)
+    {
+        $bResult = $this->addMarkers($a);
+        if(!$bResult)
+            return $bResult;
+
+        foreach($this->_aSubmenus as $sSubmenu)
+            if(($oSubmenu = $this->_getSubmenu($sSubmenu)) !== false)
+                $oSubmenu->addMarkers($a);
+
+        return $bResult;
+    }
+
+    protected function _setBrowseParams($aBrowseParams = array())
+    {
+        $this->_aBrowseParams = $aBrowseParams;
+
+        parent::_setBrowseParams($aBrowseParams);
+    }
+
+    protected function _getSubmenu($sName)
+    {
+        if(!$this->_aSubmenus[$sName]) {
+            $sObject = $this->_oModule->_oConfig->getObject($sName);
+
+            $this->_aSubmenus[$sName] = BxDolMenu::getObjectInstance($sObject);
+            if(!$this->_aSubmenus[$sName])
+                return false;
+
+            $this->_aSubmenus[$sName]->setTemplateNameItem($this->_sTmplNameItem);
+            $this->_aSubmenus[$sName]->setEvent($this->_aEvent, $this->_aBrowseParams);
+
+            $this->addMarkers($this->_aSubmenus[$sName]->getMarkers());
+        }
+
+        return $this->_aSubmenus[$sName];
+    }
+    
+    /**
+     * Items taken from 'Actions' menu
+     */
+    protected function _getMenuItemItemComment($aItem)
+    {
+        return $this->_getMenuItemByNameActions($aItem);
+    }
+
+    protected function _getMenuItemItemShare($aItem)
+    {
+        return $this->_getMenuItemByNameActions($aItem);
+    }
+    
+
+    /**
+     * Items taken from 'Manage' menu
+     */
+    protected function _getMenuItemItemPin($aItem)
+    {
+        return $this->_getMenuItemByNameManage($aItem);
+    }
+
+    protected function _getMenuItemItemUnpin($aItem)
+    {
+        return $this->_getMenuItemByNameManage($aItem);
+    }
+
+    protected function _getMenuItemItemStick($aItem)
+    {
+        return $this->_getMenuItemByNameManage($aItem);
+    }
+    
+    protected function _getMenuItemItemUnstick($aItem)
+    {
+        return $this->_getMenuItemByNameManage($aItem);
+    }
+
+    protected function _getMenuItemItemPromote($aItem)
+    {
+        return $this->_getMenuItemByNameManage($aItem);
+    }
+    
+    protected function _getMenuItemItemUnpromote($aItem)
+    {
+        return $this->_getMenuItemByNameManage($aItem);
+    }
+    
+    protected function _getMenuItemItemEdit($aItem)
+    {
+        return $this->_getMenuItemByNameManage($aItem);
+    }
+
+    protected function _getMenuItemItemDelete($aItem)
+    {
+        return $this->_getMenuItemByNameManage($aItem);
+    }
+
+    protected function _getMenuItemByNameActions($aItem, $aParams = array())
+    {
+        $oMenuManage = $this->_getSubmenu('menu_item_actions');
+        if(!$oMenuManage)
+            return false;
+
+        $aItem = $oMenuManage->getMenuItem($aItem['name']);
+        if(empty($aItem) || !is_array($aItem))
+            return false;
+
+        return $aItem['item'];
+    }
+
+    protected function _getMenuItemByNameManage($aItem, $aParams = array())
+    {
+        $oMenuManage = $this->_getSubmenu('menu_item_manage');
+        if(!$oMenuManage)
+            return false;
+
+        $aItem = $oMenuManage->getMenuItem($aItem['name']);
+        if(empty($aItem) || !is_array($aItem))
+            return false;
+
+        return $aItem['item'];
+    }
+}
+
+/** @} */

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -1648,7 +1648,9 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
 
     protected function _getTmplVarsMenuItemActions(&$aEvent, $aBrowseParams = array())
     {
-        $oMenu = BxDolMenu::getObjectInstance($this->_oConfig->getObject('menu_item_actions'));
+        $oMenu = BxDolMenu::getObjectInstance($this->_oConfig->getObject('menu_item_actions_all'));
+        if(!$oMenu)
+            $oMenu = BxDolMenu::getObjectInstance($this->_oConfig->getObject('menu_item_actions'));
         $oMenu->setEvent($aEvent, $aBrowseParams);
         $oMenu->setDynamicMode(isset($aBrowseParams['dynamic_mode']) && $aBrowseParams['dynamic_mode'] === true);
 

modules/boonex/timeline/install/langs/en.xml

@@ -187,6 +187,8 @@
 
     <string name="_bx_timeline_menu_title_item_actions"><![CDATA[Item Actions]]></string>
     <string name="_bx_timeline_menu_set_title_item_actions"><![CDATA[Item Actions]]></string>
+    <string name="_bx_timeline_menu_title_item_actions_all"><![CDATA[Item Actions All]]></string>
+    <string name="_bx_timeline_menu_set_title_item_actions_all"><![CDATA[Item Actions All]]></string>
     <string name="_bx_timeline_menu_title_item_counters"><![CDATA[Item Counters]]></string>
     <string name="_bx_timeline_menu_set_title_item_counters"><![CDATA[Item Counters]]></string>
     <string name="_bx_timeline_menu_item_title_system_item_comment"><![CDATA[Comment]]></string>

modules/boonex/timeline/install/sql/disable.sql

@@ -6,7 +6,7 @@ DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_timeline' OR `object` IN('bx
 -- MENU
 DELETE FROM `sys_objects_menu` WHERE `module` = 'bx_timeline';
 DELETE FROM `sys_menu_sets` WHERE `module` = 'bx_timeline';
-DELETE FROM `sys_menu_items` WHERE `module` = 'bx_timeline' OR `set_name` IN('bx_timeline_menu_view', 'bx_timeline_menu_item_share', 'bx_timeline_menu_item_manage', 'bx_timeline_menu_item_actions', 'bx_timeline_menu_item_counters', 'bx_timeline_menu_item_meta', 'bx_timeline_menu_post_attachments');
+DELETE FROM `sys_menu_items` WHERE `module` = 'bx_timeline' OR `set_name` IN('bx_timeline_menu_view', 'bx_timeline_menu_item_share', 'bx_timeline_menu_item_manage', 'bx_timeline_menu_item_actions', 'bx_timeline_menu_item_actions', 'bx_timeline_menu_item_counters', 'bx_timeline_menu_item_meta', 'bx_timeline_menu_post_attachments');
 
 
 -- SETTINGS

modules/boonex/timeline/install/sql/enable.sql

@@ -132,6 +132,31 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_timeline_menu_item_actions', 'bx_timeline', 'item-share', '_bx_timeline_menu_item_title_system_item_share', '_bx_timeline_menu_item_title_item_share', 'javascript:void(0)', 'bx_menu_popup(''bx_timeline_menu_item_share'', this, {''id'':''bx_timeline_menu_item_share_{content_id}''}, {content_id:{content_id}, name:''{name}'', view:''{view}'', type:''{type}''});', '', 'share-alt', '', 'bx_timeline_menu_item_share', 1, 2147483647, 1, 0, 1, 50),
 ('bx_timeline_menu_item_actions', 'bx_timeline', 'item-more', '_bx_timeline_menu_item_title_system_item_more', '_bx_timeline_menu_item_title_item_more', 'javascript:void(0)', 'bx_menu_popup(''bx_timeline_menu_item_manage'', this, {''id'':''bx_timeline_menu_item_manage_{content_id}''}, {content_id:{content_id}, name:''{name}'', view:''{view}'', type:''{type}''});', '', 'ellipsis-h', '', 'bx_timeline_menu_item_manage', 1, 2147483647, 1, 0, 1, 60);
 
+-- MENU: all actions menu for view entry 
+INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
+('bx_timeline_menu_item_actions_all', '_bx_timeline_menu_title_item_actions_all', 'bx_timeline_menu_item_actions_all', 'bx_timeline', 15, 0, 1, 'BxTimelineMenuItemActionsAll', 'modules/boonex/timeline/classes/BxTimelineMenuItemActionsAll.php');
+
+INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
+('bx_timeline_menu_item_actions_all', 'bx_timeline', '_bx_timeline_menu_set_title_item_actions_all', 0);
+
+INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `addon`, `submenu_object`, `submenu_popup`, `visible_for_levels`, `active`, `copyable`, `editable`, `order`) VALUES 
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-view', '_bx_timeline_menu_item_title_system_item_view', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 1, 0),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-comment', '_bx_timeline_menu_item_title_system_item_comment', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 10),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-vote', '_bx_timeline_menu_item_title_system_item_vote', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 1, 20),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-reaction', '_bx_timeline_menu_item_title_system_item_reaction', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 30),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-score', '_bx_timeline_menu_item_title_system_item_score', '', '', '', '', '', '', '', 0, 2147483647, 0, 0, 1, 40),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-share', '_bx_timeline_menu_item_title_system_item_share', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 50),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-pin', '_bx_timeline_menu_item_title_system_item_pin', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 100),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-unpin', '_bx_timeline_menu_item_title_system_item_unpin', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 110),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-stick', '_bx_timeline_menu_item_title_system_item_stick', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 120),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-unstick', '_bx_timeline_menu_item_title_system_item_unstick', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 130),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-promote', '_bx_timeline_menu_item_title_system_item_promote', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 140),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-unpromote', '_bx_timeline_menu_item_title_system_item_unpromote', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 150),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-report', '_bx_timeline_menu_item_title_system_item_report', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 160),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-edit', '_bx_timeline_menu_item_title_system_item_edit', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 170),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'item-delete', '_bx_timeline_menu_item_title_system_item_delete', '', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 180),
+('bx_timeline_menu_item_actions_all', 'bx_timeline', 'more-auto', '_sys_menu_item_title_system_va_more_auto', '_sys_menu_item_title_va_more_auto', 'javascript:void(0)', '', '', 'ellipsis-v', '', '', 0, 2147483647, 1, 0, 1, 9999);
+
 -- MENU: Item Counters (Comments, Votes, Reactions, etc)
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_timeline_menu_item_counters', '_bx_timeline_menu_title_item_counters', 'bx_timeline_menu_item_counters', 'bx_timeline', 15, 0, 1, 'BxTimelineMenuItemCounters', 'modules/boonex/timeline/classes/BxTimelineMenuItemCounters.php');

modules/boonex/timeline/template/css/view.css

@@ -392,16 +392,16 @@ div.bx-tl-item div.bx-tl-item-image {
     display: inline-block;
 }
 
-/*--- Item Activity ---*/
-div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom {
+/*--- Item Activity (Actions and Manage are different menus) ---*/
+div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom:not(.bx-menu-submenu-more-auto) {
     position: relative;
     display: -webkit-flex;
     display: flex;
     -webkit-justify-content: space-around;
     justify-content: space-around;
 }
-div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom::before,
-div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom::after {
+div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom:not(.bx-menu-submenu-more-auto)::before,
+div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom:not(.bx-menu-submenu-more-auto)::after {
     display: none;
 }
 div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom li > a,
@@ -434,21 +434,35 @@ div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom li .bx-menu-item-icon {
 
     font-size: 1.0rem;
 }
-/*
-div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom li .sys-action-do-icon:not(.bx-def-align-center),
-div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom li .bx-menu-item-icon:not(.bx-def-align-center) {
-    display: inline-block;
-
-    text-align: center;
-    line-height: 1.9rem;
-}
-*/
 
 div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom li .sys-action-do-icon .sys-icon,
 div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom li .bx-menu-item-icon .sys-icon {
     vertical-align: top;
 }
 
+/*--- Item Activity (all actions in one menu) ---*/
+div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom.bx-menu-more-auto > li.bx-menu-item {
+    padding: 0;
+    white-space: nowrap;
+}
+div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom.bx-menu-more-auto .bx-popup .bx-menu-custom.bx-menu-submenu-more-auto > li.bx-menu-item  a > span {
+    margin-left: 0;
+}
+div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom.bx-menu-more-auto .bx-popup .bx-menu-custom.bx-menu-submenu-more-auto > li.bx-menu-item  a .bx-menu-item-icon,
+div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom.bx-menu-more-auto .bx-popup .bx-menu-custom.bx-menu-submenu-more-auto > li.bx-menu-item  a .bx-menu-item-icon > .sys-icon {
+    width: 1.0rem;
+    height: 1.0rem;
+
+    background-color: transparent;
+
+    line-height: 1.0rem;
+    font-size: 1.0rem;
+}
+div.bx-tl-item div.bx-tl-item-activity .bx-menu-custom.bx-menu-more-auto .bx-popup .bx-menu-custom.bx-menu-submenu-more-auto > li.bx-menu-item  a .bx-menu-item-title {
+    margin-left: 1.0rem;
+    line-height: 1.5rem;
+}
+
 /*--- Item Style: Timeline ---*/
 div.bx-tl-view-timeline div.bx-tl-items:before {
     content: '';

template/comment_do_comment_label.html

@@ -1 +1 @@
-<bx_if:show_image><img src="__src__" /></bx_if:show_image><bx_if:show_icon><i class="sys-icon __name__"></i></bx_if:show_icon><bx_if:show_text><span class="bx-def-margin-sec-left-auto">__text__</span></bx_if:show_text>
+<span class="sys-action-do __style_prefix__-do bx-def-valign-center"><bx_if:show_image><span class="sys-action-do-image __style_prefix__-do-image bx-def-align-center"><img src="__src__" /></span></bx_if:show_image><bx_if:show_icon><span class="sys-action-do-icon __style_prefix__-do-icon bx-def-align-center"><i class="sys-icon __name__"></i></span></bx_if:show_icon><bx_if:show_text><span class="sys-action-do-text __style_prefix__-do-text bx-def-margin-sec-left-auto">__text__</span></bx_if:show_text></span>

template/comment_element_block.html

@@ -1,5 +1,5 @@
-<div id="__html_id__" class="__style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom" bx_comment_data_count="__count__">
-    <div class="__style_prefix__-do bx-clearfix">
+<div id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom" bx_comment_data_count="__count__">
+    <div class="sys-action-cnt __style_prefix__-cnt bx-clearfix">
         <bx_if:show_do_comment>
             <div class="__style_prefix__-element-holder">__do_comment__</div>
         </bx_if:show_do_comment>

template/comment_element_inline.html

@@ -1,3 +1,3 @@
-<span id="__html_id__" class="__style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom" bx_comment_data_count="__count__">
-    <span class="__style_prefix__-do"><bx_if:show_do_comment><span class="__style_prefix__-element-holder">__do_comment__</span></bx_if:show_do_comment><bx_if:show_counter><span class="__style_prefix__-counter-holder bx-def-margin-thd-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
+<span id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom" bx_comment_data_count="__count__">
+    <span class="sys-action-cnt __style_prefix__-cnt"><bx_if:show_do_comment><span class="__style_prefix__-element-holder">__do_comment__</span></bx_if:show_do_comment><bx_if:show_counter><span class="__style_prefix__-counter-holder bx-def-margin-thd-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
 </span>

template/score_element_block.html

@@ -1,5 +1,5 @@
 <div id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom" bx_score_data_score="__score__" bx_score_data_cup="__cup__" bx_score_data_cdown="__cdown__">
-    <div class="sys-action-do __style_prefix__-do bx-def-valign-center bx-clearfix">
+    <div class="sys-action-cnt __style_prefix__-cnt bx-def-valign-center bx-clearfix">
         <bx_if:show_do_vote_up>
             <div class="sys-action-element-holder __style_prefix__-element-holder __style_prefix__-eh-up">__do_vote__</div>
         </bx_if:show_do_vote_up>

template/score_element_inline.html

@@ -1,3 +1,3 @@
 <span id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom" bx_score_data_score="__score__" bx_score_data_cup="__cup__" bx_score_data_cdown="__cdown__">
-    <span class="sys-action-do __style_prefix__-do bx-def-valign-center"><bx_if:show_do_vote_up><span class="sys-action-element-holder __style_prefix__-element-holder __style_prefix__-eh-up">__do_vote__</span></bx_if:show_do_vote_up><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-sec-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter><bx_if:show_do_vote_down><span class="sys-action-element-holder __style_prefix__-element-holder __style_prefix__-eh-down bx-def-margin-sec-left-auto">__do_vote__</span></bx_if:show_do_vote_down></span>__script__
+    <span class="sys-action-cnt __style_prefix__-cnt bx-def-valign-center"><bx_if:show_do_vote_up><span class="sys-action-element-holder __style_prefix__-element-holder __style_prefix__-eh-up">__do_vote__</span></bx_if:show_do_vote_up><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-sec-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter><bx_if:show_do_vote_down><span class="sys-action-element-holder __style_prefix__-element-holder __style_prefix__-eh-down bx-def-margin-sec-left-auto">__do_vote__</span></bx_if:show_do_vote_down></span>__script__
 </span>

template/scripts/BxBaseCmts.php

@@ -624,21 +624,25 @@ class BxBaseCmts extends BxDolCmts
     protected function _getLabelDo($aParams = array())
     {
         return $this->_oTemplate->parseHtmlByContent($this->_getTmplLabelDo(), array(
+            'style_prefix' => $this->_sStylePrefix,
             'bx_if:show_image' => array(
                 'condition' => isset($aParams['show_do_comment_image']) && $aParams['show_do_comment_image'] == true,
                 'content' => array(
+                    'style_prefix' => $this->_sStylePrefix,
                     'src' => $this->_getImageDo()
                 )
             ),
             'bx_if:show_icon' => array(
                 'condition' => isset($aParams['show_do_comment_icon']) && $aParams['show_do_comment_icon'] == true,
                 'content' => array(
+                    'style_prefix' => $this->_sStylePrefix,
                     'name' => $this->_getIconDo()
                 )
             ),
             'bx_if:show_text' => array(
                 'condition' => isset($aParams['show_do_comment_label']) && $aParams['show_do_comment_label'] == true,
                 'content' => array(
+                    'style_prefix' => $this->_sStylePrefix,
                     'text' => _t($this->_getTitleDo())
                 )
             )

template/view_element_block.html

@@ -1,5 +1,5 @@
 <div id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom" bx_view_data_count="__count__">
-    <div class="sys-action-do __style_prefix__-do bx-def-valign-center bx-clearfix">
+    <div class="sys-action-cnt __style_prefix__-cnt bx-def-valign-center bx-clearfix">
         <bx_if:show_do_view>
             <div class="sys-action-element-holder __style_prefix__-element-holder">__do_view__</div>
         </bx_if:show_do_view>

template/view_element_inline.html

@@ -1,3 +1,3 @@
 <span id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom" bx_view_data_count="__count__">
-    <span class="sys-action-do __style_prefix__-do bx-def-valign-center"><bx_if:show_do_view><span class="sys-action-element-holder __style_prefix__-element-holder">__do_view__</span></bx_if:show_do_view><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-thd-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
+    <span class="sys-action-cnt __style_prefix__-cnt bx-def-valign-center"><bx_if:show_do_view><span class="sys-action-element-holder __style_prefix__-element-holder">__do_view__</span></bx_if:show_do_view><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-thd-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
 </span>

template/vote_element_block.html

@@ -1,5 +1,5 @@
 <div id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom"<bx_if:show_vote_data> bx_vote_data_rate="__rate__" bx_vote_data_count="__count__"</bx_if:show_vote_data>>
-    <div class="sys-action-do __style_prefix__-do bx-def-valign-center bx-clearfix">
+    <div class="sys-action-cnt __style_prefix__-cnt bx-def-valign-center bx-clearfix">
         <bx_if:show_do_vote>
             <div class="sys-action-element-holder __style_prefix__-element-holder">__do_vote__</div>
         </bx_if:show_do_vote>

template/vote_element_inline.html

@@ -1,3 +1,3 @@
 <span id="__html_id__" class="sys-action __style_prefix__ __class__ bx-def-margin-right-auto bx-def-margin-thd-topbottom"<bx_if:show_vote_data> bx_vote_data_rate="__rate__" bx_vote_data_count="__count__"</bx_if:show_vote_data>>
-    <span class="sys-action-do __style_prefix__-do bx-def-valign-center"><bx_if:show_do_vote><span class="sys-action-element-holder __style_prefix__-element-holder">__do_vote__</span></bx_if:show_do_vote><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-thd-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
+    <span class="sys-action-cnt __style_prefix__-cnt bx-def-valign-center"><bx_if:show_do_vote><span class="sys-action-element-holder __style_prefix__-element-holder">__do_vote__</span></bx_if:show_do_vote><bx_if:show_counter><span class="sys-action-counter-holder __style_prefix__-counter-holder bx-def-margin-thd-left-auto bx-btn-border"<bx_if:show_hidden> style="display:none"</bx_if:show_hidden>>__counter__</span></bx_if:show_counter></span>__script__
 </span>