From 9bc2499406bcefa46e7a2f71452c3641cb2fa889 Mon Sep 17 00:00:00 2001
From: Alex Trofimov <dev@boonex.com>
Date: Wed, 12 Sep 2018 18:23:52 +1000
Subject: [PATCH] #1560 Different avatars for members without avatars in the
 discussions

---
 modules/boonex/forum/classes/BxForumTemplate.php  | 15 +++------------
 modules/boonex/forum/install/langs/en.xml         |  1 -
 modules/boonex/forum/template/css/main.css        | 12 ++----------
 modules/boonex/forum/template/participants.html   | 10 +++++-----
 modules/boonex/russian/data/langs/bx_forum/ru.xml |  1 -
 5 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/modules/boonex/forum/classes/BxForumTemplate.php b/modules/boonex/forum/classes/BxForumTemplate.php
index f1e511dee6..38664e2ca1 100644
--- a/modules/boonex/forum/classes/BxForumTemplate.php
+++ b/modules/boonex/forum/classes/BxForumTemplate.php
@@ -82,20 +82,9 @@ public function entryParticipants($aContentInfo, $iMaxVisible = 2, $sFloat = 'le
         foreach ($aParticipants as $iProfileId => $iComments) {
             $oProfile = BxDolProfile::getInstanceMagic($iProfileId);
 
-            $sInfo = '';
-            if ($iAuthorId == $iProfileId)
-                $sInfo = _t('_bx_forum_participant_author');
-            if ($aContentInfo['lr_profile_id'] == $iProfileId)
-                $sInfo .= ', ' . _t('_bx_forum_participant_last_replier');
-            $sInfo = trim($sInfo, ', ');
-            $sInfo = $sInfo ? _t('_bx_forum_participant_info', $oProfile->getDisplayName(), $sInfo) : $oProfile->getDisplayName();
-
             $aParticipant = array (
                 'id' => $oProfile->id(),
-                'url' => $oProfile->getUrl(),
-                'thumb_url' => $oProfile->getThumb(),
-                'title' => $oProfile->getDisplayName(),
-                'title_attr' =>  bx_html_attribute($sInfo),
+                'unit' => $oProfile->getUnit(0, array('template' => 'unit_wo_info')),
                 'float' => $sFloat,
                 'class' => $iAuthorId == $iProfileId ? 'bx-forum-participant-author' : '',
             	'bx_if:replies_count' => array(
@@ -108,12 +97,14 @@ public function entryParticipants($aContentInfo, $iMaxVisible = 2, $sFloat = 'le
                     'condition' => ($aContentInfo['lr_profile_id'] == $iProfileId),
                     'content' => array (
                         'id' => $oProfile->id(),
+                        'title' => bx_html_attribute(_t('_bx_forum_participant_last_replier')),
                     ),
                 ),
                 'bx_if:author'  => array (
                     'condition' => $iAuthorId == $iProfileId,
                     'content' => array (
                         'id' => $oProfile->id(),
+                        'title' => bx_html_attribute(_t('_bx_forum_participant_author')),
                     ),
                 ),
             );
diff --git a/modules/boonex/forum/install/langs/en.xml b/modules/boonex/forum/install/langs/en.xml
index a0c665aec6..6b4b7f5b97 100644
--- a/modules/boonex/forum/install/langs/en.xml
+++ b/modules/boonex/forum/install/langs/en.xml
@@ -262,7 +262,6 @@
 
     <string name="_bx_forum_err_not_found"><![CDATA[Discussion wasn't found.]]></string>
     <string name="_bx_forum_more"><![CDATA[{0} more]]></string>
-    <string name="_bx_forum_participant_info"><![CDATA[{0} ({1})]]></string>
     <string name="_bx_forum_participant_author"><![CDATA[author]]></string>
     <string name="_bx_forum_participant_last_replier"><![CDATA[last replier]]></string>
     <string name="_bx_forum_txt_entry_locked"><![CDATA[Locked discussion]]></string>
diff --git a/modules/boonex/forum/template/css/main.css b/modules/boonex/forum/template/css/main.css
index b8954f9877..f8f23c8aad 100644
--- a/modules/boonex/forum/template/css/main.css
+++ b/modules/boonex/forum/template/css/main.css
@@ -1,21 +1,13 @@
 @import url(../../../../base/text/template/css/main.css);
 
 /*-- Participants --*/
-.bx-forum-participants {
-    white-space: nowrap;
-    overflow: hidden;
-}
 
 .bx-popup-content .bx-forum-participants {
     margin-right: 0px;
 }
 
 .bx-forum-participant {
-    display: inline;
-    display: inline-block;
-}
-
-.bx-forum-participant-author {
+    position:relative;
     display: inline;
     display: inline-block;
 }
@@ -105,4 +97,4 @@
 .bx-base-text-unit .bx-forum-grid-field-replies {
 	display: inline-block;
 	vertical-align: middle;
-}
\ No newline at end of file
+}
diff --git a/modules/boonex/forum/template/participants.html b/modules/boonex/forum/template/participants.html
index ed62c9647b..55b6ad9c92 100644
--- a/modules/boonex/forum/template/participants.html
+++ b/modules/boonex/forum/template/participants.html
@@ -1,15 +1,15 @@
 <div class="bx-forum-participants bx-clearfix" style="float:__float__;">
     <bx_repeat:participants>
-        <div class="bx-forum-participant bx-def-unit bx-def-margin-sec-__float__-auto __class__">
-            <a href="__url__" title="__title_attr__"><img class="bx-def-thumb bx-def-thumb-size" src="__thumb_url__" /></a>
+        <div class="bx-forum-participant bx-def-margin-sec-__float__-auto __class__">
+            __unit__
             <bx_if:replies_count>
                 <div class="bx-def-unit-alert bg-col-red2-dark" style="top:0; bottom:auto;">__count__</div>
             </bx_if:replies_count>
             <bx_if:last_replier>
-                <div class="bx-def-unit-alert bg-col-blue2-dark" style="left:0; right:auto;"><i class="sys-icon comments bx-def-font-contrasted"></i></div>
+                <div title="__title__" class="bx-def-unit-alert bg-col-blue2-dark" style="left:0; right:auto;"><i class="sys-icon comments bx-def-font-contrasted"></i></div>
             </bx_if:last_replier>
             <bx_if:author>
-                <div class="bx-def-unit-alert bg-col-blue2-dark"><i class="sys-icon user bx-def-font-contrasted"></i></div>
+                <div title="__title__" class="bx-def-unit-alert bg-col-blue2-dark"><i class="sys-icon user bx-def-font-contrasted"></i></div>
             </bx_if:author>
         </div>
     </bx_repeat:participants>
@@ -19,4 +19,4 @@
         </div>
         <div id="__id__" style="display:none;">__popup__</div>
     </bx_if:participants_more>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/boonex/russian/data/langs/bx_forum/ru.xml b/modules/boonex/russian/data/langs/bx_forum/ru.xml
index ba4b10b466..5f1673c190 100644
--- a/modules/boonex/russian/data/langs/bx_forum/ru.xml
+++ b/modules/boonex/russian/data/langs/bx_forum/ru.xml
@@ -263,7 +263,6 @@
 
     <string name="_bx_forum_err_not_found"><![CDATA[Обсуждение не найдено.]]></string>
     <string name="_bx_forum_more"><![CDATA[{0} ещё]]></string>
-    <string name="_bx_forum_participant_info"><![CDATA[{0} ({1})]]></string>
     <string name="_bx_forum_participant_author"><![CDATA[автор]]></string>
     <string name="_bx_forum_participant_last_replier"><![CDATA[последний ответивший]]></string>
     <string name="_bx_forum_txt_entry_locked"><![CDATA[Заблокированное обсуждение]]></string>