Просмотр исходного кода

Ticket #2430 - Get rid of duplicate class name.

AntonLV 6 лет назад
Родитель
Сommit
8c58dc1454

+ 1 - 1
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>

+ 2 - 2
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>

+ 2 - 2
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 4 - 0
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())
                 )
             )

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>