AntonLV 5 лет назад
Родитель
Сommit
78a3e9deee

+ 1 - 0
install/sql/system.sql

@@ -4214,6 +4214,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 -- comment meta info menu
 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 
+('sys_cmts_item_meta', 'system', 'in-reply-to', '_sys_menu_item_title_system_sm_in_reply_to', '_sys_menu_item_title_sm_in_reply_to', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 0),
 ('sys_cmts_item_meta', 'system', 'author', '_sys_menu_item_title_system_sm_author', '_sys_menu_item_title_sm_author', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 1),
 ('sys_cmts_item_meta', 'system', 'date', '_sys_menu_item_title_system_sm_date', '_sys_menu_item_title_sm_date', '', '', '', '', '', '', 0, 2147483647, 1, 0, 1, 2),
 ('sys_cmts_item_meta', 'system', 'membership', '_sys_menu_item_title_system_sm_membership', '_sys_menu_item_title_sm_membership', '', '', '', '', '', '', 0, 2147483647, 0, 0, 1, 3);

+ 2 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -2638,6 +2638,7 @@ If it is not enabled then please consider implement this optimization, since it
     <string name="_sys_menu_item_title_social_sharing_facebook"><![CDATA[Share in Facebook]]></string>
     <string name="_sys_menu_item_title_social_sharing_twitter"><![CDATA[Share in Twitter]]></string>
     <string name="_sys_menu_item_title_social_sharing_pinterest"><![CDATA[Share in Pinterest]]></string>
+    <string name="_sys_menu_item_title_sm_author"><![CDATA[In reply to]]></string>
     <string name="_sys_menu_item_title_sm_author"><![CDATA[Author]]></string>
     <string name="_sys_menu_item_title_sm_date"><![CDATA[Date]]></string>
     <string name="_sys_menu_item_title_sm_category"><![CDATA[Category]]></string>
@@ -2732,6 +2733,7 @@ If it is not enabled then please consider implement this optimization, since it
     <string name="_sys_menu_item_title_system_social_sharing_twitter"><![CDATA[Share in Twitter]]></string>
     <string name="_sys_menu_item_title_system_social_sharing_pinterest"><![CDATA[Share in Pinterest]]></string>
     <string name="_sys_menu_item_title_system_sm_author"><![CDATA[Author]]></string>
+    <string name="_sys_menu_item_title_system_sm_author"><![CDATA[Author]]></string>
     <string name="_sys_menu_item_title_system_sm_date"><![CDATA[Date]]></string>
     <string name="_sys_menu_item_title_system_sm_category"><![CDATA[Category]]></string>
     <string name="_sys_menu_item_title_system_sm_tags"><![CDATA[Tags]]></string>

+ 0 - 7
modules/boonex/lucid/data/template/system/comment.html

@@ -4,13 +4,6 @@
         <div class="__style_prefix__-avatar bx-def-thumb-size">__author_unit__</div>
         <div class="__style_prefix__-info bx-def-thumb-size-min-height bx-def-thumb-size-left-indent">
             <div class="__style_prefix__-head bx-clearfix">
-                <bx_if:show_reply_to>
-                    <span class="__style_prefix__-reply-to">
-                        <a href="__par_cmt_link__" title="__par_cmt_title__">
-                            <i class="sys-icon reply"></i> <span><bx_text:_in_reply_to /></span> __par_cmt_author_unit__ <span>__par_cmt_author__</span>
-                        </a>
-                    </span>
-                </bx_if:show_reply_to>
                 <bx_if:meta><span class="__style_prefix__-meta bx-base-general-unit-meta">__meta__</span></bx_if:meta>
                 <bx_if:show_pinned><span class="__style_prefix__-pinned bx-def-margin-sec-left"><i class="sys-icon thumbtack" title="<bx_text:_cmt_txt_pinned />"></i></span></bx_if:show_pinned>
             </div>

+ 2 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -2595,6 +2595,7 @@
     <string name="_sys_menu_item_title_social_sharing_facebook"><![CDATA[Поделиться в Facebook]]></string>
     <string name="_sys_menu_item_title_social_sharing_twitter"><![CDATA[Поделиться в Twitter]]></string>
     <string name="_sys_menu_item_title_social_sharing_pinterest"><![CDATA[Поделиться в Pinterest]]></string>
+    <string name="_sys_menu_item_title_sm_author"><![CDATA[В ответ к]]></string>
     <string name="_sys_menu_item_title_sm_author"><![CDATA[Автор]]></string>
     <string name="_sys_menu_item_title_sm_date"><![CDATA[Дата]]></string>
     <string name="_sys_menu_item_title_sm_category"><![CDATA[Категория]]></string>
@@ -2687,6 +2688,7 @@
         <string name="_sys_menu_item_title_system_social_sharing_facebook"><![CDATA[Поделиться в Facebook]]></string>
     <string name="_sys_menu_item_title_system_social_sharing_twitter"><![CDATA[Поделиться в Twitter]]></string>
     <string name="_sys_menu_item_title_system_social_sharing_pinterest"><![CDATA[Поделиться в Pinterest]]></string>
+    <string name="_sys_menu_item_title_system_sm_author"><![CDATA[В ответ к]]></string>
     <string name="_sys_menu_item_title_system_sm_author"><![CDATA[Автор]]></string>
     <string name="_sys_menu_item_title_system_sm_date"><![CDATA[Дата]]></string>
     <string name="_sys_menu_item_title_system_sm_category"><![CDATA[Категория]]></string>

+ 0 - 7
template/comment.html

@@ -5,13 +5,6 @@
         <div class="__style_prefix__-avatar bx-def-thumb-size">__author_unit__</div>
         <div class="__style_prefix__-info bx-def-thumb-size-min-height bx-def-thumb-size-left-indent">
             <div class="__style_prefix__-head bx-clearfix">
-                <bx_if:show_reply_to>
-                    <span class="__style_prefix__-reply-to">
-                        <a href="__par_cmt_link__" title="__par_cmt_title__">
-                            <i class="sys-icon reply"></i> <span><bx_text:_in_reply_to /></span> __par_cmt_author_unit__ <span>__par_cmt_author__</span>
-                        </a>
-                    </span>
-                </bx_if:show_reply_to>
                 <bx_if:meta><span class="__style_prefix__-meta bx-base-general-unit-meta">__meta__</span></bx_if:meta>
                 <bx_if:show_pinned><span class="__style_prefix__-pinned bx-def-margin-sec-left"><i class="sys-icon thumbtack" title="<bx_text:_cmt_txt_pinned />"></i></span></bx_if:show_pinned>
             </div>

+ 3 - 0
template/comment_reply_to.html

@@ -0,0 +1,3 @@
+<span class="__style_prefix__-reply-to">
+    <a href="__par_cmt_link__" title="__par_cmt_title__"><i class="sys-icon reply"></i> <span><bx_text:_in_reply_to /></span> __par_cmt_author_unit__ <span>__par_cmt_author__</span></a>
+</span>

+ 1 - 0
template/css/cmts.css

@@ -525,6 +525,7 @@ div.cmt-mood-buttons a:hover {
 div.cmt-mood-buttons i.cmt-mood-star {
     color: transparent;
 }
+.cmt-meta .bx-badges-list,
 .cmt-meta .bx-badge-compact {
     display: inline-block;
 }

+ 33 - 4
template/scripts/BxBaseCmtsMenuUnitMeta.php

@@ -16,6 +16,7 @@ class BxBaseCmtsMenuUnitMeta extends BxTemplMenuUnitMeta
     protected $_oCmts;
     protected $_aCmtsSystem;
     protected $_aCmt;
+    protected $_sCmtStylePrefix;
 
     public function __construct ($aObject, $oTemplate)
     {
@@ -30,8 +31,9 @@ class BxBaseCmtsMenuUnitMeta extends BxTemplMenuUnitMeta
         $this->_oCmts = $oCmts;
         $this->_aCmtsSystem = $oCmts->getSystemInfo();
         $this->_aCmt = $oCmts->getCommentRow($iCmtId);
+        $this->_sCmtStylePrefix = (!empty($this->_aCmtsSystem['root_style_prefix']) ? $this->_aCmtsSystem['root_style_prefix'] : 'cmt');
 
-        $this->_sStylePrefix = (!empty($this->_aCmtsSystem['root_style_prefix']) ? $this->_aCmtsSystem['root_style_prefix'] : 'cmt') . '-meta bx-base-general-unit-meta';
+        $this->_sStylePrefix = $this->_sCmtStylePrefix . '-meta bx-base-general-unit-meta';
 
         $this->addMarkers(array(
             'cmt_system' => $this->_oCmts->getSystemName(),
@@ -41,22 +43,49 @@ class BxBaseCmtsMenuUnitMeta extends BxTemplMenuUnitMeta
         ));
     }
 
+    protected function _getMenuItemInReplyTo($aItem)
+    {
+        if((int)$this->_aCmt['cmt_parent_id'] == 0) 
+            return '';
+
+        $aParent = $this->_oCmts->getCommentRow($this->_aCmt['cmt_parent_id']);
+        if(empty($aParent) || !is_array($aParent))
+            return '';
+
+        $oProfile = BxDolProfile::getInstanceMagic($aParent['cmt_author_id']);
+        $sParAuthorName = $oProfile->getDisplayName();
+        $sParAuthorUnit = $oProfile->getUnit(0, array('template' => array('name' => 'unit_wo_info_links', 'size' => 'icon')));
+
+        $sResult = $this->_oTemplate->parseHtmlByName('comment_reply_to.html', array(
+            'style_prefix' => $this->_sCmtStylePrefix,
+            'par_cmt_link' => $this->_oCmts->getItemUrl($this->_aCmt['cmt_parent_id']),
+            'par_cmt_title' => bx_html_attribute(_t('_in_reply_to_x', $sParAuthorName)),
+            'par_cmt_author' => $sParAuthorName,
+            'par_cmt_author_unit' => $sParAuthorUnit
+        ));
+
+        return $this->getUnitMetaItemCustom($sResult);
+    }
+
     protected function _getMenuItemAuthor($aItem)
     {
         list($sAuthorName, $sAuthorLink, $sAuthorIcon, $sAuthorUnit, $sAuthorBadges) = $this->_oCmts->getAuthorInfo($this->_aCmt['cmt_author_id']);
     
+        $sResult = '';
         if(!empty($sAuthorLink))
-            return $this->getUnitMetaItemLink($sAuthorName, array(
+            $sResult = $this->getUnitMetaItemLink($sAuthorName, array(
                 'href' => $sAuthorLink,
                 'class' => $this->_sStylePrefix . '-username',
                 'title' => bx_html_attribute($sAuthorName),
             )). $sAuthorBadges;
         else
-            return $this->getUnitMetaItemText($sAuthorName, array(
+            $sResult = $this->getUnitMetaItemText($sAuthorName, array(
                 'class' => $this->_sStylePrefix . '-username'
             )). $sAuthorBadges;
+
+        return $sResult;
     }
-    
+
     protected function _getMenuItemDate($aItem)
     {
         $sAgo = bx_time_js($this->_aCmt['cmt_time']);