Procházet zdrojové kódy

Ticket #3629 - Artificer (Part 2): Comments counter.

AntonLV před 4 roky
rodič
revize
6153dc50b2

+ 2 - 2
modules/boonex/artificer/data/template/system/comment_counter.html

@@ -2,8 +2,8 @@
     <a class="group flex items-center p-1 pl-2 border-none rounded-full text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-600" href="__href__"<bx_if:show_onclick> onclick="__onclick__"</bx_if:show_onclick>>
         <bx_repeat:profiles>__icon__</bx_repeat:profiles>
         <bx_if:show_icon>
-            <div class="sys-action-counter-icon __sp__-counter-icon bx-def-icon-size flex items-center justify-center h-6 w-6 mr-2 ring-1 ring-white dark:ring-gray-700 h-6 w-6 bg-gray-200 dark:bg-gray-700 rounded-full">__icon__</div>
+            <div class="sys-action-counter-icon __sp__-counter-icon bx-def-icon-size flex items-center justify-center z-10 h-6 w-6 ring-1 ring-white dark:ring-gray-700 h-6 w-6 bg-gray-200 dark:bg-gray-700 rounded-full">__icon__</div>
         </bx_if:show_icon>
-    __content__
+        <div class="ml-2 first:ml-0">__content__</div>
     </a>
 </div>

+ 5 - 0
modules/boonex/artificer/data/template/system/css/cmts.css

@@ -63,4 +63,9 @@ span.cmt-reply-to a .bx-def-icon-size {
     height: 1.0rem;
     line-height: 0.875rem;
     font-size: 0.6rem;
+}
+
+/*--- Comment Element Styles ---*/
+.cmt-counter .bx-base-pofile-unit-online {
+    display: none;
 }

+ 9 - 1
template/comment_counter.html

@@ -1 +1,9 @@
-<div id="__id__" class="__class__"><a class="bx-def-valign-center" href="__href__"<bx_if:show_onclick> onclick="__onclick__"</bx_if:show_onclick>><bx_repeat:profiles>__icon__</bx_repeat:profiles><bx_if:show_icon><div class="sys-action-counter-icon __sp__-counter-icon bx-def-icon-size bx-def-margin-sec-right bx-def-align-center"><i class="__sp__-counter-icon sys-icon comment"></i></div></bx_if:show_icon>__content__</a></div>
+<div id="__id__" class="__class__">
+    <a class="bx-def-valign-center" href="__href__"<bx_if:show_onclick> onclick="__onclick__"</bx_if:show_onclick>>
+        <bx_repeat:profiles>__icon__</bx_repeat:profiles>
+        <bx_if:show_icon>
+            <div class="sys-action-counter-icon __style_prefix__-counter-icon bx-def-icon-size bx-def-align-center"><i class="__style_prefix__-counter-icon sys-icon comment"></i></div>
+        </bx_if:show_icon>
+        <div class="bx-def-margin-sec-left-auto">__content__</div>
+    </a>
+</div>

+ 0 - 2
template/css/cmts.css

@@ -428,8 +428,6 @@ span.cmt span.cmt-counter-holder {
     box-sizing: border-box;
     z-index: 2;
 
-    margin-right: 0.5rem;
-
     background-color: rgba(232, 232, 232, 1.0);
     border: 1px solid #ffffff;
     border-radius: 1rem;

+ 3 - 2
template/scripts/BxBaseCmts.php

@@ -778,9 +778,10 @@ class BxBaseCmts extends BxDolCmts
             'content' => $this->_getCounterLabel($iCount, $aParams),
             'bx_repeat:profiles' => $aTmplVarsProfiles,
             'bx_if:show_icon' => array(
-                'condition' => $bShowEmpty && (!isset($aParams['show_icon']) || $aParams['show_icon']),
+                'condition' => ($bShowEmpty || !empty($aTmplVarsProfiles)) && (!isset($aParams['show_icon']) || $aParams['show_icon']),
                 'content' => array(
-                    'icon' => isset($aParams['custom_icon']) && $aParams['custom_icon'] != '' ? $aParams['custom_icon'] : BxTemplFunctions::getInstanceWithTemplate($this->_oTemplate)->getFontIconAsHtml('comment', $this->_sStylePrefix . '-counter-icon sys-icon')
+                    'style_prefix' => $this->_sStylePrefix,
+                    'icon' => !empty($aParams['custom_icon']) ? $aParams['custom_icon'] : BxTemplFunctions::getInstanceWithTemplate($this->_oTemplate)->getFontIconAsHtml('comment', $this->_sStylePrefix . '-counter-icon sys-icon')
                 )
             )
         ));