Revent some changes from 8f8d7bb

I will move them to the master branch
This commit is contained in:
Ilya Prokopenko 2021-12-26 18:00:02 +07:00
parent 8f8d7bbe2f
commit 3dcdba0b80
No known key found for this signature in database
GPG key ID: 7736BBBB05F14A56
2 changed files with 42 additions and 54 deletions

View file

@ -99,14 +99,11 @@
{/if} {/if}
<div class="like_wrap"> <div class="like_wrap">
{if !($forceNoShareLink ?? false)}
<a class="post-share-button" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')"> <a class="post-share-button" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')">
<div class="repost-icon" style="opacity: 0.4;"></div> <div class="repost-icon" style="opacity: 0.4;"></div>
<span class="likeCnt">{if $post->getRepostCount() > 0}{$post->getRepostCount()}{/if}</span> <span class="likeCnt">{if $post->getRepostCount() > 0}{$post->getRepostCount()}{/if}</span>
</a> </a>
{/if}
{if !($forceNoLike ?? false)}
{var liked = $post->hasLikeFrom($thisUser)} {var liked = $post->hasLikeFrom($thisUser)}
<a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}" <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}"
class="post-like-button" class="post-like-button"
@ -115,11 +112,9 @@
<div class="heart" id="{if $liked}liked{/if}"></div> <div class="heart" id="{if $liked}liked{/if}"></div>
<span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span> <span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span>
</a> </a>
{/if}
</div> </div>
{/if} {/if}
</div> </div>
{if !($forceNoCommentsLink ?? false)}
<div n:if="$commentSection == true && $compact == false" class="post-menu-s"> <div n:if="$commentSection == true && $compact == false" class="post-menu-s">
{if $commentsCount > 3} {if $commentsCount > 3}
<a href="/wall{$post->getPrettyId()}" class="expand_button">{_view_other_comments}</a> <a href="/wall{$post->getPrettyId()}" class="expand_button">{_view_other_comments}</a>
@ -132,7 +127,6 @@
{include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post} {include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post}
</div> </div>
</div> </div>
{/if}
</td> </td>
</tr> </tr>
</tbody> </tbody>

View file

@ -91,13 +91,9 @@
{_"comments"} {_"comments"}
{/if} {/if}
</a> </a>
{/if}
{if !($forceNoCommentsLink ?? false) && !($forceNoShareLink ?? false)}
&nbsp;|&nbsp; &nbsp;|&nbsp;
{/if} {/if}
{if !($forceNoShareLink ?? false)}
<a class="post-share-button" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')"> <a class="post-share-button" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')">
{if $post->getRepostCount() > 0} {if $post->getRepostCount() > 0}
{_"share"} {_"share"}
@ -106,9 +102,8 @@
{_"share"} {_"share"}
{/if} {/if}
</a> </a>
{/if}
{if !($forceNoLike ?? false)}
<div class="like_wrap"> <div class="like_wrap">
{var liked = $post->hasLikeFrom($thisUser)} {var liked = $post->hasLikeFrom($thisUser)}
<a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}" <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}"
@ -119,7 +114,6 @@
<span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span> <span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span>
</a> </a>
</div> </div>
{/if}
</div> </div>
<div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu-s"> <div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu-s">
<!-- kosfurler --> <!-- kosfurler -->