From 6e7f8833fe6ea62a781a5bfd4d67aa7ecc53ba1a Mon Sep 17 00:00:00 2001
From: n1rwana <aydashkin@vk.com>
Date: Fri, 11 Aug 2023 17:10:18 +0300
Subject: [PATCH] Fix microblog comments and left menu links (#955)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Фикс комментариев в микроблоге

* Update @layout.xml
---
 Web/Presenters/templates/@layout.xml          |  7 ++++---
 .../templates/components/comment.xml          | 20 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml
index c79a8e89..bb189230 100644
--- a/Web/Presenters/templates/@layout.xml
+++ b/Web/Presenters/templates/@layout.xml
@@ -218,10 +218,13 @@
                                 noSpam
                             </a>
                         <a
+                          n:if="$thisUser->getLeftMenuItemStatus('links')"
                           n:foreach="OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links'] as $menuItem"
                           href="{$menuItem['url']}"
                           target="_blank"
-                          class="link">{$menuItem["name"]}</a>
+                          class="link">
+                            {strpos($menuItem["name"], "@") === 0 ? tr(substr($menuItem["name"], 1)) : $menuItem["name"]}
+                        </a>
                         <div id="_groupListPinnedGroups">
                             <div n:if="$thisUser->getPinnedClubCount() > 0" class="menu_divider"></div>
                             <a
@@ -229,8 +232,6 @@
                             href="{$club->getURL()}"
                             class="link group_link">{$club->getName()}</a>
 
-                            <a n:if="$thisUser->getLeftMenuItemStatus('links')" n:foreach="OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links'] as $menuItem" href="{$menuItem['url']}" target="_blank" class="link">{strpos($menuItem["name"], "@") === 0 ? tr(substr($menuItem["name"], 1)) : $menuItem["name"]}</a>
-
                             <div id="_groupListPinnedGroups">
                                 <div n:if="$thisUser->getPinnedClubCount() > 0" class="menu_divider"></div>
                                 <a n:foreach="$thisUser->getPinnedClubs() as $club" href="{$club->getURL()}" class="link group_link">{$club->getName()}</a>
diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml
index ef7150ff..feb97bab 100644
--- a/Web/Presenters/templates/components/comment.xml
+++ b/Web/Presenters/templates/components/comment.xml
@@ -61,18 +61,14 @@
                             {php $target = "topic"}
                         {/if}
 
-                        <a {if is_null($linkW)}href="#_comment{$comment->getId()}"{else}href="{$target}{!is_null($comment->getTarget()) ? $comment->getTarget()->getPrettyId() : $comment->getOwner()->getId()}#_comment{$comment->getId()}"{/if} class="date">{$comment->getPublicationTime()}</a>&nbsp;|
-                        {if $comment->canBeDeletedBy($thisUser)}
-                            <a href="/comment{$comment->getId()}/delete">{_delete}</a>&nbsp;|
-                        {/if}
-                        {if is_null($linkW)}
-                        <a class="comment-reply">{_reply}</a>{/if}
-                        <div style="float: right; font-size: .7rem;">
-                            <a class="post-like-button" href="/comment{$comment->getId()}/like?hash={rawurlencode($csrfToken)}">
-                                <div class="heart" style="{if $comment->hasLikeFrom($thisUser)}opacity: 1;{else}opacity: 0.4;{/if}"></div>
-                                <span class="likeCnt">{if $comment->getLikesCount() > 0}{$comment->getLikesCount()}{/if}</span>
-                            </a>
-                        </div>
+                        |&nbsp;<a
+                            {if is_null($linkW)}
+                                href="#_comment{$comment->getId()}"
+                            {else}
+                                href="{$target}{!is_null($comment->getTarget()) ? $comment->getTarget()->getPrettyId() : $comment->getOwner()->getId()}#_comment{$comment->getId()}"
+                            {/if}
+                            class="date"
+                        >{$comment->getPublicationTime()}</a>
                     </div>
                 </div>
             </td>