Fix microblog

This commit is contained in:
Alma Armas 2021-01-27 17:40:37 +00:00
parent 16f1b22ecb
commit 1e5f3f395b
3 changed files with 206 additions and 206 deletions

View file

@ -1,7 +1,7 @@
{ifset $thisUser} {var microblogEnabled = isset($thisUser) ? $thisUser->hasMicroblogEnabled() : false}
{if $thisUser->hasMicroblogEnabled()}
{include "post/microblogpost.xml", post => $post} {if $microblogEnabled}
{else} {include "post/microblogpost.xml", post => $post}
{include "post/oldpost.xml", post => $post} {else}
{/if} {include "post/oldpost.xml", post => $post}
{/ifset} {/if}

View file

@ -1,93 +1,93 @@
{var author = $post->getOwner()} {var author = $post->getOwner()}
<table border="0" style="font-size: 11px;" n:class="post, !$compact ? post-divider, $post->isExplicit() ? post-nsfw"> <table border="0" style="font-size: 11px;" n:class="post, !$compact ? post-divider, $post->isExplicit() ? post-nsfw">
<tbody> <tbody>
<tr> <tr>
<td width="54" valign="top"> <td width="54" valign="top">
<img <img
src="{$author->getAvatarURL()}" src="{$author->getAvatarURL()}"
width="{ifset $compact}25{else}50{/ifset}" /> width="{ifset $compact}25{else}50{/ifset}" />
</td> </td>
<td width="100%" valign="top"> <td width="100%" valign="top">
<div class="post-author"> <div class="post-author">
<a href="{$author->getURL()}"> <a href="{$author->getURL()}">
<b> <b>
{$author->getCanonicalName()} {$author->getCanonicalName()}
</b> </b>
</a> </a>
{if $author->isVerified()}<img class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">{/if} {if $author->isVerified()}<img class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">{/if}
{ifset $compact}<br> {ifset $compact}<br>
<a href="/wall{$post->getPrettyId()}" class="date">{$post->getPublicationTime()}</a> <a href="/wall{$post->getPrettyId()}" class="date">{$post->getPublicationTime()}</a>
{/ifset} {/ifset}
{if $post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false) && !isset($compact)} {if $post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false) && !isset($compact)}
<a class="delete" href="/wall{$post->getPrettyId()}/delete"></a> <a class="delete" href="/wall{$post->getPrettyId()}/delete"></a>
{/if} {/if}
</div> </div>
<div class="post-content" id="{$post->getPrettyId()}"> <div class="post-content" id="{$post->getPrettyId()}">
<div class="text" id="text{$post->getPrettyId()}"> <div class="text" id="text{$post->getPrettyId()}">
{$post->getText()|noescape} {$post->getText()|noescape}
<div n:ifcontent class="attachments_b"> <div n:ifcontent class="attachments_b">
<div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}"> <div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}">
{include "../attachment.xml", attachment => $attachment} {include "../attachment.xml", attachment => $attachment}
</div> </div>
</div> </div>
</div> </div>
<div n:if="$post->isAd()" style="color:grey;"> <div n:if="$post->isAd()" style="color:grey;">
<br/> <br/>
&nbsp;! Этот пост был размещён за взятку. &nbsp;! Этот пост был размещён за взятку.
</div> </div>
<div n:if="$post->isSigned()" class="post-signature"> <div n:if="$post->isSigned()" class="post-signature">
{var acutalAuthor = $post->getOwner(false)} {var acutalAuthor = $post->getOwner(false)}
<span> <span>
Автор: Автор:
<a href="{$acutalAuthor->getURL()}"> <a href="{$acutalAuthor->getURL()}">
{$acutalAuthor->getCanonicalName()} {$acutalAuthor->getCanonicalName()}
</a> </a>
</span> </span>
</div> </div>
</div> </div>
<div class="post-menu" n:if="!isset($compact)"> <div class="post-menu" n:if="!isset($compact)">
<a href="/wall{$post->getPrettyId()}" class="date">{$post->getPublicationTime()}</a> <a href="/wall{$post->getPrettyId()}" class="date">{$post->getPublicationTime()}</a>
{if isset($thisUser)} {if isset($thisUser)}
&nbsp; &nbsp;
{if !($forceNoCommentsLink ?? false)} {if !($forceNoCommentsLink ?? false)}
<a href="/wall{$post->getPrettyId()}#comments"> <a href="/wall{$post->getPrettyId()}#comments">
{if $post->getCommentsCount() > 0} {if $post->getCommentsCount() > 0}
{_"comments"} (<b>{$post->getCommentsCount()}</b>) {_"comments"} (<b>{$post->getCommentsCount()}</b>)
{else} {else}
{_"comments"} {_"comments"}
{/if} {/if}
</a> </a>
{/if} {/if}
<div class="like_wrap"> <div class="like_wrap">
<a class="post-share-button" href="/wall{$post->getPrettyId()}/repost?hash={rawurlencode($csrfToken)}" <a class="post-share-button" href="/wall{$post->getPrettyId()}/repost?hash={rawurlencode($csrfToken)}"
class="post-like-button"> class="post-like-button">
<div class="repost-icon" style="opacity: 0.4;"></div> <div class="repost-icon" style="opacity: 0.4;"></div>
<span class="likeCnt">{$post->getRepostCount()}</span> <span class="likeCnt">{$post->getRepostCount()}</span>
</a> </a>
{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"
data-liked="{(int) $liked}" data-liked="{(int) $liked}"
data-likes="{$post->getLikesCount()}"> data-likes="{$post->getLikesCount()}">
<div class="heart" style="{if $liked}opacity: 1;{else}opacity: 0.4;{/if}"></div> <div class="heart" style="{if $liked}opacity: 1;{else}opacity: 0.4;{/if}"></div>
<span class="likeCnt">{$post->getLikesCount()}</span> <span class="likeCnt">{$post->getLikesCount()}</span>
</a> </a>
</div> </div>
{/if} {/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 -->
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View file

@ -1,106 +1,106 @@
{var author = $post->getOwner()} {var author = $post->getOwner()}
<table border="0" style="font-size: 11px;" n:class="post, $post->isExplicit() ? post-nsfw"> <table border="0" style="font-size: 11px;" n:class="post, $post->isExplicit() ? post-nsfw">
<tbody> <tbody>
<tr> <tr>
<td width="54" valign="top"> <td width="54" valign="top">
<img <img
src="{$author->getAvatarURL()}" src="{$author->getAvatarURL()}"
width="50" /> width="50" />
</td> </td>
<td width="100%" valign="top"> <td width="100%" valign="top">
<div class="post-author"> <div class="post-author">
<a href="{$author->getURL()}"> <a href="{$author->getURL()}">
<b> <b>
{$author->getCanonicalName()} {$author->getCanonicalName()}
</b> </b>
</a> </a>
{if $author->isVerified()}<img class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">{/if} {if $author->isVerified()}<img class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">{/if}
{$post->isPostedOnBehalfOfGroup() ? "опубликовали" : ($author->isFemale() ? tr("post_writes_f") : tr("post_writes_m"))} {$post->isPostedOnBehalfOfGroup() ? "опубликовали" : ($author->isFemale() ? tr("post_writes_f") : tr("post_writes_m"))}
{if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()} {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()}
{var wallId = $post->getTargetWall()} {var wallId = $post->getTargetWall()}
{var wallURL = $wallId > -1 ? "/id$wallId" : "/club" . abs($wallId)} {var wallURL = $wallId > -1 ? "/id$wallId" : "/club" . abs($wallId)}
на на
<a href="{$wallURL}"> <a href="{$wallURL}">
<b> <b>
{if isset($thisUser) && $thisUser->getId() === $wallId} {if isset($thisUser) && $thisUser->getId() === $wallId}
вашей вашей
{/if} {/if}
стене стене
{if $wallId < 0} {if $wallId < 0}
группы группы
{/if} {/if}
</b> </b>
</a> </a>
{/if} {/if}
<br/> <br/>
<a href="/wall{$post->getPrettyId()}" class="date">{$post->getPublicationTime()}</a> <a href="/wall{$post->getPrettyId()}" class="date">{$post->getPublicationTime()}</a>
</div> </div>
<div class="post-content" id="{$post->getPrettyId()}"> <div class="post-content" id="{$post->getPrettyId()}">
<div class="text" id="text{$post->getPrettyId()}"> <div class="text" id="text{$post->getPrettyId()}">
{$post->getText()|noescape} {$post->getText()|noescape}
<div n:ifcontent class="attachments_b"> <div n:ifcontent class="attachments_b">
<div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}"> <div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}">
{include "../attachment.xml", attachment => $attachment} {include "../attachment.xml", attachment => $attachment}
</div> </div>
</div> </div>
</div> </div>
<div n:if="$post->isAd()" style="color:grey;"> <div n:if="$post->isAd()" style="color:grey;">
<br/> <br/>
&nbsp;! Этот пост был размещён за взятку. &nbsp;! Этот пост был размещён за взятку.
</div> </div>
<div n:if="$post->isSigned()" class="post-signature"> <div n:if="$post->isSigned()" class="post-signature">
{var acutalAuthor = $post->getOwner(false)} {var acutalAuthor = $post->getOwner(false)}
<span> <span>
Автор: Автор:
<a href="{$acutalAuthor->getURL()}"> <a href="{$acutalAuthor->getURL()}">
{$acutalAuthor->getCanonicalName()} {$acutalAuthor->getCanonicalName()}
</a> </a>
</span> </span>
</div> </div>
</div> </div>
<div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu"> <div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu">
{if $post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false)} {if $post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false)}
<a href="/wall{$post->getPrettyId()}/delete">{_"delete"}</a>&nbsp;|&nbsp; <a href="/wall{$post->getPrettyId()}/delete">{_"delete"}</a>&nbsp;|&nbsp;
{/if} {/if}
{if !($forceNoCommentsLink ?? false)} {if !($forceNoCommentsLink ?? false)}
<a href="/wall{$post->getPrettyId()}#comments"> <a href="/wall{$post->getPrettyId()}#comments">
{if $post->getCommentsCount() > 0} {if $post->getCommentsCount() > 0}
{_"comments"} (<b>{$post->getCommentsCount()}</b>) {_"comments"} (<b>{$post->getCommentsCount()}</b>)
{else} {else}
{_"comments"} {_"comments"}
{/if} {/if}
</a> </a>
&nbsp;|&nbsp; &nbsp;|&nbsp;
{/if} {/if}
<a class="post-share-button" href="/wall{$post->getPrettyId()}/repost?hash={rawurlencode($csrfToken)}"> <a class="post-share-button" href="/wall{$post->getPrettyId()}/repost?hash={rawurlencode($csrfToken)}">
{if $post->getRepostCount() > 0} {if $post->getRepostCount() > 0}
{_"share"} {_"share"}
(<b>{$post->getRepostCount()}</b>) (<b>{$post->getRepostCount()}</b>)
{else} {else}
{_"share"} {_"share"}
{/if} {/if}
</a> </a>
<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)}"
class="post-like-button" class="post-like-button"
data-liked="{(int) $liked}" data-liked="{(int) $liked}"
data-likes="{$post->getLikesCount()}"> data-likes="{$post->getLikesCount()}">
<div class="heart" style="{if $liked}opacity: 1;{else}opacity: 0.4;{/if}"></div> <div class="heart" style="{if $liked}opacity: 1;{else}opacity: 0.4;{/if}"></div>
<span class="likeCnt">{$post->getLikesCount()}</span> <span class="likeCnt">{$post->getLikesCount()}</span>
</a> </a>
</div> </div>
</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 -->
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>